Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'fronkdev' into 'master'

Browse Source 
Fixed counting homes in Rimo Import

See merge request fronk/thetool!1444
This commit is contained in:
Frank Schubert
2025-06-12 02:52:29 +00:00
parent 57e1f5b22a 64e0bd6367
commit efc9767f69
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/adb-rimo-import/ADBAddressHelper/address_helper.php
View File

@@ -182,7 +182,10 @@ class AddressHelper
$addr_dbg_str = "strasse_hausnummer: $strasse_hausnummer | zusatz: $addresszusatz | gemkz: $gem_kz | gem_name: $gem_name | ort_name: $ort_name | plz_name: $plz_name | adrcd: $adr | $rimo_id";
if (!$hausnummer_name || !$gem_name || !$plz_name || !$ort_name || !$strasse_name) {
// try to find by rimo_id
$hausnummer = ADBHausnummerModel::getFirst(["rimo_id" => $rimo_id]);
if (!$hausnummer && (!$hausnummer_name || !$gem_name || !$plz_name || !$ort_name || !$strasse_name)) {
$this->logFindAddressError("[WW] Adressbestandteil fehlt ($addr_dbg_str)");
return false;
}
@@ -214,13 +217,6 @@ class AddressHelper
}
$gemeinde_id = $gemeinde->id;
$hausnummer = ADBHausnummerModel::getFirst(["rimo_id" => $rimo_id]);
/*if($hausnummer) {
echo "found hausnummer from rimo_id $rimo_id\n";
}*/
$force_subcd = false;
$force_no_subcd = false;

15
scripts/adb-rimo-import/rimo-import.php
View File

@@ -307,10 +307,13 @@ foreach ($clusters as $cluster_data) {
}
}
$plannedTU = $building->plannedTU;
$to_create_count = $building->plannedTU - count($existing_units);
$rimo_home_count = 0;
if (property_exists($building->homes, "item") && is_array($building->homes->item) && count($building->homes->item)) {
$rimo_home_count = count($building->homes->item);
}
$to_create_count = $rimo_home_count - count($existing_units);
if ($plannedTU && $to_create_count > 0) {
if ($rimo_home_count && $to_create_count > 0) {
for ($i = 0; $i < $to_create_count; $i++) {
$unit = \ADBWohneinheitModel::create([
"hausnummer_id" => $hausnummer->id,
@@ -375,12 +378,12 @@ foreach ($clusters as $cluster_data) {
}
}
$unit = new \ADBWohneinheit($unit->id);
//$unit = new \ADBWohneinheit($unit->id);
\mfValuecache::singleton()->set("adbhausnummer-save-nesting-level-".$hausnummer->id, 0);
\mfValuecache::singleton()->set("adbwohneinheit-save-nesting-level-".$unit->id, 0);
}
$unit = new \ADBWohneinheit($unit->id);
//$unit = new \ADBWohneinheit($unit->id);
if($unit->rimo_deleted) {
$unit->rimo_deleted = 0;
$unit->save(["no_updates" => 1]);
@@ -391,7 +394,7 @@ foreach ($clusters as $cluster_data) {
if (!$unit->save()) {
die("Error saving new extref on unit\n" . print_r($home, true));
}
$unit = new \ADBWohneinheit($unit->id);
//$unit = new \ADBWohneinheit($unit->id);
\mfValuecache::singleton()->set("adbhausnummer-save-nesting-level-".$hausnummer->id, 0);
\mfValuecache::singleton()->set("adbwohneinheit-save-nesting-level-".$unit->id, 0);
}