@@ -279,7 +279,7 @@ |
||
279 | 279 | $chan = $_subm->getChan() ?? ['Unknown']; // Record\Chan--- |
280 | 280 | $name = $_subm->getName() ?? 'Unknown'; // string |
281 | 281 | if ($_subm->getAddr() != null) { // Record/Addr |
282 | - $addr = $_subm->getAddr(); |
|
282 | + $addr = $_subm->getAddr(); |
|
283 | 283 | $addr->getAddr() ?? 'Unknown'; |
284 | 284 | $addr->getAdr1() ?? 'Unknown'; |
285 | 285 | $addr->getAdr2() ?? 'Unknown'; |
@@ -59,16 +59,16 @@ |
||
59 | 59 | // compact('husband_id', 'wife_id', 'description', 'type_id', 'nchi', 'rin') |
60 | 60 | // ); |
61 | 61 | |
62 | - $value = [ |
|
63 | - 'husband_id' => $husband_id, |
|
64 | - 'wife_id' => $wife_id, |
|
65 | - 'description' => $description, |
|
66 | - 'type_id' => $type_id, |
|
67 | - 'nchi' => $nchi, |
|
68 | - 'rin' => $rin |
|
69 | - ]; |
|
70 | - |
|
71 | - $familydata [] = $value; |
|
62 | + $value = [ |
|
63 | + 'husband_id' => $husband_id, |
|
64 | + 'wife_id' => $wife_id, |
|
65 | + 'description' => $description, |
|
66 | + 'type_id' => $type_id, |
|
67 | + 'nchi' => $nchi, |
|
68 | + 'rin' => $rin |
|
69 | + ]; |
|
70 | + |
|
71 | + $familydata [] = $value; |
|
72 | 72 | } |
73 | 73 | // Family::insert($familyData); |
74 | 74 |
@@ -245,7 +245,7 @@ |
||
245 | 245 | |
246 | 246 | foreach ($families as $family) { |
247 | 247 | // $this->getFamily($family); |
248 | - FamilyData::getFamily($this->conn, $family, $this->obje_ids); |
|
248 | + FamilyData::getFamily($this->conn, $family, $this->obje_ids); |
|
249 | 249 | if ($progressBar === true) { |
250 | 250 | $bar->advance(); |
251 | 251 | $complete++; |