@@ -46,138 +46,138 @@ |
||
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 = \PhpGedcom\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 | - case 'BAPM': |
|
65 | - case 'BARM': |
|
66 | - case 'BASM': |
|
67 | - case 'BLES': |
|
68 | - case 'BURI': |
|
69 | - case 'CENS': |
|
70 | - case 'CHR': |
|
71 | - case 'CHRA': |
|
72 | - case 'CONF': |
|
73 | - case 'CREM': |
|
74 | - case 'DEAT': |
|
75 | - case 'EMIG': |
|
76 | - case 'FCOM': |
|
77 | - case 'GRAD': |
|
78 | - case 'IMMI': |
|
79 | - case 'NATU': |
|
80 | - case 'ORDN': |
|
81 | - case 'RETI': |
|
82 | - case 'PROB': |
|
83 | - case 'WILL': |
|
84 | - case 'EVEN': |
|
85 | - $className = ucfirst(strtolower($recordType)); |
|
86 | - $class = '\\PhpGedcom\\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 = \PhpGedcom\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 | + case 'BAPM': |
|
65 | + case 'BARM': |
|
66 | + case 'BASM': |
|
67 | + case 'BLES': |
|
68 | + case 'BURI': |
|
69 | + case 'CENS': |
|
70 | + case 'CHR': |
|
71 | + case 'CHRA': |
|
72 | + case 'CONF': |
|
73 | + case 'CREM': |
|
74 | + case 'DEAT': |
|
75 | + case 'EMIG': |
|
76 | + case 'FCOM': |
|
77 | + case 'GRAD': |
|
78 | + case 'IMMI': |
|
79 | + case 'NATU': |
|
80 | + case 'ORDN': |
|
81 | + case 'RETI': |
|
82 | + case 'PROB': |
|
83 | + case 'WILL': |
|
84 | + case 'EVEN': |
|
85 | + $className = ucfirst(strtolower($recordType)); |
|
86 | + $class = '\\PhpGedcom\\Parser\\Indi\\'.$className; |
|
87 | 87 | |
88 | - $event = $class::parse($parser); |
|
89 | - $indi->addEven($event); |
|
90 | - break; |
|
91 | - case 'CAST': |
|
92 | - case 'DSCR': |
|
93 | - case 'EDUC': |
|
94 | - case 'IDNO': |
|
95 | - case 'NATI': |
|
96 | - case 'NCHI': |
|
97 | - case 'NMR': |
|
98 | - case 'OCCU': |
|
99 | - case 'PROP': |
|
100 | - case 'RELI': |
|
101 | - case 'RESI': |
|
102 | - case 'SSN': |
|
103 | - case 'TITL': |
|
104 | - $className = ucfirst(strtolower($recordType)); |
|
105 | - $class = '\\PhpGedcom\\Parser\\Indi\\'.$className; |
|
88 | + $event = $class::parse($parser); |
|
89 | + $indi->addEven($event); |
|
90 | + break; |
|
91 | + case 'CAST': |
|
92 | + case 'DSCR': |
|
93 | + case 'EDUC': |
|
94 | + case 'IDNO': |
|
95 | + case 'NATI': |
|
96 | + case 'NCHI': |
|
97 | + case 'NMR': |
|
98 | + case 'OCCU': |
|
99 | + case 'PROP': |
|
100 | + case 'RELI': |
|
101 | + case 'RESI': |
|
102 | + case 'SSN': |
|
103 | + case 'TITL': |
|
104 | + $className = ucfirst(strtolower($recordType)); |
|
105 | + $class = '\\PhpGedcom\\Parser\\Indi\\'.$className; |
|
106 | 106 | |
107 | - $att = $class::parse($parser); |
|
108 | - $indi->addAttr($att); |
|
109 | - break; |
|
110 | - case 'BAPL': |
|
111 | - case 'CONL': |
|
112 | - case 'ENDL': |
|
113 | - case 'SLGC': |
|
114 | - $className = ucfirst(strtolower($recordType)); |
|
115 | - $class = '\\PhpGedcom\\Parser\\Indi\\'.$className; |
|
107 | + $att = $class::parse($parser); |
|
108 | + $indi->addAttr($att); |
|
109 | + break; |
|
110 | + case 'BAPL': |
|
111 | + case 'CONL': |
|
112 | + case 'ENDL': |
|
113 | + case 'SLGC': |
|
114 | + $className = ucfirst(strtolower($recordType)); |
|
115 | + $class = '\\PhpGedcom\\Parser\\Indi\\'.$className; |
|
116 | 116 | |
117 | - $lds = $class::parse($parser); |
|
118 | - $indi->{'add'.$recordType}[] = $lds; |
|
119 | - break; |
|
120 | - case 'FAMC': |
|
121 | - $famc = \PhpGedcom\Parser\Indi\Famc::parse($parser); |
|
122 | - if ($famc) { |
|
123 | - $indi->addFamc($famc); |
|
124 | - } |
|
125 | - break; |
|
126 | - case 'FAMS': |
|
127 | - $fams = \PhpGedcom\Parser\Indi\Fams::parse($parser); |
|
128 | - if ($fams) { |
|
129 | - $indi->addFams($fams); |
|
130 | - } |
|
131 | - break; |
|
132 | - case 'SUBM': |
|
133 | - $indi->addSubm($parser->normalizeIdentifier($record[2])); |
|
134 | - break; |
|
135 | - case 'ASSO': |
|
136 | - $asso = \PhpGedcom\Parser\Indi\Asso::parse($parser); |
|
137 | - $indi->addAsso($asso); |
|
138 | - break; |
|
139 | - case 'ALIA': |
|
140 | - $indi->addAlia($parser->normalizeIdentifier($record[2])); |
|
141 | - break; |
|
142 | - case 'ANCI': |
|
143 | - $indi->addAnci($parser->normalizeIdentifier($record[2])); |
|
144 | - break; |
|
145 | - case 'DESI': |
|
146 | - $indi->addDesi($parser->normalizeIdentifier($record[2])); |
|
147 | - break; |
|
148 | - case 'RFN': |
|
149 | - $indi->setRfn(trim($record[2])); |
|
150 | - break; |
|
151 | - case 'AFN': |
|
152 | - $indi->setAfn(trim($record[2])); |
|
153 | - break; |
|
154 | - case 'REFN': |
|
155 | - $ref = \PhpGedcom\Parser\Refn::parse($parser); |
|
156 | - $indi->addRefn($ref); |
|
157 | - break; |
|
158 | - case 'RIN': |
|
159 | - $indi->setRin(trim($record[2])); |
|
160 | - break; |
|
161 | - case 'CHAN': |
|
162 | - $chan = \PhpGedcom\Parser\Chan::parse($parser); |
|
163 | - $indi->setChan($chan); |
|
164 | - break; |
|
165 | - case 'NOTE': |
|
166 | - $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
167 | - if ($note) { |
|
168 | - $indi->addNote($note); |
|
169 | - } |
|
170 | - break; |
|
171 | - case 'SOUR': |
|
172 | - $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
173 | - $indi->addSour($sour); |
|
174 | - break; |
|
175 | - case 'OBJE': |
|
176 | - $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
177 | - $indi->addObje($obje); |
|
178 | - break; |
|
179 | - default: |
|
180 | - $parser->logUnhandledRecord(get_class().' @ '.__LINE__); |
|
117 | + $lds = $class::parse($parser); |
|
118 | + $indi->{'add'.$recordType}[] = $lds; |
|
119 | + break; |
|
120 | + case 'FAMC': |
|
121 | + $famc = \PhpGedcom\Parser\Indi\Famc::parse($parser); |
|
122 | + if ($famc) { |
|
123 | + $indi->addFamc($famc); |
|
124 | + } |
|
125 | + break; |
|
126 | + case 'FAMS': |
|
127 | + $fams = \PhpGedcom\Parser\Indi\Fams::parse($parser); |
|
128 | + if ($fams) { |
|
129 | + $indi->addFams($fams); |
|
130 | + } |
|
131 | + break; |
|
132 | + case 'SUBM': |
|
133 | + $indi->addSubm($parser->normalizeIdentifier($record[2])); |
|
134 | + break; |
|
135 | + case 'ASSO': |
|
136 | + $asso = \PhpGedcom\Parser\Indi\Asso::parse($parser); |
|
137 | + $indi->addAsso($asso); |
|
138 | + break; |
|
139 | + case 'ALIA': |
|
140 | + $indi->addAlia($parser->normalizeIdentifier($record[2])); |
|
141 | + break; |
|
142 | + case 'ANCI': |
|
143 | + $indi->addAnci($parser->normalizeIdentifier($record[2])); |
|
144 | + break; |
|
145 | + case 'DESI': |
|
146 | + $indi->addDesi($parser->normalizeIdentifier($record[2])); |
|
147 | + break; |
|
148 | + case 'RFN': |
|
149 | + $indi->setRfn(trim($record[2])); |
|
150 | + break; |
|
151 | + case 'AFN': |
|
152 | + $indi->setAfn(trim($record[2])); |
|
153 | + break; |
|
154 | + case 'REFN': |
|
155 | + $ref = \PhpGedcom\Parser\Refn::parse($parser); |
|
156 | + $indi->addRefn($ref); |
|
157 | + break; |
|
158 | + case 'RIN': |
|
159 | + $indi->setRin(trim($record[2])); |
|
160 | + break; |
|
161 | + case 'CHAN': |
|
162 | + $chan = \PhpGedcom\Parser\Chan::parse($parser); |
|
163 | + $indi->setChan($chan); |
|
164 | + break; |
|
165 | + case 'NOTE': |
|
166 | + $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
167 | + if ($note) { |
|
168 | + $indi->addNote($note); |
|
169 | + } |
|
170 | + break; |
|
171 | + case 'SOUR': |
|
172 | + $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
173 | + $indi->addSour($sour); |
|
174 | + break; |
|
175 | + case 'OBJE': |
|
176 | + $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
177 | + $indi->addObje($obje); |
|
178 | + break; |
|
179 | + default: |
|
180 | + $parser->logUnhandledRecord(get_class().' @ '.__LINE__); |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | $parser->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 = \PhpGedcom\Parser\Date::parse($parser); |
|
48 | - $even->setDate($dat); |
|
49 | - //$even->setDate(trim($record[2])); |
|
50 | - break; |
|
51 | - case 'PLAC': |
|
52 | - $plac = \PhpGedcom\Parser\Plac::parse($parser); |
|
53 | - $even->setPlac($plac); |
|
54 | - break; |
|
55 | - case 'ADDR': |
|
56 | - $addr = \PhpGedcom\Parser\Addr::parse($parser); |
|
57 | - $even->setAddr($addr); |
|
58 | - break; |
|
59 | - case 'PHON': |
|
60 | - $phone = \PhpGedcom\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 = \PhpGedcom\Parser\Fam\Even\Husb::parse($parser); |
|
74 | - $even->setHusb($husb); |
|
75 | - break; |
|
76 | - case 'WIFE': |
|
77 | - $wife = \PhpGedcom\Parser\Fam\Even\Wife::parse($parser); |
|
78 | - $even->setWife($wife); |
|
79 | - break; |
|
80 | - case 'SOUR': |
|
81 | - $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
82 | - $even->addSour($sour); |
|
83 | - break; |
|
84 | - case 'OBJE': |
|
85 | - $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
86 | - $even->addObje($obje); |
|
87 | - break; |
|
88 | - case 'NOTE': |
|
89 | - $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
90 | - if ($note) { |
|
91 | - $even->addNote($note); |
|
92 | - } |
|
93 | - break; |
|
94 | - default: |
|
95 | - $parser->logUnhandledRecord(get_class().' @ '.__LINE__); |
|
43 | + case 'TYPE': |
|
44 | + $even->setType(trim($record[2])); |
|
45 | + break; |
|
46 | + case 'DATE': |
|
47 | + $dat = \PhpGedcom\Parser\Date::parse($parser); |
|
48 | + $even->setDate($dat); |
|
49 | + //$even->setDate(trim($record[2])); |
|
50 | + break; |
|
51 | + case 'PLAC': |
|
52 | + $plac = \PhpGedcom\Parser\Plac::parse($parser); |
|
53 | + $even->setPlac($plac); |
|
54 | + break; |
|
55 | + case 'ADDR': |
|
56 | + $addr = \PhpGedcom\Parser\Addr::parse($parser); |
|
57 | + $even->setAddr($addr); |
|
58 | + break; |
|
59 | + case 'PHON': |
|
60 | + $phone = \PhpGedcom\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 = \PhpGedcom\Parser\Fam\Even\Husb::parse($parser); |
|
74 | + $even->setHusb($husb); |
|
75 | + break; |
|
76 | + case 'WIFE': |
|
77 | + $wife = \PhpGedcom\Parser\Fam\Even\Wife::parse($parser); |
|
78 | + $even->setWife($wife); |
|
79 | + break; |
|
80 | + case 'SOUR': |
|
81 | + $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
82 | + $even->addSour($sour); |
|
83 | + break; |
|
84 | + case 'OBJE': |
|
85 | + $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
86 | + $even->addObje($obje); |
|
87 | + break; |
|
88 | + case 'NOTE': |
|
89 | + $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
90 | + if ($note) { |
|
91 | + $even->addNote($note); |
|
92 | + } |
|
93 | + break; |
|
94 | + default: |
|
95 | + $parser->logUnhandledRecord(get_class().' @ '.__LINE__); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | $parser->forward(); |
@@ -59,62 +59,62 @@ |
||
59 | 59 | } |
60 | 60 | |
61 | 61 | switch ($recordType) { |
62 | - case 'TYPE': |
|
63 | - $even->setType(trim($record[2])); |
|
64 | - break; |
|
65 | - case 'DATE': |
|
66 | - $dat = \PhpGedcom\Parser\Date::parse($parser); |
|
67 | - $even->setDate($dat); |
|
68 | - //$even->setDate(trim($record[2])) |
|
69 | - break; |
|
70 | - case 'PLAC': |
|
71 | - $plac = \PhpGedcom\Parser\Plac::parse($parser); |
|
72 | - $even->setPlac($plac); |
|
73 | - break; |
|
74 | - case 'ADDR': |
|
75 | - $even->setAddr(\PhpGedcom\Parser\Addr::parse($parser)); |
|
76 | - break; |
|
77 | - case 'PHON': |
|
78 | - $phone = \PhpGedcom\Parser\Phon::parse($parser); |
|
79 | - $even->addPhone($phone); |
|
80 | - break; |
|
81 | - case 'CAUS': |
|
82 | - $even->setCaus(trim($record[2])); |
|
83 | - break; |
|
84 | - case 'AGE': |
|
85 | - $even->setAge(trim($record[2])); |
|
86 | - break; |
|
87 | - case 'AGNC': |
|
88 | - $even->setAgnc(trim($record[2])); |
|
89 | - break; |
|
90 | - case 'SOUR': |
|
91 | - $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
92 | - $even->addSour($sour); |
|
93 | - break; |
|
94 | - case 'OBJE': |
|
95 | - $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
96 | - $even->addObje($obje); |
|
97 | - break; |
|
98 | - case 'NOTE': |
|
99 | - $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
100 | - if ($note) { |
|
101 | - $even->addNote($note); |
|
102 | - } |
|
103 | - break; |
|
104 | - case 'CHAN': |
|
105 | - $change = Chan::parse($parser); |
|
106 | - $even->setChan($change); |
|
107 | - break; |
|
108 | - default: |
|
109 | - $self = get_called_class(); |
|
110 | - $method = 'parse'.$recordType; |
|
62 | + case 'TYPE': |
|
63 | + $even->setType(trim($record[2])); |
|
64 | + break; |
|
65 | + case 'DATE': |
|
66 | + $dat = \PhpGedcom\Parser\Date::parse($parser); |
|
67 | + $even->setDate($dat); |
|
68 | + //$even->setDate(trim($record[2])) |
|
69 | + break; |
|
70 | + case 'PLAC': |
|
71 | + $plac = \PhpGedcom\Parser\Plac::parse($parser); |
|
72 | + $even->setPlac($plac); |
|
73 | + break; |
|
74 | + case 'ADDR': |
|
75 | + $even->setAddr(\PhpGedcom\Parser\Addr::parse($parser)); |
|
76 | + break; |
|
77 | + case 'PHON': |
|
78 | + $phone = \PhpGedcom\Parser\Phon::parse($parser); |
|
79 | + $even->addPhone($phone); |
|
80 | + break; |
|
81 | + case 'CAUS': |
|
82 | + $even->setCaus(trim($record[2])); |
|
83 | + break; |
|
84 | + case 'AGE': |
|
85 | + $even->setAge(trim($record[2])); |
|
86 | + break; |
|
87 | + case 'AGNC': |
|
88 | + $even->setAgnc(trim($record[2])); |
|
89 | + break; |
|
90 | + case 'SOUR': |
|
91 | + $sour = \PhpGedcom\Parser\SourRef::parse($parser); |
|
92 | + $even->addSour($sour); |
|
93 | + break; |
|
94 | + case 'OBJE': |
|
95 | + $obje = \PhpGedcom\Parser\ObjeRef::parse($parser); |
|
96 | + $even->addObje($obje); |
|
97 | + break; |
|
98 | + case 'NOTE': |
|
99 | + $note = \PhpGedcom\Parser\NoteRef::parse($parser); |
|
100 | + if ($note) { |
|
101 | + $even->addNote($note); |
|
102 | + } |
|
103 | + break; |
|
104 | + case 'CHAN': |
|
105 | + $change = Chan::parse($parser); |
|
106 | + $even->setChan($change); |
|
107 | + break; |
|
108 | + default: |
|
109 | + $self = get_called_class(); |
|
110 | + $method = 'parse'.$recordType; |
|
111 | 111 | |
112 | - if (method_exists($self, $method)) { |
|
113 | - $self::$method($parser, $even); |
|
114 | - } else { |
|
115 | - $parser->logUnhandledRecord($self.' @ '.__LINE__); |
|
116 | - $parser->skipToNextLevel($currentDepth); |
|
117 | - } |
|
112 | + if (method_exists($self, $method)) { |
|
113 | + $self::$method($parser, $even); |
|
114 | + } else { |
|
115 | + $parser->logUnhandledRecord($self.' @ '.__LINE__); |
|
116 | + $parser->skipToNextLevel($currentDepth); |
|
117 | + } |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | $parser->forward(); |
@@ -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 |
@@ -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(); |