From d0b4a18f93389a801b42e04216c92bd7d6b8f413 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Tue, 22 Nov 2022 15:23:37 +0100 Subject: [PATCH] Fixed to Liezen addressdb update script --- scripts/addressdb/liezen/addressdb_update.php | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/scripts/addressdb/liezen/addressdb_update.php b/scripts/addressdb/liezen/addressdb_update.php index a4e718a36..4f65c5bd1 100644 --- a/scripts/addressdb/liezen/addressdb_update.php +++ b/scripts/addressdb/liezen/addressdb_update.php @@ -121,6 +121,10 @@ while($csv = fgetcsv($input, 0, ";")) { if(!$gemeinde) { die("Gemeinde ($gem_kz, $gem_name) nicht in addressdb gefunden\n"); } + + // check for GemeindeNetzgebiet + checkGemeindeNetzgebiet($gemeinde, $netzgebiet); + continue; $strasse = ADBStrasseModel::getFirst(['kennziffer' => $skz]); if(!$strasse) { die("Strasse ($skz, $strasse_name) nicht in addressdb gefunden\n"); @@ -168,18 +172,6 @@ while($csv = fgetcsv($input, 0, ";")) { //$hausnummer = ADBHausnummerModel::getFirst(['gemeind_id' => $gemeinde->id, 'strasse_id' => $strasse->id, 'hausnummer' => $hausnummer_string]); $hausnummer = ADBHausnummerModel::getFirst(['adrcd' => $adrcd]); if(!$hausnummer) { - if(is_numeric($rollout_time)) { - $rollout = $rollout_time; - $freigabe = $freigabe_default; - } elseif($rollout_time == "2024/2025") { - $rollout = null; - $rollout_info = "Bauprogramm 2024/2025"; - $freigabe = json_encode(['reorder']); - } else { - $rollout = null; - $rollout_info = $rollout_time; - $freigabe = json_encode([]); - } $hausnummer_data = [ 'adrcd' => $adrcd, @@ -214,4 +206,22 @@ while($csv = fgetcsv($input, 0, ";")) { } -echo "$i lines processed, $c created, $u updated\n"; \ No newline at end of file +echo "$i lines processed, $c created, $u updated\n"; + + +function checkGemeindeNetzgebiet($gemeinde, $netzgebiet) { + global $db; + + $sql = "SELECT * FROM GemeindeNetzgebiet WHERE gemeinde_id=".$gemeinde->id." AND netzgebiet_id=".$netzgebiet->id; + $res = $db->query($sql); + if($db->num_rows($res)) { + return true; + } + + $sql = "INSERT INTO GemeindeNetzgebiet (gemeinde_id, netzgebiet_id, `create`, `edit`) VALUES (".$gemeinde->id.", ".$netzgebiet->id.", UNIX_TIMESTAMP(), UNIX_TIMESTAMP())"; + if(!$db->query($sql)) { + die("SQL Query failed: $sql\n ".$db->getLastError()); + } + + return true; +} \ No newline at end of file