@@ -67,14 +67,14 @@ |
||
67 | 67 | $_group = 'subm'; |
68 | 68 | $_gid = $record->id; |
69 | 69 | |
70 | - $note = $subm->getNote(); // array --- |
|
70 | + $note = $subm->getNote(); // array --- |
|
71 | 71 | |
72 | 72 | if ($note != null && count($note) > 0) { |
73 | 73 | foreach ($note as $item) { |
74 | 74 | \FamilyTree365\LaravelGedcom\Utils\Importer\NoteRef::read($conn, $item, $_group, $_gid); |
75 | 75 | } |
76 | 76 | } |
77 | - $obje = $subm->getObje() ?? null; // array --- |
|
77 | + $obje = $subm->getObje() ?? null; // array --- |
|
78 | 78 | if ($obje && count($obje) > 0) { |
79 | 79 | foreach ($obje as $item) { |
80 | 80 | if ($item) { |
@@ -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 | } |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | $rin = $note->getRin(); |
21 | 21 | |
22 | 22 | // store note |
23 | - $key = ['group'=>$group, 'gid'=>$group_id, 'note'=> utf8_encode($_note) ]; |
|
23 | + $key = ['group'=>$group, 'gid'=>$group_id, 'note'=> utf8_encode($_note)]; |
|
24 | 24 | $data = ['group'=>$group, 'gid'=>$group_id, 'note'=> utf8_encode($_note), 'rin'=>$rin]; |
25 | 25 | $record = MNote::on($conn)->updateOrCreate($key, $data); |
26 | 26 | |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | return $_gid; |
52 | 52 | } |
53 | - catch(Throwable $e) |
|
53 | + catch (Throwable $e) |
|
54 | 54 | { |
55 | 55 | report($e); |
56 | 56 | } |
@@ -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 | } |
@@ -57,83 +57,83 @@ discard block |
||
57 | 57 | $adop_famc = ''; |
58 | 58 | $birt_famc = ''; |
59 | 59 | switch ($class_name) { |
60 | - case 'Adop': |
|
61 | - $adop = $even->getAdop(); |
|
62 | - $adop_famc = $even->getFamc(); |
|
63 | - break; |
|
64 | - case 'Birt': |
|
65 | - $birt_famc = $even->getFamc(); |
|
66 | - break; |
|
67 | - case 'Bapm': |
|
68 | - break; |
|
69 | - case 'Barm': |
|
70 | - break; |
|
71 | - case 'Basm': |
|
72 | - break; |
|
73 | - case 'Bles': |
|
74 | - break; |
|
75 | - case 'Buri': |
|
76 | - break; |
|
77 | - case 'Cast': |
|
78 | - break; |
|
79 | - case 'Cens': |
|
80 | - break; |
|
81 | - case 'Chr': |
|
82 | - $chr_famc = $even->getFamc(); |
|
83 | - break; |
|
84 | - case 'Chra': |
|
85 | - break; |
|
86 | - case 'Conf': |
|
87 | - break; |
|
88 | - case 'Crem': |
|
89 | - break; |
|
90 | - case 'Dscr': |
|
91 | - break; |
|
92 | - case 'Deat': |
|
93 | - break; |
|
94 | - case 'Educ': |
|
95 | - break; |
|
96 | - case 'Emig': |
|
97 | - break; |
|
98 | - case 'Fcom': |
|
99 | - break; |
|
100 | - case 'Grad': |
|
101 | - break; |
|
102 | - case 'Idno': |
|
103 | - break; |
|
104 | - case 'Immi': |
|
105 | - break; |
|
106 | - case 'Nati': |
|
107 | - break; |
|
108 | - case 'Nchi': |
|
109 | - break; |
|
110 | - case 'Natu': |
|
111 | - break; |
|
112 | - case 'Nmr': |
|
113 | - break; |
|
114 | - case 'Occu': |
|
115 | - break; |
|
116 | - case 'Ordn': |
|
117 | - break; |
|
118 | - case 'Reti': |
|
119 | - break; |
|
120 | - case 'Prob': |
|
121 | - break; |
|
122 | - case 'Prop': |
|
123 | - break; |
|
124 | - case 'Reli': |
|
125 | - break; |
|
126 | - case 'Resi': |
|
127 | - break; |
|
128 | - case 'Ssn': |
|
129 | - break; |
|
130 | - case 'Titl': |
|
131 | - break; |
|
132 | - case 'Will': |
|
133 | - break; |
|
134 | - case 'Even': |
|
135 | - break; |
|
136 | - default: |
|
60 | + case 'Adop': |
|
61 | + $adop = $even->getAdop(); |
|
62 | + $adop_famc = $even->getFamc(); |
|
63 | + break; |
|
64 | + case 'Birt': |
|
65 | + $birt_famc = $even->getFamc(); |
|
66 | + break; |
|
67 | + case 'Bapm': |
|
68 | + break; |
|
69 | + case 'Barm': |
|
70 | + break; |
|
71 | + case 'Basm': |
|
72 | + break; |
|
73 | + case 'Bles': |
|
74 | + break; |
|
75 | + case 'Buri': |
|
76 | + break; |
|
77 | + case 'Cast': |
|
78 | + break; |
|
79 | + case 'Cens': |
|
80 | + break; |
|
81 | + case 'Chr': |
|
82 | + $chr_famc = $even->getFamc(); |
|
83 | + break; |
|
84 | + case 'Chra': |
|
85 | + break; |
|
86 | + case 'Conf': |
|
87 | + break; |
|
88 | + case 'Crem': |
|
89 | + break; |
|
90 | + case 'Dscr': |
|
91 | + break; |
|
92 | + case 'Deat': |
|
93 | + break; |
|
94 | + case 'Educ': |
|
95 | + break; |
|
96 | + case 'Emig': |
|
97 | + break; |
|
98 | + case 'Fcom': |
|
99 | + break; |
|
100 | + case 'Grad': |
|
101 | + break; |
|
102 | + case 'Idno': |
|
103 | + break; |
|
104 | + case 'Immi': |
|
105 | + break; |
|
106 | + case 'Nati': |
|
107 | + break; |
|
108 | + case 'Nchi': |
|
109 | + break; |
|
110 | + case 'Natu': |
|
111 | + break; |
|
112 | + case 'Nmr': |
|
113 | + break; |
|
114 | + case 'Occu': |
|
115 | + break; |
|
116 | + case 'Ordn': |
|
117 | + break; |
|
118 | + case 'Reti': |
|
119 | + break; |
|
120 | + case 'Prob': |
|
121 | + break; |
|
122 | + case 'Prop': |
|
123 | + break; |
|
124 | + case 'Reli': |
|
125 | + break; |
|
126 | + case 'Resi': |
|
127 | + break; |
|
128 | + case 'Ssn': |
|
129 | + break; |
|
130 | + case 'Titl': |
|
131 | + break; |
|
132 | + case 'Will': |
|
133 | + break; |
|
134 | + case 'Even': |
|
135 | + break; |
|
136 | + default: |
|
137 | 137 | } |
138 | 138 | $adop = ''; |
139 | 139 | $adop_famc = ''; |
@@ -216,83 +216,83 @@ discard block |
||
216 | 216 | $adop_famc = ''; |
217 | 217 | $birt_famc = ''; |
218 | 218 | switch ($class_name) { |
219 | - case 'Adop': |
|
220 | - $adop = $even->getAdop(); |
|
221 | - $adop_famc = $even->getFamc(); |
|
222 | - break; |
|
223 | - case 'Birt': |
|
224 | - $birt_famc = $even->getFamc(); |
|
225 | - break; |
|
226 | - case 'Bapm': |
|
227 | - break; |
|
228 | - case 'Barm': |
|
229 | - break; |
|
230 | - case 'Basm': |
|
231 | - break; |
|
232 | - case 'Bles': |
|
233 | - break; |
|
234 | - case 'Buri': |
|
235 | - break; |
|
236 | - case 'Cast': |
|
237 | - break; |
|
238 | - case 'Cens': |
|
239 | - break; |
|
240 | - case 'Chr': |
|
241 | - $chr_famc = $even->getFamc(); |
|
242 | - break; |
|
243 | - case 'Chra': |
|
244 | - break; |
|
245 | - case 'Conf': |
|
246 | - break; |
|
247 | - case 'Crem': |
|
248 | - break; |
|
249 | - case 'Dscr': |
|
250 | - break; |
|
251 | - case 'Deat': |
|
252 | - break; |
|
253 | - case 'Educ': |
|
254 | - break; |
|
255 | - case 'Emig': |
|
256 | - break; |
|
257 | - case 'Fcom': |
|
258 | - break; |
|
259 | - case 'Grad': |
|
260 | - break; |
|
261 | - case 'Idno': |
|
262 | - break; |
|
263 | - case 'Immi': |
|
264 | - break; |
|
265 | - case 'Nati': |
|
266 | - break; |
|
267 | - case 'Nchi': |
|
268 | - break; |
|
269 | - case 'Natu': |
|
270 | - break; |
|
271 | - case 'Nmr': |
|
272 | - break; |
|
273 | - case 'Occu': |
|
274 | - break; |
|
275 | - case 'Ordn': |
|
276 | - break; |
|
277 | - case 'Reti': |
|
278 | - break; |
|
279 | - case 'Prob': |
|
280 | - break; |
|
281 | - case 'Prop': |
|
282 | - break; |
|
283 | - case 'Reli': |
|
284 | - break; |
|
285 | - case 'Resi': |
|
286 | - break; |
|
287 | - case 'Ssn': |
|
288 | - break; |
|
289 | - case 'Titl': |
|
290 | - break; |
|
291 | - case 'Will': |
|
292 | - break; |
|
293 | - case 'Even': |
|
294 | - break; |
|
295 | - default: |
|
219 | + case 'Adop': |
|
220 | + $adop = $even->getAdop(); |
|
221 | + $adop_famc = $even->getFamc(); |
|
222 | + break; |
|
223 | + case 'Birt': |
|
224 | + $birt_famc = $even->getFamc(); |
|
225 | + break; |
|
226 | + case 'Bapm': |
|
227 | + break; |
|
228 | + case 'Barm': |
|
229 | + break; |
|
230 | + case 'Basm': |
|
231 | + break; |
|
232 | + case 'Bles': |
|
233 | + break; |
|
234 | + case 'Buri': |
|
235 | + break; |
|
236 | + case 'Cast': |
|
237 | + break; |
|
238 | + case 'Cens': |
|
239 | + break; |
|
240 | + case 'Chr': |
|
241 | + $chr_famc = $even->getFamc(); |
|
242 | + break; |
|
243 | + case 'Chra': |
|
244 | + break; |
|
245 | + case 'Conf': |
|
246 | + break; |
|
247 | + case 'Crem': |
|
248 | + break; |
|
249 | + case 'Dscr': |
|
250 | + break; |
|
251 | + case 'Deat': |
|
252 | + break; |
|
253 | + case 'Educ': |
|
254 | + break; |
|
255 | + case 'Emig': |
|
256 | + break; |
|
257 | + case 'Fcom': |
|
258 | + break; |
|
259 | + case 'Grad': |
|
260 | + break; |
|
261 | + case 'Idno': |
|
262 | + break; |
|
263 | + case 'Immi': |
|
264 | + break; |
|
265 | + case 'Nati': |
|
266 | + break; |
|
267 | + case 'Nchi': |
|
268 | + break; |
|
269 | + case 'Natu': |
|
270 | + break; |
|
271 | + case 'Nmr': |
|
272 | + break; |
|
273 | + case 'Occu': |
|
274 | + break; |
|
275 | + case 'Ordn': |
|
276 | + break; |
|
277 | + case 'Reti': |
|
278 | + break; |
|
279 | + case 'Prob': |
|
280 | + break; |
|
281 | + case 'Prop': |
|
282 | + break; |
|
283 | + case 'Reli': |
|
284 | + break; |
|
285 | + case 'Resi': |
|
286 | + break; |
|
287 | + case 'Ssn': |
|
288 | + break; |
|
289 | + case 'Titl': |
|
290 | + break; |
|
291 | + case 'Will': |
|
292 | + break; |
|
293 | + case 'Even': |
|
294 | + break; |
|
295 | + default: |
|
296 | 296 | } |
297 | 297 | $adop = ''; |
298 | 298 | $adop_famc = ''; |
@@ -17,7 +17,7 @@ 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)) return; |
|
21 | 21 | |
22 | 22 | $eventData = []; |
23 | 23 | foreach ($events as $event) { |
@@ -170,8 +170,8 @@ discard block |
||
170 | 170 | 'age' => $age, // |
171 | 171 | 'agnc' => $agnc, // |
172 | 172 | 'adop' => $adop, // |
173 | - 'adop_famc' => $adop_famc, // |
|
174 | - 'birt_famc' => $birt_famc, // |
|
173 | + 'adop_famc' => $adop_famc, // |
|
174 | + 'birt_famc' => $birt_famc, // |
|
175 | 175 | ]; |
176 | 176 | |
177 | 177 | $eventData[] = $data; |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | } |
369 | 369 | } |
370 | 370 | } |
371 | - catch(Throwable $e) |
|
371 | + catch (Throwable $e) |
|
372 | 372 | { |
373 | 373 | report($e); |
374 | 374 | } |
@@ -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 | } |
@@ -154,7 +154,7 @@ |
||
154 | 154 | } |
155 | 155 | } |
156 | 156 | } |
157 | - catch(Throwable $e) |
|
157 | + catch (Throwable $e) |
|
158 | 158 | { |
159 | 159 | report($e); |
160 | 160 | } |
@@ -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 | } |
@@ -154,7 +154,7 @@ |
||
154 | 154 | } |
155 | 155 | } |
156 | 156 | } |
157 | - catch(Throwable $e) |
|
157 | + catch (Throwable $e) |
|
158 | 158 | { |
159 | 159 | report($e); |
160 | 160 | } |
@@ -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 | } |
@@ -18,7 +18,7 @@ |
||
18 | 18 | |
19 | 19 | // store chan |
20 | 20 | $key = ['group'=>$group, 'gid'=>$group_id, 'date'=>$date, 'time'=>$time]; |
21 | - $data = ['group'=>$group, 'gid'=>$group_id, 'date'=>$date, 'time'=>$time]; |
|
21 | + $data = ['group'=>$group, 'gid'=>$group_id, 'date'=>$date, 'time'=>$time]; |
|
22 | 22 | $record = MChan::on($conn)->updateOrCreate($key, $data); |
23 | 23 | |
24 | 24 | // store Sources of Note |
@@ -32,7 +32,7 @@ |
||
32 | 32 | $_group = 'subn'; |
33 | 33 | $_gid = $record->id; |
34 | 34 | |
35 | - $note = $subn->getNote(); // array --- |
|
35 | + $note = $subn->getNote(); // array --- |
|
36 | 36 | |
37 | 37 | if ($note != null && count($note) > 0) { |
38 | 38 | foreach ($note as $item) { |
@@ -43,7 +43,7 @@ |
||
43 | 43 | public function handle() |
44 | 44 | { |
45 | 45 | |
46 | - $dir = 'public/gedcom/exported'; |
|
46 | + $dir = 'public/gedcom/exported'; |
|
47 | 47 | |
48 | 48 | $filename = $this->argument('filename').".GED"; |
49 | 49 |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | |
48 | 48 | $filename = $this->argument('filename').".GED"; |
49 | 49 | |
50 | - $file_path = $dir . '/' . $filename; |
|
50 | + $file_path = $dir.'/'.$filename; |
|
51 | 51 | |
52 | 52 | if (!file_exists($dir)) { |
53 | 53 | Storage::makeDirectory($dir); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $people = Person::all(); |
70 | 70 | $submissions = $query->get(); |
71 | 71 | |
72 | - $data =array ( |
|
72 | + $data = array( |
|
73 | 73 | 'submissions' => $submissions, |
74 | 74 | 'people' => $people, |
75 | 75 | ); |