@@ -51,138 +51,138 @@ |
||
51 | 51 | } |
52 | 52 | |
53 | 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; |
|
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__); |
|
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 | 186 | } |
187 | 187 | |
188 | 188 | $parser->forward(); |
@@ -47,59 +47,59 @@ |
||
47 | 47 | } |
48 | 48 | |
49 | 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__); |
|
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 | 103 | } |
104 | 104 | |
105 | 105 | $parser->forward(); |
@@ -65,62 +65,62 @@ |
||
65 | 65 | } |
66 | 66 | |
67 | 67 | switch ($recordType) { |
68 | - case 'TYPE': |
|
69 | - $even->setType(trim($record[2])); |
|
70 | - break; |
|
71 | - case 'DATE': |
|
72 | - $dat = \PhpGedcom\Parser\Date::parse($parser); |
|
73 | - $even->setDate($dat); |
|
74 | - //$even->setDate(trim($record[2])) |
|
75 | - break; |
|
76 | - case 'PLAC': |
|
77 | - $plac = \PhpGedcom\Parser\Plac::parse($parser); |
|
78 | - $even->setPlac($plac); |
|
79 | - break; |
|
80 | - case 'ADDR': |
|
81 | - $even->setAddr(\PhpGedcom\Parser\Addr::parse($parser)); |
|
82 | - break; |
|
83 | - case 'PHON': |
|
84 | - $phone = \PhpGedcom\Parser\Phon::parse($parser); |
|
85 | - $even->addPhone($phone); |
|
86 | - break; |
|
87 | - case 'CAUS': |
|
88 | - $even->setCaus(trim($record[2])); |
|
89 | - break; |
|
90 | - case 'AGE': |
|
91 | - $even->setAge(trim($record[2])); |
|
92 | - break; |
|
93 | - case 'AGNC': |
|
94 | - $even->setAgnc(trim($record[2])); |
|
95 | - break; |
|
96 | - case 'SOUR': |
|
97 | - $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
98 | - $even->addSour($sour); |
|
99 | - break; |
|
100 | - case 'OBJE': |
|
101 | - $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
102 | - $even->addObje($obje); |
|
103 | - break; |
|
104 | - case 'NOTE': |
|
105 | - $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
106 | - if ($note) { |
|
107 | - $even->addNote($note); |
|
108 | - } |
|
109 | - break; |
|
110 | - case 'CHAN': |
|
111 | - $change = Chan::parse($parser); |
|
112 | - $even->setChan($change); |
|
113 | - break; |
|
114 | - default: |
|
115 | - $self = get_called_class(); |
|
116 | - $method = 'parse' . $recordType; |
|
68 | + case 'TYPE': |
|
69 | + $even->setType(trim($record[2])); |
|
70 | + break; |
|
71 | + case 'DATE': |
|
72 | + $dat = \PhpGedcom\Parser\Date::parse($parser); |
|
73 | + $even->setDate($dat); |
|
74 | + //$even->setDate(trim($record[2])) |
|
75 | + break; |
|
76 | + case 'PLAC': |
|
77 | + $plac = \PhpGedcom\Parser\Plac::parse($parser); |
|
78 | + $even->setPlac($plac); |
|
79 | + break; |
|
80 | + case 'ADDR': |
|
81 | + $even->setAddr(\PhpGedcom\Parser\Addr::parse($parser)); |
|
82 | + break; |
|
83 | + case 'PHON': |
|
84 | + $phone = \PhpGedcom\Parser\Phon::parse($parser); |
|
85 | + $even->addPhone($phone); |
|
86 | + break; |
|
87 | + case 'CAUS': |
|
88 | + $even->setCaus(trim($record[2])); |
|
89 | + break; |
|
90 | + case 'AGE': |
|
91 | + $even->setAge(trim($record[2])); |
|
92 | + break; |
|
93 | + case 'AGNC': |
|
94 | + $even->setAgnc(trim($record[2])); |
|
95 | + break; |
|
96 | + case 'SOUR': |
|
97 | + $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
98 | + $even->addSour($sour); |
|
99 | + break; |
|
100 | + case 'OBJE': |
|
101 | + $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
102 | + $even->addObje($obje); |
|
103 | + break; |
|
104 | + case 'NOTE': |
|
105 | + $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
106 | + if ($note) { |
|
107 | + $even->addNote($note); |
|
108 | + } |
|
109 | + break; |
|
110 | + case 'CHAN': |
|
111 | + $change = Chan::parse($parser); |
|
112 | + $even->setChan($change); |
|
113 | + break; |
|
114 | + default: |
|
115 | + $self = get_called_class(); |
|
116 | + $method = 'parse' . $recordType; |
|
117 | 117 | |
118 | - if (method_exists($self, $method)) { |
|
119 | - $self::$method($parser, $even); |
|
120 | - } else { |
|
121 | - $parser->logUnhandledRecord($self . ' @ ' . __LINE__); |
|
122 | - $parser->skipToNextLevel($currentDepth); |
|
123 | - } |
|
118 | + if (method_exists($self, $method)) { |
|
119 | + $self::$method($parser, $even); |
|
120 | + } else { |
|
121 | + $parser->logUnhandledRecord($self . ' @ ' . __LINE__); |
|
122 | + $parser->skipToNextLevel($currentDepth); |
|
123 | + } |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | $parser->forward(); |
@@ -156,21 +156,21 @@ |
||
156 | 156 | } |
157 | 157 | |
158 | 158 | switch ($recordType) { |
159 | - case 'CONT': |
|
160 | - $data .= "\n"; |
|
161 | - |
|
162 | - if (isset($record[2])) { |
|
163 | - $data .= trim($record[2]); |
|
164 | - } |
|
165 | - break; |
|
166 | - case 'CONC': |
|
167 | - if (isset($record[2])) { |
|
168 | - $data .= ' ' . trim($record[2]); |
|
169 | - } |
|
170 | - break; |
|
171 | - default: |
|
172 | - $this->back(); |
|
173 | - break 2; |
|
159 | + case 'CONT': |
|
160 | + $data .= "\n"; |
|
161 | + |
|
162 | + if (isset($record[2])) { |
|
163 | + $data .= trim($record[2]); |
|
164 | + } |
|
165 | + break; |
|
166 | + case 'CONC': |
|
167 | + if (isset($record[2])) { |
|
168 | + $data .= ' ' . trim($record[2]); |
|
169 | + } |
|
170 | + break; |
|
171 | + default: |
|
172 | + $this->back(); |
|
173 | + break 2; |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | $this->forward(); |