Skip to content

Commit f3a9b4a

Browse files
curtisdelicatacurtisdelicata
authored
Merge branch 'master' into optimse
2 parents 670ea31 + 53ea044 commit f3a9b4a

File tree

10 files changed

+222
-247
lines changed

10 files changed

+222
-247
lines changed

‎src/Utils/FamilyData.php‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@
33
namespace GenealogiaWebsite\LaravelGedcom\Utils;
44

55
use GenealogiaWebsite\LaravelGedcom\Models\Family;
6-
use GenealogiaWebsite\LaravelGedcom\Models\Person;
7-
use GenealogiaWebsite\LaravelGedcom\Utils\Importer\Chan;
8-
use GenealogiaWebsite\LaravelGedcom\Utils\Importer\Fam\Even;
9-
use GenealogiaWebsite\LaravelGedcom\Utils\Importer\Fam\Slgs;
10-
use GenealogiaWebsite\LaravelGedcom\Utils\Importer\NoteRef;
11-
use GenealogiaWebsite\LaravelGedcom\Utils\Importer\ObjeRef;
12-
use GenealogiaWebsite\LaravelGedcom\Utils\Importer\Refn;
13-
use GenealogiaWebsite\LaravelGedcom\Utils\Importer\SourRef;
14-
use GenealogiaWebsite\LaravelGedcom\Utils\Importer\Subm;
156

167
class FamilyData
178
{
@@ -33,7 +24,7 @@ class FamilyData
3324
public static function getFamily($conn, $families, $obje_ids)
3425
{
3526
$familyData = [];
36-
foreach($families as $family){
27+
foreach ($families as $family) {
3728
$g_id = $family->getId();
3829
$resn = $family->getResn();
3930
$husb = $family->getHusb();
@@ -71,6 +62,6 @@ public static function getFamily($conn, $families, $obje_ids)
7162
// $familydata [] = $value;
7263
}
7364
// Family::insert($familyData);
74-
otherFamRecord::insertFamilyData($conn,$families,$obje_ids);
65+
otherFamRecord::insertFamilyData($conn, $families, $obje_ids);
7566
}
7667
}

‎src/Utils/GedcomParser.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@ public function parse($conn, string $filename, string $slug, bool $progressBar =
4949
error_log('PARSE LOG : +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++'.$conn);
5050
$parser = new Parser();
5151
$gedcom = @$parser->parse($filename);
52-
52+
5353
/**
5454
* work.
5555
*/
56-
5756
$head = $gedcom->getHead();
5857
$subn = $gedcom->getSubn();
5958
$subm = $gedcom->getSubm();
@@ -84,7 +83,7 @@ public function parse($conn, string $filename, string $slug, bool $progressBar =
8483
$complete = 0;
8584
if ($progressBar === true) {
8685
$bar = $this->getProgressBar($indCount + $famCount);
87-
event(new GedComProgressSent($slug, $total, $complete));
86+
event(new GedComProgressSent($slug, $total, $complete));
8887
}
8988
Log::info('Individual:'.$indCount);
9089
Log::info('Families:'.$famCount);
@@ -218,11 +217,11 @@ public function parse($conn, string $filename, string $slug, bool $progressBar =
218217
$item->delete();
219218
}
220219
}
221-
220+
222221
FamilyData::getFamily($this->conn, $families, $this->obje_ids);
223-
222+
224223
foreach ($families as $family) {
225-
// // $this->getFamily($family);
224+
// // $this->getFamily($family);
226225
// FamilyData::getFamily($this->conn, $family, $this->obje_ids);
227226
if ($progressBar === true) {
228227
$bar->advance();
@@ -250,5 +249,4 @@ private function getProgressBar(int $max)
250249
new StreamOutput(fopen('php://stdout', 'w'))
251250
))->createProgressBar($max);
252251
}
253-
254252
}

‎src/Utils/Importer/Indi/Alia.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ class Alia
1212
* Integer $group_id.
1313
*/
1414
public static function read($conn, $item, $group = '', $group_id = 0)
15-
{
15+
{
1616
$aliaData = [];
1717
foreach ($item as $alia) {
1818
if ($alia) {
1919
$data = ['group'=>$group, 'gid'=>$group_id, 'alia'=>$alia];
20-
$aliaData [] = $data;
20+
$aliaData[] = $data;
2121
}
2222
}
2323
PersonAlia::on($conn)->insert($aliaData);

‎src/Utils/Importer/Indi/Anci.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static function read($conn, $item, $group = '', $group_id = 0, $subm_ids)
2121
$subm_id = $subm_ids[$anci];
2222
$key = ['group'=>$group, 'gid'=>$group_id, 'anci'=>$subm_id];
2323
$data = ['group'=>$group, 'gid'=>$group_id, 'anci'=>$subm_id];
24-
$record [] = $data;
24+
$record[] = $data;
2525
}
2626
}
2727
}

‎src/Utils/Importer/Indi/Even.php‎

Lines changed: 101 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,29 @@ class Even
1616
public static function read($conn, $events, $person, $obje_ids = [])
1717
{
1818
$eventData = [];
19-
foreach($events as $event){
20-
if ($event && count($event) > 0) {
19+
foreach ($events as $event) {
20+
if ($event && count($event) > 0) {
2121
$even = $event[0];
22-
$class_name = get_class($even);
23-
$person_id = $person->id;
24-
$type = $even->getType();
25-
$attr = $even->getAttr();
26-
$_date = $even->getDate();
27-
$date = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Date::read($conn, $_date);
28-
$_plac = $even->getPlac();
29-
$plac = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Indi\Even\Plac::read($conn, $_plac);
30-
$_phon = $even->getPhon();
31-
$phon = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Phon::read($conn, $_phon);
32-
$_addr = $even->getAddr();
33-
$addr_id = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Addr::read($conn, $_addr);
22+
$class_name = get_class($even);
23+
$person_id = $person->id;
24+
$type = $even->getType();
25+
$attr = $even->getAttr();
26+
$_date = $even->getDate();
27+
$date = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Date::read($conn, $_date);
28+
$_plac = $even->getPlac();
29+
$plac = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Indi\Even\Plac::read($conn, $_plac);
30+
$_phon = $even->getPhon();
31+
$phon = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Phon::read($conn, $_phon);
32+
$_addr = $even->getAddr();
33+
$addr_id = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Addr::read($conn, $_addr);
3434

35-
$caus = $even->getCaus();
36-
$age = $even->getAge();
37-
$agnc = $even->getAgnc();
38-
$adop = '';
39-
$adop_famc = '';
40-
$birt_famc = '';
41-
switch ($class_name) {
35+
$caus = $even->getCaus();
36+
$age = $even->getAge();
37+
$agnc = $even->getAgnc();
38+
$adop = '';
39+
$adop_famc = '';
40+
$birt_famc = '';
41+
switch ($class_name) {
4242
case 'Adop':
4343
$adop = $even->getAdop();
4444
$adop_famc = $even->getFamc();
@@ -138,6 +138,7 @@ public static function read($conn, $events, $person, $obje_ids = [])
138138
];
139139
$check = PersonEvent::on($conn)->where($key)->first();
140140
if(empty($check)){
141+
141142
$data = [
142143
'person_id' => $person_id,
143144
'title' => $class_name,
@@ -155,38 +156,40 @@ public static function read($conn, $events, $person, $obje_ids = [])
155156
'birt_famc' => $birt_famc, //
156157
];
157158

158-
$eventData [] = $data;
159+
$eventData[] = $data;
159160
}
160161
}
161162
}
162163
PersonEvent::on($conn)->insert($eventData);
163164
$new = new Even;
164165
$new->otherField($conn,$events,$person);
165166
}
166-
public static function otherField($conn, $events, $person){
167-
foreach($events as $event){
168-
if ($event && count($event) > 0) {
167+
168+
public static function otherField($conn, $events, $person)
169+
{
170+
foreach ($events as $event) {
171+
if ($event && count($event) > 0) {
169172
$even = $event[0];
170-
$class_name = get_class($even);
171-
$person_id = $person->id;
172-
$type = $even->getType();
173-
$attr = $even->getAttr();
174-
$_date = $even->getDate();
175-
$date = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Date::read($conn, $_date);
176-
$_plac = $even->getPlac();
177-
$plac = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Indi\Even\Plac::read($conn, $_plac);
178-
$_phon = $even->getPhon();
179-
$phon = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Phon::read($conn, $_phon);
180-
$_addr = $even->getAddr();
181-
$addr_id = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Addr::read($conn, $_addr);
173+
$class_name = get_class($even);
174+
$person_id = $person->id;
175+
$type = $even->getType();
176+
$attr = $even->getAttr();
177+
$_date = $even->getDate();
178+
$date = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Date::read($conn, $_date);
179+
$_plac = $even->getPlac();
180+
$plac = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Indi\Even\Plac::read($conn, $_plac);
181+
$_phon = $even->getPhon();
182+
$phon = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Phon::read($conn, $_phon);
183+
$_addr = $even->getAddr();
184+
$addr_id = \GenealogiaWebsite\LaravelGedcom\Utils\Importer\Addr::read($conn, $_addr);
182185

183-
$caus = $even->getCaus();
184-
$age = $even->getAge();
185-
$agnc = $even->getAgnc();
186-
$adop = '';
187-
$adop_famc = '';
188-
$birt_famc = '';
189-
switch ($class_name) {
186+
$caus = $even->getCaus();
187+
$age = $even->getAge();
188+
$agnc = $even->getAgnc();
189+
$adop = '';
190+
$adop_famc = '';
191+
$birt_famc = '';
192+
switch ($class_name) {
190193
case 'Adop':
191194
$adop = $even->getAdop();
192195
$adop_famc = $even->getFamc();
@@ -265,71 +268,71 @@ public static function otherField($conn, $events, $person){
265268
break;
266269
default:
267270
}
268-
$adop = '';
269-
$adop_famc = '';
270-
$birt_famc = '';
271-
// store Even
272-
$key = [
273-
['person_id' , $person_id],
274-
['title' , $class_name],
275-
['type' , $type],
276-
['attr' , $attr],
277-
['date' , $date],
278-
['plac' , $plac],
279-
['phon' , $phon],
280-
['caus' , $caus],
281-
['age' , $age],
282-
['agnc' , $agnc],
283-
['adop' , $adop],
284-
['adop_famc' , $adop_famc],
285-
['birt_famc' , $birt_famc],
286-
];
271+
$adop = '';
272+
$adop_famc = '';
273+
$birt_famc = '';
274+
// store Even
275+
$key = [
276+
['person_id', $person_id],
277+
['title', $class_name],
278+
['type', $type],
279+
['attr', $attr],
280+
['date', $date],
281+
['plac', $plac],
282+
['phon', $phon],
283+
['caus', $caus],
284+
['age', $age],
285+
['agnc', $agnc],
286+
['adop', $adop],
287+
['adop_famc', $adop_famc],
288+
['birt_famc', $birt_famc],
289+
];
287290

288291
$record = PersonEvent::on($conn)->where($key)->first();
289292

290-
$_group = 'indi_even';
291-
$_gid = $record->id;
293+
$_group = 'indi_even';
294+
$_gid = $record->id;
292295

293-
// update person's record
294-
if ($class_name == 'BIRT' && !empty($date)) {
295-
$person->birthday = date('Y-m-d', strtotime($date));
296-
}
297-
// add deathyear to person table ( for form builder )
298-
if ($class_name == 'DEAT' && !empty($date)) {
299-
$person->deathday = date('Y-m-d', strtotime($date));
300-
}
301-
$person->save();
296+
// update person's record
297+
if ($class_name == 'BIRT' && !empty($date)) {
298+
$person->birthday = date('Y-m-d', strtotime($date));
299+
}
300+
// add deathyear to person table ( for form builder )
301+
if ($class_name == 'DEAT' && !empty($date)) {
302+
$person->deathday = date('Y-m-d', strtotime($date));
303+
}
304+
$person->save();
302305

303-
// array
304-
$sour = $even->getSour();
305-
if ($sour && count($sour) > 0) {
306-
foreach ($sour as $item) {
307-
if ($item) {
308-
\GenealogiaWebsite\LaravelGedcom\Utils\Importer\SourRef::read($conn, $item, $_group, $_gid);
306+
// array
307+
$sour = $even->getSour();
308+
if ($sour && count($sour) > 0) {
309+
foreach ($sour as $item) {
310+
if ($item) {
311+
\GenealogiaWebsite\LaravelGedcom\Utils\Importer\SourRef::read($conn, $item, $_group, $_gid);
312+
}
309313
}
310314
}
311-
}
312-
$obje = $even->getObje();
313-
if ($obje && count($obje) > 0) {
314-
foreach ($obje as $item) {
315-
if ($item) {
316-
\GenealogiaWebsite\LaravelGedcom\Utils\Importer\ObjeRef::read($conn, $item, $_group, $_gid, $obje_ids);
315+
$obje = $even->getObje();
316+
if ($obje && count($obje) > 0) {
317+
foreach ($obje as $item) {
318+
if ($item) {
319+
\GenealogiaWebsite\LaravelGedcom\Utils\Importer\ObjeRef::read($conn, $item, $_group, $_gid, $obje_ids);
320+
}
317321
}
318322
}
319-
}
320-
$notes = $even->getNote();
321-
if ($notes && count($notes) > 0) {
322-
foreach ($notes as $item) {
323-
\GenealogiaWebsite\LaravelGedcom\Utils\Importer\NoteRef::read($conn, $item, $_group, $_gid);
323+
$notes = $even->getNote();
324+
if ($notes && count($notes) > 0) {
325+
foreach ($notes as $item) {
326+
\GenealogiaWebsite\LaravelGedcom\Utils\Importer\NoteRef::read($conn, $item, $_group, $_gid);
327+
}
328+
}
329+
// object
330+
$_chan = $even->getChan() ?? null;
331+
if ($_chan !== null) {
332+
\GenealogiaWebsite\LaravelGedcom\Utils\Importer\Chan::read($conn, $_chan, $_group, $_gid);
324333
}
325-
}
326-
// object
327-
$_chan = $even->getChan() ?? null;
328-
if ($_chan !== null) {
329-
\GenealogiaWebsite\LaravelGedcom\Utils\Importer\Chan::read($conn, $_chan, $_group, $_gid);
330-
}
331334

332-
// $_type = $even->getType();
335+
// $_type = $even->getType();
333336
// $person->addEvent($_type, $date, $plac);
334337
}
335338
}

‎src/Utils/Importer/Indi/Subm.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static function read($conn, $item, $group = '', $group_id = 0, $subm_ids)
2121
$subm_id = $subm_ids[$subm];
2222
$key = ['group'=>$group, 'gid'=>$group_id, 'subm'=>$subm_id];
2323
$data = ['group'=>$group, 'gid'=>$group_id, 'subm'=>$subm_id];
24-
$record [] = $data;
24+
$record[] = $data;
2525
}
2626
}
2727
}

0 commit comments

Comments
 (0)