@@ -40,13 +40,13 @@ |
||
40 | 40 | { |
41 | 41 | $head = $gedcom->getHead(); |
42 | 42 | $subn = $gedcom->getSubn(); |
43 | - $subms = $gedcom->getSubm(); // array() |
|
44 | - $sours = $gedcom->getSour(); // array() |
|
45 | - $indis = $gedcom->getIndi(); // array() |
|
46 | - $fams = $gedcom->getFam(); // array() |
|
47 | - $notes = $gedcom->getNote(); // array() |
|
48 | - $repos = $gedcom->getRepo(); // array() |
|
49 | - $objes = $gedcom->getObje(); // array() |
|
43 | + $subms = $gedcom->getSubm(); // array() |
|
44 | + $sours = $gedcom->getSour(); // array() |
|
45 | + $indis = $gedcom->getIndi(); // array() |
|
46 | + $fams = $gedcom->getFam(); // array() |
|
47 | + $notes = $gedcom->getNote(); // array() |
|
48 | + $repos = $gedcom->getRepo(); // array() |
|
49 | + $objes = $gedcom->getObje(); // array() |
|
50 | 50 | |
51 | 51 | $output = '0 FORMAT '.$format."\n"; |
52 | 52 |
@@ -239,23 +239,23 @@ |
||
239 | 239 | } |
240 | 240 | |
241 | 241 | if (isset($record[1]) && trim($record[1]) == 'HEAD') { |
242 | - \Gedcom\Parser\Head::parse($this); |
|
242 | + \Gedcom\Parser\Head::parse($this); |
|
243 | 243 | } elseif (isset($record[2]) && trim($record[2]) == 'SUBN') { |
244 | - \Gedcom\Parser\Subn::parse($this); |
|
244 | + \Gedcom\Parser\Subn::parse($this); |
|
245 | 245 | } elseif (isset($record[2]) && trim($record[2]) == 'SUBM') { |
246 | - \Gedcom\Parser\Subm::parse($this); |
|
246 | + \Gedcom\Parser\Subm::parse($this); |
|
247 | 247 | } elseif (isset($record[2]) && $record[2] == 'SOUR') { |
248 | - \Gedcom\Parser\Sour::parse($this); |
|
248 | + \Gedcom\Parser\Sour::parse($this); |
|
249 | 249 | } elseif (isset($record[2]) && $record[2] == 'INDI') { |
250 | - \Gedcom\Parser\Indi::parse($this); |
|
250 | + \Gedcom\Parser\Indi::parse($this); |
|
251 | 251 | } elseif (isset($record[2]) && $record[2] == 'FAM') { |
252 | - \Gedcom\Parser\Fam::parse($this); |
|
252 | + \Gedcom\Parser\Fam::parse($this); |
|
253 | 253 | } elseif (isset($record[2]) && substr(trim($record[2]), 0, 4) == 'NOTE') { |
254 | - \Gedcom\Parser\Note::parse($this); |
|
254 | + \Gedcom\Parser\Note::parse($this); |
|
255 | 255 | } elseif (isset($record[2]) && $record[2] == 'REPO') { |
256 | - \Gedcom\Parser\Repo::parse($this); |
|
256 | + \Gedcom\Parser\Repo::parse($this); |
|
257 | 257 | } elseif (isset($record[2]) && $record[2] == 'OBJE') { |
258 | - \Gedcom\Parser\Obje::parse($this); |
|
258 | + \Gedcom\Parser\Obje::parse($this); |
|
259 | 259 | } elseif (isset($record[1]) && trim($record[1]) == 'TRLR') { |
260 | 260 | // EOF |
261 | 261 | break; |
@@ -121,21 +121,21 @@ |
||
121 | 121 | } |
122 | 122 | |
123 | 123 | switch ($recordType) { |
124 | - case 'CONT': |
|
125 | - $data .= "\n"; |
|
124 | + case 'CONT': |
|
125 | + $data .= "\n"; |
|
126 | 126 | |
127 | - if (isset($record[2])) { |
|
128 | - $data .= trim($record[2]); |
|
129 | - } |
|
130 | - break; |
|
131 | - case 'CONC': |
|
132 | - if (isset($record[2])) { |
|
133 | - $data .= ' '.trim($record[2]); |
|
134 | - } |
|
135 | - break; |
|
136 | - default: |
|
137 | - $this->back(); |
|
138 | - break 2; |
|
127 | + if (isset($record[2])) { |
|
128 | + $data .= trim($record[2]); |
|
129 | + } |
|
130 | + break; |
|
131 | + case 'CONC': |
|
132 | + if (isset($record[2])) { |
|
133 | + $data .= ' '.trim($record[2]); |
|
134 | + } |
|
135 | + break; |
|
136 | + default: |
|
137 | + $this->back(); |
|
138 | + break 2; |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | $this->forward(); |
@@ -40,59 +40,59 @@ |
||
40 | 40 | } |
41 | 41 | |
42 | 42 | switch ($recordType) { |
43 | - case 'TYPE': |
|
44 | - $even->setType(trim($record[2])); |
|
45 | - break; |
|
46 | - case 'DATE': |
|
47 | - $dat = \Gedcom\Parser\Date::parse($parser); |
|
48 | - $even->setDate($dat); |
|
49 | - //$even->setDate(trim($record[2])); |
|
50 | - break; |
|
51 | - case 'PLAC': |
|
52 | - $plac = \Gedcom\Parser\Plac::parse($parser); |
|
53 | - $even->setPlac($plac); |
|
54 | - break; |
|
55 | - case 'ADDR': |
|
56 | - $addr = \Gedcom\Parser\Addr::parse($parser); |
|
57 | - $even->setAddr($addr); |
|
58 | - break; |
|
59 | - case 'PHON': |
|
60 | - $phone = \Gedcom\Parser\Phon::parse($parser); |
|
61 | - $even->addPhone($phone); |
|
62 | - break; |
|
63 | - case 'CAUS': |
|
64 | - $even->setCaus(trim($record[2])); |
|
65 | - break; |
|
66 | - case 'AGE': |
|
67 | - $even->setAge(trim($record[2])); |
|
68 | - break; |
|
69 | - case 'AGNC': |
|
70 | - $even->setAgnc(trim($record[2])); |
|
71 | - break; |
|
72 | - case 'HUSB': |
|
73 | - $husb = \Gedcom\Parser\Fam\Even\Husb::parse($parser); |
|
74 | - $even->setHusb($husb); |
|
75 | - break; |
|
76 | - case 'WIFE': |
|
77 | - $wife = \Gedcom\Parser\Fam\Even\Wife::parse($parser); |
|
78 | - $even->setWife($wife); |
|
79 | - break; |
|
80 | - case 'SOUR': |
|
81 | - $sour = \Gedcom\Parser\SourRef::parse($parser); |
|
82 | - $even->addSour($sour); |
|
83 | - break; |
|
84 | - case 'OBJE': |
|
85 | - $obje = \Gedcom\Parser\ObjeRef::parse($parser); |
|
86 | - $even->addObje($obje); |
|
87 | - break; |
|
88 | - case 'NOTE': |
|
89 | - $note = \Gedcom\Parser\NoteRef::parse($parser); |
|
90 | - if ($note) { |
|
91 | - $even->addNote($note); |
|
92 | - } |
|
93 | - break; |
|
94 | - default: |
|
95 | - $parser->logUnhandledRecord(self::class.' @ '.__LINE__); |
|
43 | + case 'TYPE': |
|
44 | + $even->setType(trim($record[2])); |
|
45 | + break; |
|
46 | + case 'DATE': |
|
47 | + $dat = \Gedcom\Parser\Date::parse($parser); |
|
48 | + $even->setDate($dat); |
|
49 | + //$even->setDate(trim($record[2])); |
|
50 | + break; |
|
51 | + case 'PLAC': |
|
52 | + $plac = \Gedcom\Parser\Plac::parse($parser); |
|
53 | + $even->setPlac($plac); |
|
54 | + break; |
|
55 | + case 'ADDR': |
|
56 | + $addr = \Gedcom\Parser\Addr::parse($parser); |
|
57 | + $even->setAddr($addr); |
|
58 | + break; |
|
59 | + case 'PHON': |
|
60 | + $phone = \Gedcom\Parser\Phon::parse($parser); |
|
61 | + $even->addPhone($phone); |
|
62 | + break; |
|
63 | + case 'CAUS': |
|
64 | + $even->setCaus(trim($record[2])); |
|
65 | + break; |
|
66 | + case 'AGE': |
|
67 | + $even->setAge(trim($record[2])); |
|
68 | + break; |
|
69 | + case 'AGNC': |
|
70 | + $even->setAgnc(trim($record[2])); |
|
71 | + break; |
|
72 | + case 'HUSB': |
|
73 | + $husb = \Gedcom\Parser\Fam\Even\Husb::parse($parser); |
|
74 | + $even->setHusb($husb); |
|
75 | + break; |
|
76 | + case 'WIFE': |
|
77 | + $wife = \Gedcom\Parser\Fam\Even\Wife::parse($parser); |
|
78 | + $even->setWife($wife); |
|
79 | + break; |
|
80 | + case 'SOUR': |
|
81 | + $sour = \Gedcom\Parser\SourRef::parse($parser); |
|
82 | + $even->addSour($sour); |
|
83 | + break; |
|
84 | + case 'OBJE': |
|
85 | + $obje = \Gedcom\Parser\ObjeRef::parse($parser); |
|
86 | + $even->addObje($obje); |
|
87 | + break; |
|
88 | + case 'NOTE': |
|
89 | + $note = \Gedcom\Parser\NoteRef::parse($parser); |
|
90 | + if ($note) { |
|
91 | + $even->addNote($note); |
|
92 | + } |
|
93 | + break; |
|
94 | + default: |
|
95 | + $parser->logUnhandledRecord(self::class.' @ '.__LINE__); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | $parser->forward(); |
@@ -46,142 +46,142 @@ |
||
46 | 46 | } |
47 | 47 | |
48 | 48 | switch ($recordType) { |
49 | - case '_UID': |
|
50 | - $indi->setUid(trim($record[2])); |
|
51 | - break; |
|
52 | - case 'RESN': |
|
53 | - $indi->setResn(trim($record[2])); |
|
54 | - break; |
|
55 | - case 'NAME': |
|
56 | - $name = \Gedcom\Parser\Indi\Name::parse($parser); |
|
57 | - $indi->addName($name); |
|
58 | - break; |
|
59 | - case 'SEX': |
|
60 | - $indi->setSex(isset($record[2]) ? trim($record[2]) : ''); |
|
61 | - break; |
|
62 | - case 'ADOP': |
|
63 | - case 'BIRT': |
|
64 | - $birthday = \Gedcom\Parser\Date::parse($parser); |
|
65 | - $indi->setBirthday($birthday); |
|
66 | - break; |
|
67 | - case 'BAPM': |
|
68 | - case 'BARM': |
|
69 | - case 'BASM': |
|
70 | - case 'BLES': |
|
71 | - case 'BURI': |
|
72 | - case 'CENS': |
|
73 | - case 'CHR': |
|
74 | - case 'CHRA': |
|
75 | - case 'CONF': |
|
76 | - case 'CREM': |
|
77 | - case 'DEAT': |
|
78 | - break; |
|
79 | - case 'EMIG': |
|
80 | - case 'FCOM': |
|
81 | - case 'GRAD': |
|
82 | - case 'IMMI': |
|
83 | - case 'NATU': |
|
84 | - case 'ORDN': |
|
85 | - case 'RETI': |
|
86 | - case 'PROB': |
|
87 | - case 'WILL': |
|
88 | - case 'EVEN': |
|
89 | - $className = ucfirst(strtolower($recordType)); |
|
90 | - $class = '\\Gedcom\\Parser\\Indi\\'.$className; |
|
49 | + case '_UID': |
|
50 | + $indi->setUid(trim($record[2])); |
|
51 | + break; |
|
52 | + case 'RESN': |
|
53 | + $indi->setResn(trim($record[2])); |
|
54 | + break; |
|
55 | + case 'NAME': |
|
56 | + $name = \Gedcom\Parser\Indi\Name::parse($parser); |
|
57 | + $indi->addName($name); |
|
58 | + break; |
|
59 | + case 'SEX': |
|
60 | + $indi->setSex(isset($record[2]) ? trim($record[2]) : ''); |
|
61 | + break; |
|
62 | + case 'ADOP': |
|
63 | + case 'BIRT': |
|
64 | + $birthday = \Gedcom\Parser\Date::parse($parser); |
|
65 | + $indi->setBirthday($birthday); |
|
66 | + break; |
|
67 | + case 'BAPM': |
|
68 | + case 'BARM': |
|
69 | + case 'BASM': |
|
70 | + case 'BLES': |
|
71 | + case 'BURI': |
|
72 | + case 'CENS': |
|
73 | + case 'CHR': |
|
74 | + case 'CHRA': |
|
75 | + case 'CONF': |
|
76 | + case 'CREM': |
|
77 | + case 'DEAT': |
|
78 | + break; |
|
79 | + case 'EMIG': |
|
80 | + case 'FCOM': |
|
81 | + case 'GRAD': |
|
82 | + case 'IMMI': |
|
83 | + case 'NATU': |
|
84 | + case 'ORDN': |
|
85 | + case 'RETI': |
|
86 | + case 'PROB': |
|
87 | + case 'WILL': |
|
88 | + case 'EVEN': |
|
89 | + $className = ucfirst(strtolower($recordType)); |
|
90 | + $class = '\\Gedcom\\Parser\\Indi\\'.$className; |
|
91 | 91 | |
92 | - $event = $class::parse($parser); |
|
93 | - $indi->addEven($event); |
|
94 | - break; |
|
95 | - case 'CAST': |
|
96 | - case 'DSCR': |
|
97 | - case 'EDUC': |
|
98 | - case 'IDNO': |
|
99 | - case 'NATI': |
|
100 | - case 'NCHI': |
|
101 | - case 'NMR': |
|
102 | - case 'OCCU': |
|
103 | - case 'PROP': |
|
104 | - case 'RELI': |
|
105 | - case 'RESI': |
|
106 | - case 'SSN': |
|
107 | - case 'TITL': |
|
108 | - $className = ucfirst(strtolower($recordType)); |
|
109 | - $class = '\\Gedcom\\Parser\\Indi\\'.$className; |
|
92 | + $event = $class::parse($parser); |
|
93 | + $indi->addEven($event); |
|
94 | + break; |
|
95 | + case 'CAST': |
|
96 | + case 'DSCR': |
|
97 | + case 'EDUC': |
|
98 | + case 'IDNO': |
|
99 | + case 'NATI': |
|
100 | + case 'NCHI': |
|
101 | + case 'NMR': |
|
102 | + case 'OCCU': |
|
103 | + case 'PROP': |
|
104 | + case 'RELI': |
|
105 | + case 'RESI': |
|
106 | + case 'SSN': |
|
107 | + case 'TITL': |
|
108 | + $className = ucfirst(strtolower($recordType)); |
|
109 | + $class = '\\Gedcom\\Parser\\Indi\\'.$className; |
|
110 | 110 | |
111 | - $att = $class::parse($parser); |
|
112 | - $indi->addAttr($att); |
|
113 | - break; |
|
114 | - case 'BAPL': |
|
115 | - case 'CONL': |
|
116 | - case 'ENDL': |
|
117 | - case 'SLGC': |
|
118 | - $className = ucfirst(strtolower($recordType)); |
|
119 | - $class = '\\Gedcom\\Parser\\Indi\\'.$className; |
|
111 | + $att = $class::parse($parser); |
|
112 | + $indi->addAttr($att); |
|
113 | + break; |
|
114 | + case 'BAPL': |
|
115 | + case 'CONL': |
|
116 | + case 'ENDL': |
|
117 | + case 'SLGC': |
|
118 | + $className = ucfirst(strtolower($recordType)); |
|
119 | + $class = '\\Gedcom\\Parser\\Indi\\'.$className; |
|
120 | 120 | |
121 | - $lds = $class::parse($parser); |
|
122 | - $indi->{'add'.$recordType}[] = $lds; |
|
123 | - break; |
|
124 | - case 'FAMC': |
|
125 | - $famc = \Gedcom\Parser\Indi\Famc::parse($parser); |
|
126 | - if ($famc) { |
|
127 | - $indi->addFamc($famc); |
|
128 | - } |
|
129 | - break; |
|
130 | - case 'FAMS': |
|
131 | - $fams = \Gedcom\Parser\Indi\Fams::parse($parser); |
|
132 | - if ($fams) { |
|
133 | - $indi->addFams($fams); |
|
134 | - } |
|
135 | - break; |
|
136 | - case 'SUBM': |
|
137 | - $indi->addSubm($parser->normalizeIdentifier($record[2])); |
|
138 | - break; |
|
139 | - case 'ASSO': |
|
140 | - $asso = \Gedcom\Parser\Indi\Asso::parse($parser); |
|
141 | - $indi->addAsso($asso); |
|
142 | - break; |
|
143 | - case 'ALIA': |
|
144 | - $indi->addAlia($parser->normalizeIdentifier($record[2])); |
|
145 | - break; |
|
146 | - case 'ANCI': |
|
147 | - $indi->addAnci($parser->normalizeIdentifier($record[2])); |
|
148 | - break; |
|
149 | - case 'DESI': |
|
150 | - $indi->addDesi($parser->normalizeIdentifier($record[2])); |
|
151 | - break; |
|
152 | - case 'RFN': |
|
153 | - $indi->setRfn(trim($record[2])); |
|
154 | - break; |
|
155 | - case 'AFN': |
|
156 | - $indi->setAfn(trim($record[2])); |
|
157 | - break; |
|
158 | - case 'REFN': |
|
159 | - $ref = \Gedcom\Parser\Refn::parse($parser); |
|
160 | - $indi->addRefn($ref); |
|
161 | - break; |
|
162 | - case 'RIN': |
|
163 | - $indi->setRin(trim($record[2])); |
|
164 | - break; |
|
165 | - case 'CHAN': |
|
166 | - $chan = \Gedcom\Parser\Chan::parse($parser); |
|
167 | - $indi->setChan($chan); |
|
168 | - break; |
|
169 | - case 'NOTE': |
|
170 | - $note = \Gedcom\Parser\NoteRef::parse($parser); |
|
171 | - if ($note) { |
|
172 | - $indi->addNote($note); |
|
173 | - } |
|
174 | - break; |
|
175 | - case 'SOUR': |
|
176 | - $sour = \Gedcom\Parser\SourRef::parse($parser); |
|
177 | - $indi->addSour($sour); |
|
178 | - break; |
|
179 | - case 'OBJE': |
|
180 | - $obje = \Gedcom\Parser\ObjeRef::parse($parser); |
|
181 | - $indi->addObje($obje); |
|
182 | - break; |
|
183 | - default: |
|
184 | - $parser->logUnhandledRecord(self::class.' @ '.__LINE__); |
|
121 | + $lds = $class::parse($parser); |
|
122 | + $indi->{'add'.$recordType}[] = $lds; |
|
123 | + break; |
|
124 | + case 'FAMC': |
|
125 | + $famc = \Gedcom\Parser\Indi\Famc::parse($parser); |
|
126 | + if ($famc) { |
|
127 | + $indi->addFamc($famc); |
|
128 | + } |
|
129 | + break; |
|
130 | + case 'FAMS': |
|
131 | + $fams = \Gedcom\Parser\Indi\Fams::parse($parser); |
|
132 | + if ($fams) { |
|
133 | + $indi->addFams($fams); |
|
134 | + } |
|
135 | + break; |
|
136 | + case 'SUBM': |
|
137 | + $indi->addSubm($parser->normalizeIdentifier($record[2])); |
|
138 | + break; |
|
139 | + case 'ASSO': |
|
140 | + $asso = \Gedcom\Parser\Indi\Asso::parse($parser); |
|
141 | + $indi->addAsso($asso); |
|
142 | + break; |
|
143 | + case 'ALIA': |
|
144 | + $indi->addAlia($parser->normalizeIdentifier($record[2])); |
|
145 | + break; |
|
146 | + case 'ANCI': |
|
147 | + $indi->addAnci($parser->normalizeIdentifier($record[2])); |
|
148 | + break; |
|
149 | + case 'DESI': |
|
150 | + $indi->addDesi($parser->normalizeIdentifier($record[2])); |
|
151 | + break; |
|
152 | + case 'RFN': |
|
153 | + $indi->setRfn(trim($record[2])); |
|
154 | + break; |
|
155 | + case 'AFN': |
|
156 | + $indi->setAfn(trim($record[2])); |
|
157 | + break; |
|
158 | + case 'REFN': |
|
159 | + $ref = \Gedcom\Parser\Refn::parse($parser); |
|
160 | + $indi->addRefn($ref); |
|
161 | + break; |
|
162 | + case 'RIN': |
|
163 | + $indi->setRin(trim($record[2])); |
|
164 | + break; |
|
165 | + case 'CHAN': |
|
166 | + $chan = \Gedcom\Parser\Chan::parse($parser); |
|
167 | + $indi->setChan($chan); |
|
168 | + break; |
|
169 | + case 'NOTE': |
|
170 | + $note = \Gedcom\Parser\NoteRef::parse($parser); |
|
171 | + if ($note) { |
|
172 | + $indi->addNote($note); |
|
173 | + } |
|
174 | + break; |
|
175 | + case 'SOUR': |
|
176 | + $sour = \Gedcom\Parser\SourRef::parse($parser); |
|
177 | + $indi->addSour($sour); |
|
178 | + break; |
|
179 | + case 'OBJE': |
|
180 | + $obje = \Gedcom\Parser\ObjeRef::parse($parser); |
|
181 | + $indi->addObje($obje); |
|
182 | + break; |
|
183 | + default: |
|
184 | + $parser->logUnhandledRecord(self::class.' @ '.__LINE__); |
|
185 | 185 | } |
186 | 186 | |
187 | 187 | $parser->forward(); |
@@ -36,7 +36,7 @@ |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | if ($dat->getYear() && $dat->getMonth() && $dat->getDay()) { |
39 | - return $dat->getYear() .'-'. substr("0{$dat->getMonth()}", -2) .'-'. substr("0{$dat->getDay()}", -2); |
|
39 | + return $dat->getYear().'-'.substr("0{$dat->getMonth()}", -2).'-'.substr("0{$dat->getDay()}", -2); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | return null; |
@@ -57,62 +57,62 @@ |
||
57 | 57 | } |
58 | 58 | |
59 | 59 | switch ($recordType) { |
60 | - case 'TYPE': |
|
61 | - $even->setType(trim($record[2])); |
|
62 | - break; |
|
63 | - case 'DATE': |
|
64 | - $dat = \Gedcom\Parser\Date::parse($parser); |
|
65 | - $even->setDate($dat); |
|
66 | - //$even->setDate(trim($record[2])) |
|
67 | - break; |
|
68 | - case 'PLAC': |
|
69 | - $plac = \Gedcom\Parser\Plac::parse($parser); |
|
70 | - $even->setPlac($plac); |
|
71 | - break; |
|
72 | - case 'ADDR': |
|
73 | - $even->setAddr(\Gedcom\Parser\Addr::parse($parser)); |
|
74 | - break; |
|
75 | - case 'PHON': |
|
76 | - $phone = \Gedcom\Parser\Phon::parse($parser); |
|
77 | - $even->addPhone($phone); |
|
78 | - break; |
|
79 | - case 'CAUS': |
|
80 | - $even->setCaus(trim($record[2])); |
|
81 | - break; |
|
82 | - case 'AGE': |
|
83 | - $even->setAge(trim($record[2])); |
|
84 | - break; |
|
85 | - case 'AGNC': |
|
86 | - $even->setAgnc(trim($record[2])); |
|
87 | - break; |
|
88 | - case 'SOUR': |
|
89 | - $sour = \Gedcom\Parser\SourRef::parse($parser); |
|
90 | - $even->addSour($sour); |
|
91 | - break; |
|
92 | - case 'OBJE': |
|
93 | - $obje = \Gedcom\Parser\ObjeRef::parse($parser); |
|
94 | - $even->addObje($obje); |
|
95 | - break; |
|
96 | - case 'NOTE': |
|
97 | - $note = \Gedcom\Parser\NoteRef::parse($parser); |
|
98 | - if ($note) { |
|
99 | - $even->addNote($note); |
|
100 | - } |
|
101 | - break; |
|
102 | - case 'CHAN': |
|
103 | - $change = \Gedcom\Parser\Chan::parse($parser); |
|
104 | - $even->setChan($change); |
|
105 | - break; |
|
106 | - default: |
|
107 | - $self = get_called_class(); |
|
108 | - $method = 'parse'.$recordType; |
|
60 | + case 'TYPE': |
|
61 | + $even->setType(trim($record[2])); |
|
62 | + break; |
|
63 | + case 'DATE': |
|
64 | + $dat = \Gedcom\Parser\Date::parse($parser); |
|
65 | + $even->setDate($dat); |
|
66 | + //$even->setDate(trim($record[2])) |
|
67 | + break; |
|
68 | + case 'PLAC': |
|
69 | + $plac = \Gedcom\Parser\Plac::parse($parser); |
|
70 | + $even->setPlac($plac); |
|
71 | + break; |
|
72 | + case 'ADDR': |
|
73 | + $even->setAddr(\Gedcom\Parser\Addr::parse($parser)); |
|
74 | + break; |
|
75 | + case 'PHON': |
|
76 | + $phone = \Gedcom\Parser\Phon::parse($parser); |
|
77 | + $even->addPhone($phone); |
|
78 | + break; |
|
79 | + case 'CAUS': |
|
80 | + $even->setCaus(trim($record[2])); |
|
81 | + break; |
|
82 | + case 'AGE': |
|
83 | + $even->setAge(trim($record[2])); |
|
84 | + break; |
|
85 | + case 'AGNC': |
|
86 | + $even->setAgnc(trim($record[2])); |
|
87 | + break; |
|
88 | + case 'SOUR': |
|
89 | + $sour = \Gedcom\Parser\SourRef::parse($parser); |
|
90 | + $even->addSour($sour); |
|
91 | + break; |
|
92 | + case 'OBJE': |
|
93 | + $obje = \Gedcom\Parser\ObjeRef::parse($parser); |
|
94 | + $even->addObje($obje); |
|
95 | + break; |
|
96 | + case 'NOTE': |
|
97 | + $note = \Gedcom\Parser\NoteRef::parse($parser); |
|
98 | + if ($note) { |
|
99 | + $even->addNote($note); |
|
100 | + } |
|
101 | + break; |
|
102 | + case 'CHAN': |
|
103 | + $change = \Gedcom\Parser\Chan::parse($parser); |
|
104 | + $even->setChan($change); |
|
105 | + break; |
|
106 | + default: |
|
107 | + $self = get_called_class(); |
|
108 | + $method = 'parse'.$recordType; |
|
109 | 109 | |
110 | - if (method_exists($self, $method)) { |
|
111 | - $self::$method($parser, $even); |
|
112 | - } else { |
|
113 | - $parser->logUnhandledRecord($self.' @ '.__LINE__); |
|
114 | - $parser->skipToNextLevel($currentDepth); |
|
115 | - } |
|
110 | + if (method_exists($self, $method)) { |
|
111 | + $self::$method($parser, $even); |
|
112 | + } else { |
|
113 | + $parser->logUnhandledRecord($self.' @ '.__LINE__); |
|
114 | + $parser->skipToNextLevel($currentDepth); |
|
115 | + } |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | $parser->forward(); |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | /** |
94 | 94 | * Retrieves the header record of the GEDCOM file. |
95 | 95 | */ |
96 | - public function setHead (\Gedcom\Record\Head $head) |
|
96 | + public function setHead(\Gedcom\Record\Head $head) |
|
97 | 97 | { |
98 | 98 | $this->head = $head; |
99 | 99 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | /** |
102 | 102 | * Retrieves the submission record of the GEDCOM file. |
103 | 103 | */ |
104 | - public function setSubn (\Gedcom\Record\Subn $subn) |
|
104 | + public function setSubn(\Gedcom\Record\Subn $subn) |
|
105 | 105 | { |
106 | 106 | $this->subn = $subn; |
107 | 107 | } |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | /** |
110 | 110 | * Adds a source to the collection of sources. |
111 | 111 | */ |
112 | - public function addSour (\Gedcom\Record\Sour $sour) |
|
112 | + public function addSour(\Gedcom\Record\Sour $sour) |
|
113 | 113 | { |
114 | 114 | $this->sour[$sour->getSour()] = $sour; |
115 | 115 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | /** |
118 | 118 | * Adds an individual to the collection of individuals. |
119 | 119 | */ |
120 | - public function addIndi (\Gedcom\Record\Indi $indi) |
|
120 | + public function addIndi(\Gedcom\Record\Indi $indi) |
|
121 | 121 | { |
122 | 122 | $this->indi[$indi->getId()] = $indi; |
123 | 123 | if ($indi->getUid()) { |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | /** |
129 | 129 | * Adds a family to the collection of families. |
130 | 130 | */ |
131 | - public function addFam (\Gedcom\Record\Fam $fam) |
|
131 | + public function addFam(\Gedcom\Record\Fam $fam) |
|
132 | 132 | { |
133 | 133 | $this->fam[$fam->getId()] = $fam; |
134 | 134 | } |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | /** |
137 | 137 | * Adds a note to the collection of notes. |
138 | 138 | */ |
139 | - public function addNote (\Gedcom\Record\Note $note) |
|
139 | + public function addNote(\Gedcom\Record\Note $note) |
|
140 | 140 | { |
141 | 141 | $this->note[$note->getId()] = $note; |
142 | 142 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | /** |
145 | 145 | * Adds a repository to the collection of repositories. |
146 | 146 | */ |
147 | - public function addRepo (\Gedcom\Record\Repo $repo) |
|
147 | + public function addRepo(\Gedcom\Record\Repo $repo) |
|
148 | 148 | { |
149 | 149 | $this->repo[$repo->getRepo()] = $repo; |
150 | 150 | } |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | /** |
153 | 153 | * Adds an object to the collection of objects. |
154 | 154 | */ |
155 | - public function addObje (\Gedcom\Record\Obje $obje) |
|
155 | + public function addObje(\Gedcom\Record\Obje $obje) |
|
156 | 156 | { |
157 | 157 | $this->obje[$obje->getId()] = $obje; |
158 | 158 | } |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | /** |
161 | 161 | * Adds a submitter record to the collection of submitters. |
162 | 162 | */ |
163 | - public function addSubm (\Gedcom\Record\Subm $subm) |
|
163 | + public function addSubm(\Gedcom\Record\Subm $subm) |
|
164 | 164 | { |
165 | 165 | $this->subm[$subm->getSubm()] = $subm; |
166 | 166 | } |
@@ -20,7 +20,7 @@ |
||
20 | 20 | * @param int $level |
21 | 21 | * @return string |
22 | 22 | */ |
23 | - public static function convert (\Gedcom\Record\Sour &$sour, $level) |
|
23 | + public static function convert(\Gedcom\Record\Sour &$sour, $level) |
|
24 | 24 | { |
25 | 25 | $output = ''; |
26 | 26 | $_sour = $sour->getSour(); |
@@ -22,7 +22,7 @@ |
||
22 | 22 | * |
23 | 23 | * @return string |
24 | 24 | */ |
25 | - public static function convert (\Gedcom\Record\Subn &$subn) |
|
25 | + public static function convert(\Gedcom\Record\Subn &$subn) |
|
26 | 26 | { |
27 | 27 | $level = 0; |
28 | 28 | $output = ''; |