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 
Rimo Import update

See merge request fronk/thetool!1355
This commit is contained in:
Frank Schubert
2025-05-17 10:33:08 +00:00
parent fdd8b2342b 7c2648d767
commit e3bed66680
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/ADBWohneinheit/ADBWohneinheitModel.php
View File

@@ -111,7 +111,7 @@ class ADBWohneinheitModel {
$res = $db->query($sql);
if($db->num_rows($res)) {
$data = $db->fetch_object($res);
return $data->cnt;
return (int)$data->cnt;
}
return 0;
}

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

@@ -585,11 +585,6 @@ foreach ($clusters as $cluster_data) {
}
if(!in_array($adb_unit->extref, $rimo_home_list)) {
if(count($adb_unit->active_preorders)) {
$adb_unit->save(["no_updates" => 1]);
continue;
}
if($adb_unit->oaid) {
$oaid = \OpenAccessIdModel::getFirstOaid($adb_unit->oaid);
$oaid_units_count = \ADBWohneinheitModel::count(["oaid" => $adb_unit->oaid]);
@@ -600,6 +595,12 @@ foreach ($clusters as $cluster_data) {
}
}
if(count($adb_unit->active_preorders)) {
$adb_unit->save(["no_updates" => 1]);
continue;
}
echo "[DD] Deleting Hausnummer ".$adb_unit->hausnummer_id." Wohneinheit ".$adb_unit->id." (extref ".$adb_unit->extref.")\n";
$addressErrors[] = "[DD] Deleting Hausnummer ".$adb_unit->hausnummer_id." Wohneinheit ".$adb_unit->id." (extref ".$adb_unit->extref.")";