@@ -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'; |
@@ -153,8 +153,7 @@ |
||
153 | 153 | \FamilyTree365\LaravelGedcom\Utils\Importer\NoteRef::read($conn, $item, $_group, $_gid); |
154 | 154 | } |
155 | 155 | } |
156 | - } |
|
157 | - catch(Throwable $e) |
|
156 | + } catch(Throwable $e) |
|
158 | 157 | { |
159 | 158 | report($e); |
160 | 159 | } |
@@ -14,9 +14,9 @@ discard block |
||
14 | 14 | */ |
15 | 15 | public static function read($conn, \Gedcom\Record\Note $note, $group = '', $group_id = 0) |
16 | 16 | { |
17 | - try |
|
18 | - { |
|
19 | - $_note = $note->getNote(); |
|
17 | + try |
|
18 | + { |
|
19 | + $_note = $note->getNote(); |
|
20 | 20 | $rin = $note->getRin(); |
21 | 21 | |
22 | 22 | // store note |
@@ -49,11 +49,11 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | return $_gid; |
52 | - } |
|
53 | - catch(Throwable $e) |
|
54 | - { |
|
52 | + } |
|
53 | + catch(Throwable $e) |
|
54 | + { |
|
55 | 55 | report($e); |
56 | - } |
|
56 | + } |
|
57 | 57 | |
58 | 58 | } |
59 | 59 | } |
@@ -49,8 +49,7 @@ |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | return $_gid; |
52 | - } |
|
53 | - catch(Throwable $e) |
|
52 | + } catch(Throwable $e) |
|
54 | 53 | { |
55 | 54 | report($e); |
56 | 55 | } |
@@ -17,7 +17,9 @@ discard block |
||
17 | 17 | public static function read($conn, $events, $person, $obje_ids = []) |
18 | 18 | { |
19 | 19 | |
20 | - if(empty($person)) return; |
|
20 | + if(empty($person)) { |
|
21 | + return; |
|
22 | + } |
|
21 | 23 | |
22 | 24 | $eventData = []; |
23 | 25 | foreach ($events as $event) { |
@@ -367,8 +369,7 @@ discard block |
||
367 | 369 | // $person->addEvent($_type, $date, $plac); |
368 | 370 | } |
369 | 371 | } |
370 | - } |
|
371 | - catch(Throwable $e) |
|
372 | + } catch(Throwable $e) |
|
372 | 373 | { |
373 | 374 | report($e); |
374 | 375 | } |
@@ -153,8 +153,7 @@ |
||
153 | 153 | \FamilyTree365\LaravelGedcom\Utils\Importer\NoteRef::read($conn, $item, $_group, $_gid); |
154 | 154 | } |
155 | 155 | } |
156 | - } |
|
157 | - catch(Throwable $e) |
|
156 | + } catch(Throwable $e) |
|
158 | 157 | { |
159 | 158 | report($e); |
160 | 159 | } |
@@ -14,9 +14,9 @@ discard block |
||
14 | 14 | */ |
15 | 15 | public static function read($conn, \Gedcom\Record\Note $note, $group = '', $group_id = 0) |
16 | 16 | { |
17 | - try |
|
18 | - { |
|
19 | - $_note = $note->getNote(); |
|
17 | + try |
|
18 | + { |
|
19 | + $_note = $note->getNote(); |
|
20 | 20 | $rin = $note->getRin(); |
21 | 21 | |
22 | 22 | // store note |
@@ -49,11 +49,11 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | return $_gid; |
52 | - } |
|
53 | - catch(Throwable $e) |
|
54 | - { |
|
52 | + } |
|
53 | + catch(Throwable $e) |
|
54 | + { |
|
55 | 55 | report($e); |
56 | - } |
|
56 | + } |
|
57 | 57 | |
58 | 58 | } |
59 | 59 | } |
@@ -49,8 +49,7 @@ |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | return $_gid; |
52 | - } |
|
53 | - catch(Throwable $e) |
|
52 | + } catch(Throwable $e) |
|
54 | 53 | { |
55 | 54 | report($e); |
56 | 55 | } |
@@ -17,7 +17,9 @@ discard block |
||
17 | 17 | public static function read($conn, $events, $person, $obje_ids = []) |
18 | 18 | { |
19 | 19 | |
20 | - if(empty($person)) return; |
|
20 | + if(empty($person)) { |
|
21 | + return; |
|
22 | + } |
|
21 | 23 | |
22 | 24 | $eventData = []; |
23 | 25 | foreach ($events as $event) { |
@@ -367,8 +369,7 @@ discard block |
||
367 | 369 | // $person->addEvent($_type, $date, $plac); |
368 | 370 | } |
369 | 371 | } |
370 | - } |
|
371 | - catch(Throwable $e) |
|
372 | + } catch(Throwable $e) |
|
372 | 373 | { |
373 | 374 | report($e); |
374 | 375 | } |
@@ -153,8 +153,7 @@ |
||
153 | 153 | \FamilyTree365\LaravelGedcom\Utils\Importer\NoteRef::read($conn, $item, $_group, $_gid); |
154 | 154 | } |
155 | 155 | } |
156 | - } |
|
157 | - catch(Throwable $e) |
|
156 | + } catch(Throwable $e) |
|
158 | 157 | { |
159 | 158 | report($e); |
160 | 159 | } |
@@ -153,8 +153,7 @@ |
||
153 | 153 | \FamilyTree365\LaravelGedcom\Utils\Importer\NoteRef::read($conn, $item, $_group, $_gid); |
154 | 154 | } |
155 | 155 | } |
156 | - } |
|
157 | - catch(Throwable $e) |
|
156 | + } catch(Throwable $e) |
|
158 | 157 | { |
159 | 158 | report($e); |
160 | 159 | } |