@@ -20,91 +20,91 @@ |
||
20 | 20 | */ |
21 | 21 | class Even extends \PhpGedcom\Parser\Component { |
22 | 22 | |
23 | - /** |
|
24 | - * |
|
25 | - * |
|
26 | - */ |
|
27 | - public static function parse(\PhpGedcom\Parser $parser) { |
|
28 | - $record = $parser->getCurrentLineRecord(); |
|
29 | - $depth = (int) $record[0]; |
|
23 | + /** |
|
24 | + * |
|
25 | + * |
|
26 | + */ |
|
27 | + public static function parse(\PhpGedcom\Parser $parser) { |
|
28 | + $record = $parser->getCurrentLineRecord(); |
|
29 | + $depth = (int) $record[0]; |
|
30 | 30 | |
31 | - $even = new \PhpGedcom\Record\Fam\Even(); |
|
31 | + $even = new \PhpGedcom\Record\Fam\Even(); |
|
32 | 32 | |
33 | - if (isset($record[1]) && strtoupper(trim($record[1])) != 'EVEN') { |
|
34 | - $even->setType(trim($record[1])); |
|
35 | - } |
|
33 | + if (isset($record[1]) && strtoupper(trim($record[1])) != 'EVEN') { |
|
34 | + $even->setType(trim($record[1])); |
|
35 | + } |
|
36 | 36 | |
37 | - $parser->forward(); |
|
37 | + $parser->forward(); |
|
38 | 38 | |
39 | - while (!$parser->eof()) { |
|
40 | - $record = $parser->getCurrentLineRecord(); |
|
41 | - $recordType = strtoupper(trim($record[1])); |
|
42 | - $currentDepth = (int) $record[0]; |
|
39 | + while (!$parser->eof()) { |
|
40 | + $record = $parser->getCurrentLineRecord(); |
|
41 | + $recordType = strtoupper(trim($record[1])); |
|
42 | + $currentDepth = (int) $record[0]; |
|
43 | 43 | |
44 | - if ($currentDepth <= $depth) { |
|
45 | - $parser->back(); |
|
46 | - break; |
|
47 | - } |
|
44 | + if ($currentDepth <= $depth) { |
|
45 | + $parser->back(); |
|
46 | + break; |
|
47 | + } |
|
48 | 48 | |
49 | - switch ($recordType) { |
|
50 | - case 'TYPE': |
|
51 | - $even->setType(trim($record[2])); |
|
52 | - break; |
|
53 | - case 'DATE': |
|
54 | - $dat = \PhpGedcom\Parser\Date::parse($parser); |
|
55 | - $even->setDate($dat); |
|
56 | - //$even->setDate(trim($record[2])); |
|
57 | - break; |
|
58 | - case 'PLAC': |
|
59 | - $plac = \PhpGedcom\Parser\Plac::parse($parser); |
|
60 | - $even->setPlac($plac); |
|
61 | - break; |
|
62 | - case 'ADDR': |
|
63 | - $addr = \PhpGedcom\Parser\Addr::parse($parser); |
|
64 | - $even->setAddr($addr); |
|
65 | - break; |
|
66 | - case 'PHON': |
|
67 | - $phone = \PhpGedcom\Parser\Phon::parse($parser); |
|
68 | - $even->addPhone($phone); |
|
69 | - break; |
|
70 | - case 'CAUS': |
|
71 | - $even->setCaus(trim($record[2])); |
|
72 | - break; |
|
73 | - case 'AGE': |
|
74 | - $even->setAge(trim($record[2])); |
|
75 | - break; |
|
76 | - case 'AGNC': |
|
77 | - $even->setAgnc(trim($record[2])); |
|
78 | - break; |
|
79 | - case 'HUSB': |
|
80 | - $husb = \PhpGedcom\Parser\Fam\Even\Husb::parse($parser); |
|
81 | - $even->setHusb($husb); |
|
82 | - break; |
|
83 | - case 'WIFE': |
|
84 | - $wife = \PhpGedcom\Parser\Fam\Even\Wife::parse($parser); |
|
85 | - $even->setWife($wife); |
|
86 | - break; |
|
87 | - case 'SOUR': |
|
88 | - $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
89 | - $even->addSour($sour); |
|
90 | - break; |
|
91 | - case 'OBJE': |
|
92 | - $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
93 | - $even->addObje($obje); |
|
94 | - break; |
|
95 | - case 'NOTE': |
|
96 | - $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
97 | - if ($note) { |
|
98 | - $even->addNote($note); |
|
99 | - } |
|
100 | - break; |
|
101 | - default: |
|
102 | - $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
103 | - } |
|
49 | + switch ($recordType) { |
|
50 | + case 'TYPE': |
|
51 | + $even->setType(trim($record[2])); |
|
52 | + break; |
|
53 | + case 'DATE': |
|
54 | + $dat = \PhpGedcom\Parser\Date::parse($parser); |
|
55 | + $even->setDate($dat); |
|
56 | + //$even->setDate(trim($record[2])); |
|
57 | + break; |
|
58 | + case 'PLAC': |
|
59 | + $plac = \PhpGedcom\Parser\Plac::parse($parser); |
|
60 | + $even->setPlac($plac); |
|
61 | + break; |
|
62 | + case 'ADDR': |
|
63 | + $addr = \PhpGedcom\Parser\Addr::parse($parser); |
|
64 | + $even->setAddr($addr); |
|
65 | + break; |
|
66 | + case 'PHON': |
|
67 | + $phone = \PhpGedcom\Parser\Phon::parse($parser); |
|
68 | + $even->addPhone($phone); |
|
69 | + break; |
|
70 | + case 'CAUS': |
|
71 | + $even->setCaus(trim($record[2])); |
|
72 | + break; |
|
73 | + case 'AGE': |
|
74 | + $even->setAge(trim($record[2])); |
|
75 | + break; |
|
76 | + case 'AGNC': |
|
77 | + $even->setAgnc(trim($record[2])); |
|
78 | + break; |
|
79 | + case 'HUSB': |
|
80 | + $husb = \PhpGedcom\Parser\Fam\Even\Husb::parse($parser); |
|
81 | + $even->setHusb($husb); |
|
82 | + break; |
|
83 | + case 'WIFE': |
|
84 | + $wife = \PhpGedcom\Parser\Fam\Even\Wife::parse($parser); |
|
85 | + $even->setWife($wife); |
|
86 | + break; |
|
87 | + case 'SOUR': |
|
88 | + $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
89 | + $even->addSour($sour); |
|
90 | + break; |
|
91 | + case 'OBJE': |
|
92 | + $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
93 | + $even->addObje($obje); |
|
94 | + break; |
|
95 | + case 'NOTE': |
|
96 | + $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
97 | + if ($note) { |
|
98 | + $even->addNote($note); |
|
99 | + } |
|
100 | + break; |
|
101 | + default: |
|
102 | + $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
103 | + } |
|
104 | 104 | |
105 | - $parser->forward(); |
|
106 | - } |
|
105 | + $parser->forward(); |
|
106 | + } |
|
107 | 107 | |
108 | - return $even; |
|
109 | - } |
|
108 | + return $even; |
|
109 | + } |
|
110 | 110 | } |
@@ -33,7 +33,7 @@ |
||
33 | 33 | if (isset($record[2])) { |
34 | 34 | $_repo = $parser->normalizeIdentifier($record[2]); |
35 | 35 | $repo->setRepo($_repo); |
36 | - } |
|
36 | + } |
|
37 | 37 | |
38 | 38 | $parser->forward(); |
39 | 39 |
@@ -29,11 +29,11 @@ |
||
29 | 29 | { |
30 | 30 | $caln = new \PhpGedcom\Record\Sour\Repo\Caln(); |
31 | 31 | $record = $parser->getCurrentLineRecord(); |
32 | - $depth = (int) $record[0]; |
|
33 | - if (isset($record[2])) { |
|
32 | + $depth = (int) $record[0]; |
|
33 | + if (isset($record[2])) { |
|
34 | 34 | $_caln = $record[2]; |
35 | 35 | $caln->setCaln($_caln); |
36 | - }else{ |
|
36 | + }else{ |
|
37 | 37 | return null; |
38 | 38 | } |
39 | 39 |
@@ -30,11 +30,11 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[1])){ |
33 | - $identifier = $parser->normalizeIdentifier($record[1]); |
|
33 | + $identifier = $parser->normalizeIdentifier($record[1]); |
|
34 | 34 | } |
35 | 35 | else{ |
36 | - $parser->skipToNextLevel($depth); |
|
37 | - return null; |
|
36 | + $parser->skipToNextLevel($depth); |
|
37 | + return null; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $repo = new \PhpGedcom\Record\Repo(); |
@@ -30,11 +30,11 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[1])){ |
33 | - $identifier = $parser->normalizeIdentifier($record[1]); |
|
33 | + $identifier = $parser->normalizeIdentifier($record[1]); |
|
34 | 34 | } |
35 | 35 | else{ |
36 | - $parser->skipToNextLevel($depth); |
|
37 | - return null; |
|
36 | + $parser->skipToNextLevel($depth); |
|
37 | + return null; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $subm = new \PhpGedcom\Record\Subm(); |
@@ -30,14 +30,14 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[1])){ |
33 | - $className = '\\PhpGedcom\\Record\\Indi\\' . ucfirst(strtolower(trim($record[1]))); |
|
34 | - $attr = new $className(); |
|
33 | + $className = '\\PhpGedcom\\Record\\Indi\\' . ucfirst(strtolower(trim($record[1]))); |
|
34 | + $attr = new $className(); |
|
35 | 35 | |
36 | - $attr->setType(trim($record[1])); |
|
36 | + $attr->setType(trim($record[1])); |
|
37 | 37 | } |
38 | 38 | else{ |
39 | - $parser->skipToNextLevel($depth); |
|
40 | - return null; |
|
39 | + $parser->skipToNextLevel($depth); |
|
40 | + return null; |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | if (isset($record[2])) { |
@@ -30,12 +30,12 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[2])){ |
33 | - $romn = new \PhpGedcom\Record\Indi\Name\Romn(); |
|
34 | - $romn->setRomn(trim($record[2])); |
|
33 | + $romn = new \PhpGedcom\Record\Indi\Name\Romn(); |
|
34 | + $romn->setRomn(trim($record[2])); |
|
35 | 35 | } |
36 | 36 | else{ |
37 | - $parser->skipToNextLevel($depth); |
|
38 | - return null; |
|
37 | + $parser->skipToNextLevel($depth); |
|
38 | + return null; |
|
39 | 39 | } |
40 | 40 | |
41 | 41 |
@@ -30,11 +30,11 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[2])){ |
33 | - $fone = new \PhpGedcom\Record\Indi\Name\Fone(); |
|
34 | - $fone->setFone(trim($record[2])); |
|
33 | + $fone = new \PhpGedcom\Record\Indi\Name\Fone(); |
|
34 | + $fone->setFone(trim($record[2])); |
|
35 | 35 | } |
36 | 36 | else{ |
37 | - return null; |
|
37 | + return null; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 |
@@ -30,12 +30,12 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[2])){ |
33 | - $asso = new \PhpGedcom\Record\Indi\Asso(); |
|
34 | - $asso->setIndi($parser->normalizeIdentifier($record[2])); |
|
33 | + $asso = new \PhpGedcom\Record\Indi\Asso(); |
|
34 | + $asso->setIndi($parser->normalizeIdentifier($record[2])); |
|
35 | 35 | } |
36 | 36 | else{ |
37 | - $parser->skipToNextLevel($depth); |
|
38 | - return null; |
|
37 | + $parser->skipToNextLevel($depth); |
|
38 | + return null; |
|
39 | 39 | } |
40 | 40 | |
41 | 41 |