From 1bc9e85cc604ad51586bf1c6f09507c231d17d47 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Wed, 10 Jan 2024 21:24:25 +0100 Subject: [PATCH] Liezen Bulk Update done --- .../01-addressdb_update.php | 0 .../02-create_thetool_netzgebiete.php | 0 .../03-create_thetool_preorder_campaigns.php | 0 .../addressdb_update_from_draft.php | 0 .../check_existing_addresses.php | 0 ...import-from-modified-export-2023-03-02.php | 30 +++++++------------ .../import-from-modified-export.php | 0 .../Adressendatensatz_BP2023_20221201.csv | 0 .../Adressendatensatz_Cluster16_20221221.csv | 0 ...dressendatensatz_Draft01_20221118_UTF8.csv | 0 ...ressendatensatz_Update-RMLI_2023-01-29.csv | 0 ...ressendatensatz_Update-RMLI_2023-03-02.csv | 0 ...datensatz_Update_RMLI-2024-01-04_final.csv | 0 13 files changed, 10 insertions(+), 20 deletions(-) rename scripts/addressdb/{liezen => rml-liezen}/01-addressdb_update.php (100%) rename scripts/addressdb/{liezen => rml-liezen}/02-create_thetool_netzgebiete.php (100%) rename scripts/addressdb/{liezen => rml-liezen}/03-create_thetool_preorder_campaigns.php (100%) rename scripts/addressdb/{liezen => rml-liezen}/addressdb_update_from_draft.php (100%) rename scripts/addressdb/{liezen => rml-liezen}/check_existing_addresses.php (100%) rename scripts/addressdb/{liezen => rml-liezen}/import-from-modified-export-2023-03-02.php (95%) rename scripts/addressdb/{liezen => rml-liezen}/import-from-modified-export.php (100%) rename scripts/addressdb/{liezen => rml-liezen}/import/Adressendatensatz_BP2023_20221201.csv (100%) rename scripts/addressdb/{liezen => rml-liezen}/import/Adressendatensatz_Cluster16_20221221.csv (100%) rename scripts/addressdb/{liezen => rml-liezen}/import/Adressendatensatz_Draft01_20221118_UTF8.csv (100%) rename scripts/addressdb/{liezen => rml-liezen}/import/Adressendatensatz_Update-RMLI_2023-01-29.csv (100%) rename scripts/addressdb/{liezen => rml-liezen}/import/Adressendatensatz_Update-RMLI_2023-03-02.csv (100%) rename scripts/addressdb/{liezen => rml-liezen}/import/Adressendatensatz_Update_RMLI-2024-01-04_final.csv (100%) diff --git a/scripts/addressdb/liezen/01-addressdb_update.php b/scripts/addressdb/rml-liezen/01-addressdb_update.php similarity index 100% rename from scripts/addressdb/liezen/01-addressdb_update.php rename to scripts/addressdb/rml-liezen/01-addressdb_update.php diff --git a/scripts/addressdb/liezen/02-create_thetool_netzgebiete.php b/scripts/addressdb/rml-liezen/02-create_thetool_netzgebiete.php similarity index 100% rename from scripts/addressdb/liezen/02-create_thetool_netzgebiete.php rename to scripts/addressdb/rml-liezen/02-create_thetool_netzgebiete.php diff --git a/scripts/addressdb/liezen/03-create_thetool_preorder_campaigns.php b/scripts/addressdb/rml-liezen/03-create_thetool_preorder_campaigns.php similarity index 100% rename from scripts/addressdb/liezen/03-create_thetool_preorder_campaigns.php rename to scripts/addressdb/rml-liezen/03-create_thetool_preorder_campaigns.php diff --git a/scripts/addressdb/liezen/addressdb_update_from_draft.php b/scripts/addressdb/rml-liezen/addressdb_update_from_draft.php similarity index 100% rename from scripts/addressdb/liezen/addressdb_update_from_draft.php rename to scripts/addressdb/rml-liezen/addressdb_update_from_draft.php diff --git a/scripts/addressdb/liezen/check_existing_addresses.php b/scripts/addressdb/rml-liezen/check_existing_addresses.php similarity index 100% rename from scripts/addressdb/liezen/check_existing_addresses.php rename to scripts/addressdb/rml-liezen/check_existing_addresses.php diff --git a/scripts/addressdb/liezen/import-from-modified-export-2023-03-02.php b/scripts/addressdb/rml-liezen/import-from-modified-export-2023-03-02.php similarity index 95% rename from scripts/addressdb/liezen/import-from-modified-export-2023-03-02.php rename to scripts/addressdb/rml-liezen/import-from-modified-export-2023-03-02.php index 1feb6ec12..35d9fd847 100644 --- a/scripts/addressdb/liezen/import-from-modified-export-2023-03-02.php +++ b/scripts/addressdb/rml-liezen/import-from-modified-export-2023-03-02.php @@ -71,25 +71,6 @@ while($csv = fgetcsv($input, 0, ",")) { $rw = trim($csv[25]); $hw = trim($csv[26]); - /* - $adrcd = trim($csv[0]); - $gem_kz = trim($csv[2]); - $gem_name = trim($csv[3]); - $ort_kz = trim($csv[5]); - $plz_string = trim($csv[4]); - $ort_name = trim($csv[6]); - $skz = trim($csv[7]); - $strasse_name = trim($csv[8]); - $hausnummer_string = trim($csv[9]); - $hausnummer_extref = trim($csv[0]); - if(in_array($hausnummer_extref, $h_extrefs)) { - die("Hausnummer extref doppelt! $hausnummer_extref\n"); - } - $h_extrefs[] = $hausnummer_extref; - */ - //$lat = str_replace(",",".",trim($csv[7])); - //$long = str_replace(",",".",trim($csv[8])); - if(!is_numeric($hausnummer_id)) { die("Invalid hausnummer_id '$hausnummer_id'\n"); @@ -187,7 +168,7 @@ while($csv = fgetcsv($input, 0, ",")) { $updates[] = "hw"; } - continue; + //continue; if(!count($updates)) { continue; @@ -203,6 +184,14 @@ while($csv = fgetcsv($input, 0, ",")) { //$existing_hausnummer->save(); } + + if(in_array("strasse", $updates)) { + $strasse = ADBStrasseModel::getFirst(["gemeinde_id" => $existing_hausnummer->strasse->gemeinde_id, "name" => $strasse_name]); + if(!$strasse) { + die("Strasse $skz $strasse_name not found!\n"); + } + } + if(in_array("gdaeigenschaft", $updates)) { $existing_hausnummer->gdaeigenschaft = $gdaeigenschaft; } @@ -264,6 +253,7 @@ while($csv = fgetcsv($input, 0, ",")) { //$existing_hausnummer->save(); } + $preorder = PreorderModel::getFirst(["adb_hausnummer_id" => $existing_hausnummer->id]); if($preorder) { echo "========================================================================\n"; diff --git a/scripts/addressdb/liezen/import-from-modified-export.php b/scripts/addressdb/rml-liezen/import-from-modified-export.php similarity index 100% rename from scripts/addressdb/liezen/import-from-modified-export.php rename to scripts/addressdb/rml-liezen/import-from-modified-export.php diff --git a/scripts/addressdb/liezen/import/Adressendatensatz_BP2023_20221201.csv b/scripts/addressdb/rml-liezen/import/Adressendatensatz_BP2023_20221201.csv similarity index 100% rename from scripts/addressdb/liezen/import/Adressendatensatz_BP2023_20221201.csv rename to scripts/addressdb/rml-liezen/import/Adressendatensatz_BP2023_20221201.csv diff --git a/scripts/addressdb/liezen/import/Adressendatensatz_Cluster16_20221221.csv b/scripts/addressdb/rml-liezen/import/Adressendatensatz_Cluster16_20221221.csv similarity index 100% rename from scripts/addressdb/liezen/import/Adressendatensatz_Cluster16_20221221.csv rename to scripts/addressdb/rml-liezen/import/Adressendatensatz_Cluster16_20221221.csv diff --git a/scripts/addressdb/liezen/import/Adressendatensatz_Draft01_20221118_UTF8.csv b/scripts/addressdb/rml-liezen/import/Adressendatensatz_Draft01_20221118_UTF8.csv similarity index 100% rename from scripts/addressdb/liezen/import/Adressendatensatz_Draft01_20221118_UTF8.csv rename to scripts/addressdb/rml-liezen/import/Adressendatensatz_Draft01_20221118_UTF8.csv diff --git a/scripts/addressdb/liezen/import/Adressendatensatz_Update-RMLI_2023-01-29.csv b/scripts/addressdb/rml-liezen/import/Adressendatensatz_Update-RMLI_2023-01-29.csv similarity index 100% rename from scripts/addressdb/liezen/import/Adressendatensatz_Update-RMLI_2023-01-29.csv rename to scripts/addressdb/rml-liezen/import/Adressendatensatz_Update-RMLI_2023-01-29.csv diff --git a/scripts/addressdb/liezen/import/Adressendatensatz_Update-RMLI_2023-03-02.csv b/scripts/addressdb/rml-liezen/import/Adressendatensatz_Update-RMLI_2023-03-02.csv similarity index 100% rename from scripts/addressdb/liezen/import/Adressendatensatz_Update-RMLI_2023-03-02.csv rename to scripts/addressdb/rml-liezen/import/Adressendatensatz_Update-RMLI_2023-03-02.csv diff --git a/scripts/addressdb/liezen/import/Adressendatensatz_Update_RMLI-2024-01-04_final.csv b/scripts/addressdb/rml-liezen/import/Adressendatensatz_Update_RMLI-2024-01-04_final.csv similarity index 100% rename from scripts/addressdb/liezen/import/Adressendatensatz_Update_RMLI-2024-01-04_final.csv rename to scripts/addressdb/rml-liezen/import/Adressendatensatz_Update_RMLI-2024-01-04_final.csv