From ae9d6bcd226e92c49ff629fd427d34f03c098196 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Wed, 17 Jul 2024 17:38:55 +0200 Subject: [PATCH] Updated wohneinheit count script --- application/ADBHausnummer/ADBHausnummerModel.php | 2 ++ scripts/addressdb/update_hausnummer_unit_count.php | 9 +++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/application/ADBHausnummer/ADBHausnummerModel.php b/application/ADBHausnummer/ADBHausnummerModel.php index 5503bd9e3..6a6d3171e 100644 --- a/application/ADBHausnummer/ADBHausnummerModel.php +++ b/application/ADBHausnummer/ADBHausnummerModel.php @@ -256,6 +256,8 @@ class ADBHausnummerModel { $where .= " AND Hausnummer.netzgebiet_id IN (". implode(",", $netzgebiet_id).")"; } elseif($netzgebiet_id === null) { $where .= " AND Hausnummer.netzgebiet_id IS NULL"; + } elseif($netzgebiet_id === true) { + $where .= " AND Hausnummer.netzgebiet_id > 0"; } } diff --git a/scripts/addressdb/update_hausnummer_unit_count.php b/scripts/addressdb/update_hausnummer_unit_count.php index 892fab0a1..6268522f0 100644 --- a/scripts/addressdb/update_hausnummer_unit_count.php +++ b/scripts/addressdb/update_hausnummer_unit_count.php @@ -13,16 +13,13 @@ require_once(LIBDIR."/mvcfronk/mfBase/mfBaseController.php"); $i = 0; -foreach(ADBWohneinheitModel::getAll() as $unit) { - $hausnummer = new ADBHausnummer($unit->hausnummer_id); - if($hausnummer->id) { - $unit_count = ADBWohneinheitModel::count(['hausnummer_id' => $unit->hausnummer_id]); +foreach(ADBHausnummerModel::search(["netzgebiet_id" => true]) as $hausnummer) { + $unit_count = ADBWohneinheitModel::count(['hausnummer_id' => $hausnummer->id]); $hausnummer->unit_count = $unit_count; if(!$hausnummer->save()) { echo "error saving hausnummer ".$hausnummer->id."\n"; } $i++; - } } -echo "Updated $i Wohneinheiten\n"; +echo "Updated $i Hausnummern\n";