@@ -18,45 +18,45 @@ |
||
18 | 18 | * |
19 | 19 | */ |
20 | 20 | class Gedc extends \PhpGedcom\Record { |
21 | - /** |
|
22 | - * |
|
23 | - */ |
|
24 | - protected $_vers = null; |
|
21 | + /** |
|
22 | + * |
|
23 | + */ |
|
24 | + protected $_vers = null; |
|
25 | 25 | |
26 | - /** |
|
27 | - * |
|
28 | - */ |
|
29 | - protected $_form = null; |
|
26 | + /** |
|
27 | + * |
|
28 | + */ |
|
29 | + protected $_form = null; |
|
30 | 30 | |
31 | - /** |
|
32 | - * |
|
33 | - * @return Gedc/version |
|
34 | - */ |
|
35 | - public function getVersion() { |
|
36 | - return $this->_vers; |
|
37 | - } |
|
31 | + /** |
|
32 | + * |
|
33 | + * @return Gedc/version |
|
34 | + */ |
|
35 | + public function getVersion() { |
|
36 | + return $this->_vers; |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * |
|
41 | - * @param Gedc/version |
|
42 | - */ |
|
43 | - public function setVersion($vers = []) { |
|
44 | - $this->_vers = $vers; |
|
45 | - } |
|
39 | + /** |
|
40 | + * |
|
41 | + * @param Gedc/version |
|
42 | + */ |
|
43 | + public function setVersion($vers = []) { |
|
44 | + $this->_vers = $vers; |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * |
|
49 | - * @return Gedc/form |
|
50 | - */ |
|
51 | - public function getForm() { |
|
52 | - return $this->_form; |
|
53 | - } |
|
47 | + /** |
|
48 | + * |
|
49 | + * @return Gedc/form |
|
50 | + */ |
|
51 | + public function getForm() { |
|
52 | + return $this->_form; |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * |
|
57 | - * @param Gedc/version |
|
58 | - */ |
|
59 | - public function setForm($form = []) { |
|
60 | - $this->_form = $form; |
|
61 | - } |
|
55 | + /** |
|
56 | + * |
|
57 | + * @param Gedc/version |
|
58 | + */ |
|
59 | + public function setForm($form = []) { |
|
60 | + $this->_form = $form; |
|
61 | + } |
|
62 | 62 | } |
@@ -50,16 +50,16 @@ |
||
50 | 50 | $this->_note[] = $note; |
51 | 51 | } |
52 | 52 | /** |
53 | - * |
|
54 | - */ |
|
53 | + * |
|
54 | + */ |
|
55 | 55 | public function addFile($file) |
56 | 56 | { |
57 | 57 | $this->_file[] = $file; |
58 | 58 | } |
59 | 59 | |
60 | 60 | /** |
61 | - * |
|
62 | - */ |
|
61 | + * |
|
62 | + */ |
|
63 | 63 | public function addSour($sour) |
64 | 64 | { |
65 | 65 | $this->_sour[] = $sour; |
@@ -21,105 +21,105 @@ |
||
21 | 21 | * @package PhpGedcom\Record |
22 | 22 | */ |
23 | 23 | class Date extends Record { |
24 | - /** |
|
25 | - * @var string |
|
26 | - */ |
|
27 | - protected $date = null; |
|
24 | + /** |
|
25 | + * @var string |
|
26 | + */ |
|
27 | + protected $date = null; |
|
28 | 28 | |
29 | - /** |
|
30 | - * @var array |
|
31 | - */ |
|
32 | - private $months = [ |
|
33 | - 'JAN' => 1, 'FEB' => 2, 'MAR' => 3, 'APR' => 4, 'MAY' => 5, 'JUN' => 6, |
|
34 | - 'JUL' => 7, 'AUG' => 8, 'SEP' => 9, 'OCT' => 10, 'NOV' => 11, 'DEC' => 12, |
|
35 | - ]; |
|
29 | + /** |
|
30 | + * @var array |
|
31 | + */ |
|
32 | + private $months = [ |
|
33 | + 'JAN' => 1, 'FEB' => 2, 'MAR' => 3, 'APR' => 4, 'MAY' => 5, 'JUN' => 6, |
|
34 | + 'JUL' => 7, 'AUG' => 8, 'SEP' => 9, 'OCT' => 10, 'NOV' => 11, 'DEC' => 12, |
|
35 | + ]; |
|
36 | 36 | |
37 | - /** |
|
38 | - * @param string $date Date array |
|
39 | - * @return Date |
|
40 | - */ |
|
41 | - public function setDate($date) { |
|
42 | - $this->date = $date; |
|
37 | + /** |
|
38 | + * @param string $date Date array |
|
39 | + * @return Date |
|
40 | + */ |
|
41 | + public function setDate($date) { |
|
42 | + $this->date = $date; |
|
43 | 43 | |
44 | - return $this; |
|
45 | - } |
|
44 | + return $this; |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * @return null|string |
|
49 | - */ |
|
50 | - public function getDate() { |
|
51 | - return $this->date; |
|
52 | - } |
|
47 | + /** |
|
48 | + * @return null|string |
|
49 | + */ |
|
50 | + public function getDate() { |
|
51 | + return $this->date; |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * Return month part of date |
|
56 | - * |
|
57 | - * @return int|null |
|
58 | - */ |
|
59 | - public function getMonth() { |
|
60 | - $record = explode(' ', $this->date); |
|
61 | - if (count($record) > 0) { |
|
62 | - if ($this->isPrefix($record[0])) { |
|
63 | - unset($record[0]); |
|
64 | - } |
|
65 | - foreach ($record as $part) { |
|
66 | - if (isset($this->months[trim($part)])) { |
|
67 | - return $this->months[trim($part)]; |
|
68 | - } |
|
69 | - } |
|
70 | - } |
|
54 | + /** |
|
55 | + * Return month part of date |
|
56 | + * |
|
57 | + * @return int|null |
|
58 | + */ |
|
59 | + public function getMonth() { |
|
60 | + $record = explode(' ', $this->date); |
|
61 | + if (count($record) > 0) { |
|
62 | + if ($this->isPrefix($record[0])) { |
|
63 | + unset($record[0]); |
|
64 | + } |
|
65 | + foreach ($record as $part) { |
|
66 | + if (isset($this->months[trim($part)])) { |
|
67 | + return $this->months[trim($part)]; |
|
68 | + } |
|
69 | + } |
|
70 | + } |
|
71 | 71 | |
72 | - return null; |
|
73 | - } |
|
72 | + return null; |
|
73 | + } |
|
74 | 74 | |
75 | - /** |
|
76 | - * Return year part of date |
|
77 | - * |
|
78 | - * @return int|null |
|
79 | - */ |
|
80 | - public function getYear() { |
|
81 | - $record = explode(' ', $this->date); |
|
82 | - if (count($record) > 0) { |
|
83 | - if ($this->isPrefix($record[0])) { |
|
84 | - unset($record[0]); |
|
85 | - } |
|
86 | - if (count($record) > 0) { |
|
87 | - return (int) end($record); |
|
88 | - } |
|
89 | - } |
|
75 | + /** |
|
76 | + * Return year part of date |
|
77 | + * |
|
78 | + * @return int|null |
|
79 | + */ |
|
80 | + public function getYear() { |
|
81 | + $record = explode(' ', $this->date); |
|
82 | + if (count($record) > 0) { |
|
83 | + if ($this->isPrefix($record[0])) { |
|
84 | + unset($record[0]); |
|
85 | + } |
|
86 | + if (count($record) > 0) { |
|
87 | + return (int) end($record); |
|
88 | + } |
|
89 | + } |
|
90 | 90 | |
91 | - return null; |
|
92 | - } |
|
91 | + return null; |
|
92 | + } |
|
93 | 93 | |
94 | - /** |
|
95 | - * Return day part of date |
|
96 | - * |
|
97 | - * @return int|null |
|
98 | - */ |
|
99 | - public function getDay() { |
|
100 | - $record = explode(' ', $this->date); |
|
101 | - if (!empty($record[0])) { |
|
102 | - if ($this->isPrefix($record[0])) { |
|
103 | - unset($record[0]); |
|
104 | - } |
|
105 | - if (count($record) > 0) { |
|
106 | - $day = (int) reset($record); |
|
107 | - if ($day >= 1 && $day <= 31) { |
|
108 | - return $day; |
|
109 | - } |
|
110 | - } |
|
111 | - } |
|
94 | + /** |
|
95 | + * Return day part of date |
|
96 | + * |
|
97 | + * @return int|null |
|
98 | + */ |
|
99 | + public function getDay() { |
|
100 | + $record = explode(' ', $this->date); |
|
101 | + if (!empty($record[0])) { |
|
102 | + if ($this->isPrefix($record[0])) { |
|
103 | + unset($record[0]); |
|
104 | + } |
|
105 | + if (count($record) > 0) { |
|
106 | + $day = (int) reset($record); |
|
107 | + if ($day >= 1 && $day <= 31) { |
|
108 | + return $day; |
|
109 | + } |
|
110 | + } |
|
111 | + } |
|
112 | 112 | |
113 | - return null; |
|
114 | - } |
|
113 | + return null; |
|
114 | + } |
|
115 | 115 | |
116 | - /** |
|
117 | - * Check if the first part is a prefix (eg 'BEF', 'ABT',). |
|
118 | - * |
|
119 | - * @param string $datePart Date part to be checked |
|
120 | - * @return bool |
|
121 | - */ |
|
122 | - private function isPrefix($datePart) { |
|
123 | - return in_array($datePart, ['FROM', 'TO', 'BEF', 'AFT', 'BET', 'AND', 'ABT', 'EST', 'CAL', 'INT']); |
|
124 | - } |
|
116 | + /** |
|
117 | + * Check if the first part is a prefix (eg 'BEF', 'ABT',). |
|
118 | + * |
|
119 | + * @param string $datePart Date part to be checked |
|
120 | + * @return bool |
|
121 | + */ |
|
122 | + private function isPrefix($datePart) { |
|
123 | + return in_array($datePart, ['FROM', 'TO', 'BEF', 'AFT', 'BET', 'AND', 'ABT', 'EST', 'CAL', 'INT']); |
|
124 | + } |
|
125 | 125 | } |
126 | 126 | \ No newline at end of file |
@@ -30,11 +30,11 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[2])){ |
33 | - $identifier = $parser->normalizeIdentifier($record[2]); |
|
33 | + $identifier = $parser->normalizeIdentifier($record[2]); |
|
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\RepoRef(); |
@@ -19,175 +19,175 @@ |
||
19 | 19 | * |
20 | 20 | */ |
21 | 21 | class Indi extends \PhpGedcom\Parser\Component { |
22 | - /** |
|
23 | - * |
|
24 | - * |
|
25 | - */ |
|
26 | - public static function parse(\PhpGedcom\Parser $parser) { |
|
27 | - $record = $parser->getCurrentLineRecord(); |
|
28 | - $depth = (int) $record[0]; |
|
29 | - if (isset($record[1])) { |
|
30 | - $identifier = $parser->normalizeIdentifier($record[1]); |
|
31 | - } else { |
|
32 | - $parser->skipToNextLevel($depth); |
|
33 | - return null; |
|
34 | - } |
|
22 | + /** |
|
23 | + * |
|
24 | + * |
|
25 | + */ |
|
26 | + public static function parse(\PhpGedcom\Parser $parser) { |
|
27 | + $record = $parser->getCurrentLineRecord(); |
|
28 | + $depth = (int) $record[0]; |
|
29 | + if (isset($record[1])) { |
|
30 | + $identifier = $parser->normalizeIdentifier($record[1]); |
|
31 | + } else { |
|
32 | + $parser->skipToNextLevel($depth); |
|
33 | + return null; |
|
34 | + } |
|
35 | 35 | |
36 | - $indi = new \PhpGedcom\Record\Indi(); |
|
37 | - $indi->setId($identifier); |
|
36 | + $indi = new \PhpGedcom\Record\Indi(); |
|
37 | + $indi->setId($identifier); |
|
38 | 38 | |
39 | - $parser->getGedcom()->addIndi($indi); |
|
39 | + $parser->getGedcom()->addIndi($indi); |
|
40 | 40 | |
41 | - $parser->forward(); |
|
41 | + $parser->forward(); |
|
42 | 42 | |
43 | - while (!$parser->eof()) { |
|
44 | - $record = $parser->getCurrentLineRecord(); |
|
45 | - $recordType = strtoupper(trim($record[1])); |
|
46 | - $currentDepth = (int) $record[0]; |
|
43 | + while (!$parser->eof()) { |
|
44 | + $record = $parser->getCurrentLineRecord(); |
|
45 | + $recordType = strtoupper(trim($record[1])); |
|
46 | + $currentDepth = (int) $record[0]; |
|
47 | 47 | |
48 | - if ($currentDepth <= $depth) { |
|
49 | - $parser->back(); |
|
50 | - break; |
|
51 | - } |
|
48 | + if ($currentDepth <= $depth) { |
|
49 | + $parser->back(); |
|
50 | + break; |
|
51 | + } |
|
52 | 52 | |
53 | - switch ($recordType) { |
|
54 | - case '_UID': |
|
55 | - $indi->setUid(trim($record[2])); |
|
56 | - break; |
|
57 | - case 'RESN': |
|
58 | - $indi->setResn(trim($record[2])); |
|
59 | - break; |
|
60 | - case 'NAME': |
|
61 | - $name = \PhpGedcom\Parser\Indi\Name::parse($parser); |
|
62 | - $indi->addName($name); |
|
63 | - break; |
|
64 | - case 'SEX': |
|
65 | - $indi->setSex(isset($record[2]) ? trim($record[2]) : ''); |
|
66 | - break; |
|
67 | - case 'ADOP': |
|
68 | - case 'BIRT': |
|
69 | - case 'BAPM': |
|
70 | - case 'BARM': |
|
71 | - case 'BASM': |
|
72 | - case 'BLES': |
|
73 | - case 'BURI': |
|
74 | - case 'CENS': |
|
75 | - case 'CHR': |
|
76 | - case 'CHRA': |
|
77 | - case 'CONF': |
|
78 | - case 'CREM': |
|
79 | - case 'DEAT': |
|
80 | - case 'EMIG': |
|
81 | - case 'FCOM': |
|
82 | - case 'GRAD': |
|
83 | - case 'IMMI': |
|
84 | - case 'NATU': |
|
85 | - case 'ORDN': |
|
86 | - case 'RETI': |
|
87 | - case 'PROB': |
|
88 | - case 'WILL': |
|
89 | - case 'EVEN': |
|
90 | - $className = ucfirst(strtolower($recordType)); |
|
91 | - $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
53 | + switch ($recordType) { |
|
54 | + case '_UID': |
|
55 | + $indi->setUid(trim($record[2])); |
|
56 | + break; |
|
57 | + case 'RESN': |
|
58 | + $indi->setResn(trim($record[2])); |
|
59 | + break; |
|
60 | + case 'NAME': |
|
61 | + $name = \PhpGedcom\Parser\Indi\Name::parse($parser); |
|
62 | + $indi->addName($name); |
|
63 | + break; |
|
64 | + case 'SEX': |
|
65 | + $indi->setSex(isset($record[2]) ? trim($record[2]) : ''); |
|
66 | + break; |
|
67 | + case 'ADOP': |
|
68 | + case 'BIRT': |
|
69 | + case 'BAPM': |
|
70 | + case 'BARM': |
|
71 | + case 'BASM': |
|
72 | + case 'BLES': |
|
73 | + case 'BURI': |
|
74 | + case 'CENS': |
|
75 | + case 'CHR': |
|
76 | + case 'CHRA': |
|
77 | + case 'CONF': |
|
78 | + case 'CREM': |
|
79 | + case 'DEAT': |
|
80 | + case 'EMIG': |
|
81 | + case 'FCOM': |
|
82 | + case 'GRAD': |
|
83 | + case 'IMMI': |
|
84 | + case 'NATU': |
|
85 | + case 'ORDN': |
|
86 | + case 'RETI': |
|
87 | + case 'PROB': |
|
88 | + case 'WILL': |
|
89 | + case 'EVEN': |
|
90 | + $className = ucfirst(strtolower($recordType)); |
|
91 | + $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
92 | 92 | |
93 | - $event = $class::parse($parser); |
|
94 | - $indi->addEven($event); |
|
95 | - break; |
|
96 | - case 'CAST': |
|
97 | - case 'DSCR': |
|
98 | - case 'EDUC': |
|
99 | - case 'IDNO': |
|
100 | - case 'NATI': |
|
101 | - case 'NCHI': |
|
102 | - case 'NMR': |
|
103 | - case 'OCCU': |
|
104 | - case 'PROP': |
|
105 | - case 'RELI': |
|
106 | - case 'RESI': |
|
107 | - case 'SSN': |
|
108 | - case 'TITL': |
|
109 | - $className = ucfirst(strtolower($recordType)); |
|
110 | - $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
93 | + $event = $class::parse($parser); |
|
94 | + $indi->addEven($event); |
|
95 | + break; |
|
96 | + case 'CAST': |
|
97 | + case 'DSCR': |
|
98 | + case 'EDUC': |
|
99 | + case 'IDNO': |
|
100 | + case 'NATI': |
|
101 | + case 'NCHI': |
|
102 | + case 'NMR': |
|
103 | + case 'OCCU': |
|
104 | + case 'PROP': |
|
105 | + case 'RELI': |
|
106 | + case 'RESI': |
|
107 | + case 'SSN': |
|
108 | + case 'TITL': |
|
109 | + $className = ucfirst(strtolower($recordType)); |
|
110 | + $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
111 | 111 | |
112 | - $att = $class::parse($parser); |
|
113 | - $indi->addAttr($att); |
|
114 | - break; |
|
115 | - case 'BAPL': |
|
116 | - case 'CONL': |
|
117 | - case 'ENDL': |
|
118 | - case 'SLGC': |
|
119 | - $className = ucfirst(strtolower($recordType)); |
|
120 | - $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
112 | + $att = $class::parse($parser); |
|
113 | + $indi->addAttr($att); |
|
114 | + break; |
|
115 | + case 'BAPL': |
|
116 | + case 'CONL': |
|
117 | + case 'ENDL': |
|
118 | + case 'SLGC': |
|
119 | + $className = ucfirst(strtolower($recordType)); |
|
120 | + $class = '\\PhpGedcom\\Parser\\Indi\\' . $className; |
|
121 | 121 | |
122 | - $lds = $class::parse($parser); |
|
123 | - $indi->{'add' . $recordType}[] = $lds; |
|
124 | - break; |
|
125 | - case 'FAMC': |
|
126 | - $famc = \PhpGedcom\Parser\Indi\Famc::parse($parser); |
|
127 | - if ($famc) { |
|
128 | - $indi->addFamc($famc); |
|
129 | - } |
|
130 | - break; |
|
131 | - case 'FAMS': |
|
132 | - $fams = \PhpGedcom\Parser\Indi\Fams::parse($parser); |
|
133 | - if ($fams) { |
|
134 | - $indi->addFams($fams); |
|
135 | - } |
|
136 | - break; |
|
137 | - case 'SUBM': |
|
138 | - $indi->addSubm($parser->normalizeIdentifier($record[2])); |
|
139 | - break; |
|
140 | - case 'ASSO': |
|
141 | - $asso = \PhpGedcom\Parser\Indi\Asso::parse($parser); |
|
142 | - $indi->addAsso($asso); |
|
143 | - break; |
|
144 | - case 'ALIA': |
|
145 | - $indi->addAlia($parser->normalizeIdentifier($record[2])); |
|
146 | - break; |
|
147 | - case 'ANCI': |
|
148 | - $indi->addAnci($parser->normalizeIdentifier($record[2])); |
|
149 | - break; |
|
150 | - case 'DESI': |
|
151 | - $indi->addDesi($parser->normalizeIdentifier($record[2])); |
|
152 | - break; |
|
153 | - case 'RFN': |
|
154 | - $indi->setRfn(trim($record[2])); |
|
155 | - break; |
|
156 | - case 'AFN': |
|
157 | - $indi->setAfn(trim($record[2])); |
|
158 | - break; |
|
159 | - case 'REFN': |
|
160 | - $ref = \PhpGedcom\Parser\Refn::parse($parser); |
|
161 | - $indi->addRefn($ref); |
|
162 | - break; |
|
163 | - case 'RIN': |
|
164 | - $indi->setRin(trim($record[2])); |
|
165 | - break; |
|
166 | - case 'CHAN': |
|
167 | - $chan = \PhpGedcom\Parser\Chan::parse($parser); |
|
168 | - $indi->setChan($chan); |
|
169 | - break; |
|
170 | - case 'NOTE': |
|
171 | - $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
172 | - if ($note) { |
|
173 | - $indi->addNote($note); |
|
174 | - } |
|
175 | - break; |
|
176 | - case 'SOUR': |
|
177 | - $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
178 | - $indi->addSour($sour); |
|
179 | - break; |
|
180 | - case 'OBJE': |
|
181 | - $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
182 | - $indi->addObje($obje); |
|
183 | - break; |
|
184 | - default: |
|
185 | - $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
186 | - } |
|
122 | + $lds = $class::parse($parser); |
|
123 | + $indi->{'add' . $recordType}[] = $lds; |
|
124 | + break; |
|
125 | + case 'FAMC': |
|
126 | + $famc = \PhpGedcom\Parser\Indi\Famc::parse($parser); |
|
127 | + if ($famc) { |
|
128 | + $indi->addFamc($famc); |
|
129 | + } |
|
130 | + break; |
|
131 | + case 'FAMS': |
|
132 | + $fams = \PhpGedcom\Parser\Indi\Fams::parse($parser); |
|
133 | + if ($fams) { |
|
134 | + $indi->addFams($fams); |
|
135 | + } |
|
136 | + break; |
|
137 | + case 'SUBM': |
|
138 | + $indi->addSubm($parser->normalizeIdentifier($record[2])); |
|
139 | + break; |
|
140 | + case 'ASSO': |
|
141 | + $asso = \PhpGedcom\Parser\Indi\Asso::parse($parser); |
|
142 | + $indi->addAsso($asso); |
|
143 | + break; |
|
144 | + case 'ALIA': |
|
145 | + $indi->addAlia($parser->normalizeIdentifier($record[2])); |
|
146 | + break; |
|
147 | + case 'ANCI': |
|
148 | + $indi->addAnci($parser->normalizeIdentifier($record[2])); |
|
149 | + break; |
|
150 | + case 'DESI': |
|
151 | + $indi->addDesi($parser->normalizeIdentifier($record[2])); |
|
152 | + break; |
|
153 | + case 'RFN': |
|
154 | + $indi->setRfn(trim($record[2])); |
|
155 | + break; |
|
156 | + case 'AFN': |
|
157 | + $indi->setAfn(trim($record[2])); |
|
158 | + break; |
|
159 | + case 'REFN': |
|
160 | + $ref = \PhpGedcom\Parser\Refn::parse($parser); |
|
161 | + $indi->addRefn($ref); |
|
162 | + break; |
|
163 | + case 'RIN': |
|
164 | + $indi->setRin(trim($record[2])); |
|
165 | + break; |
|
166 | + case 'CHAN': |
|
167 | + $chan = \PhpGedcom\Parser\Chan::parse($parser); |
|
168 | + $indi->setChan($chan); |
|
169 | + break; |
|
170 | + case 'NOTE': |
|
171 | + $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
172 | + if ($note) { |
|
173 | + $indi->addNote($note); |
|
174 | + } |
|
175 | + break; |
|
176 | + case 'SOUR': |
|
177 | + $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
178 | + $indi->addSour($sour); |
|
179 | + break; |
|
180 | + case 'OBJE': |
|
181 | + $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
182 | + $indi->addObje($obje); |
|
183 | + break; |
|
184 | + default: |
|
185 | + $parser->logUnhandledRecord(get_class() . ' @ ' . __LINE__); |
|
186 | + } |
|
187 | 187 | |
188 | - $parser->forward(); |
|
189 | - } |
|
188 | + $parser->forward(); |
|
189 | + } |
|
190 | 190 | |
191 | - return $indi; |
|
192 | - } |
|
191 | + return $indi; |
|
192 | + } |
|
193 | 193 | } |
@@ -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 | $sour = new \PhpGedcom\Record\Sour(); |
@@ -30,11 +30,11 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[2])){ |
33 | - $_romn = trim($record[2]); |
|
33 | + $_romn = trim($record[2]); |
|
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 | $romn = new \PhpGedcom\Record\Plac\Romn(); |
@@ -30,11 +30,11 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[2])){ |
33 | - $_fone = trim($record[2]); |
|
33 | + $_fone = trim($record[2]); |
|
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 | $fone = new \PhpGedcom\Record\Plac\Fone(); |
@@ -30,12 +30,12 @@ |
||
30 | 30 | $record = $parser->getCurrentLineRecord(); |
31 | 31 | $depth = (int)$record[0]; |
32 | 32 | if(isset($record[2])){ |
33 | - $sour = new \PhpGedcom\Record\SourRef(); |
|
34 | - $sour->setSour($parser->normalizeIdentifier($record[2])); |
|
33 | + $sour = new \PhpGedcom\Record\SourRef(); |
|
34 | + $sour->setSour($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 | $parser->forward(); |