some changes to AddressDB

This commit is contained in:
Frank Schubert
2022-09-01 14:39:37 +02:00
parent 976ab357a5
commit e900b305a8
7 changed files with 40 additions and 55 deletions

View File

@@ -121,11 +121,11 @@ class AddressDB {
die("Error creating Ortschaft $ort_kz $ort_name!\n");
}
}
$plz = ADBPlzModel::getFirst(['gemeinde_id' => $gemeinde->id, 'plz' => $plz_name]);
$plz = ADBPlzModel::getFirst(['plz' => $plz_name]);
if(!$plz) {
$plz = new ADBPlz();
$plz->gemeinde_id = $gemeinde->id;
$plz->plz = $plz_name;
$plz->plzstring = $plz_name;
$plz_id = $plz->save();
@@ -133,8 +133,8 @@ class AddressDB {
die("Error creating Plz $plz_name!\n");
}
}
//var_dump($plz);exit;
$strasse = ADBStrasseModel::getFirst(['gemeinde_id' => $gemeinde->id, 'ortschaft_id' => $ort->id, 'name' => $strasse_name]);
if(!$strasse) {
@@ -147,12 +147,13 @@ class AddressDB {
die("error creating Strasse $strasse_name (gemeinde ".$gemeinde->id.", ort ".$ort->id.")");
}
}
//var_dump($strasse);exit;
$hausnummer = ADBHausnummerModel::getFirst(['strasse_id' => $strasse->id, 'hausnummer' => $hausnummer_name]);
if(!$hausnummer) {
$hausnummer = new ADBHausnummer();
$hausnummer->plz_id = $plz->id;
$hausnummer->strasse_id = $strasse->id;
$hausnummer->hausnummer = $hausnummer_name;
$hausnummer_id = $hausnummer->save();
@@ -161,6 +162,7 @@ class AddressDB {
}
}
//var_dump($hausnummer);exit;
$we_search = [
'hausnummer_id' => $hausnummer->id,