@@ -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(); |
@@ -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(); |
@@ -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(); |
@@ -7,7 +7,7 @@ |
||
| 7 | 7 | use Rector\Set\ValueObject\SetList; |
| 8 | 8 | use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; |
| 9 | 9 | |
| 10 | -return static function (ContainerConfigurator $containerConfigurator): void { |
|
| 10 | +return static function(ContainerConfigurator $containerConfigurator): void { |
|
| 11 | 11 | $containerConfigurator->import(SetList::PHP_80); |
| 12 | 12 | // get parameters |
| 13 | 13 | $parameters = $containerConfigurator->parameters(); |
@@ -46,147 +46,147 @@ |
||
| 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 | - $burialday = \Gedcom\Parser\Date::parse($parser); |
|
| 73 | - $indi->setBurialday($burialday); |
|
| 74 | - break; |
|
| 75 | - case 'CENS': |
|
| 76 | - case 'CHR': |
|
| 77 | - case 'CHRA': |
|
| 78 | - case 'CONF': |
|
| 79 | - case 'CREM': |
|
| 80 | - case 'DEAT': |
|
| 81 | - $deathday = \Gedcom\Parser\Date::parse($parser); |
|
| 82 | - $indi->setDeathday($deathday); |
|
| 83 | - break; |
|
| 84 | - case 'EMIG': |
|
| 85 | - case 'FCOM': |
|
| 86 | - case 'GRAD': |
|
| 87 | - case 'IMMI': |
|
| 88 | - case 'NATU': |
|
| 89 | - case 'ORDN': |
|
| 90 | - case 'RETI': |
|
| 91 | - case 'PROB': |
|
| 92 | - case 'WILL': |
|
| 93 | - case 'EVEN': |
|
| 94 | - $className = ucfirst(strtolower($recordType)); |
|
| 95 | - $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 | + $burialday = \Gedcom\Parser\Date::parse($parser); |
|
| 73 | + $indi->setBurialday($burialday); |
|
| 74 | + break; |
|
| 75 | + case 'CENS': |
|
| 76 | + case 'CHR': |
|
| 77 | + case 'CHRA': |
|
| 78 | + case 'CONF': |
|
| 79 | + case 'CREM': |
|
| 80 | + case 'DEAT': |
|
| 81 | + $deathday = \Gedcom\Parser\Date::parse($parser); |
|
| 82 | + $indi->setDeathday($deathday); |
|
| 83 | + break; |
|
| 84 | + case 'EMIG': |
|
| 85 | + case 'FCOM': |
|
| 86 | + case 'GRAD': |
|
| 87 | + case 'IMMI': |
|
| 88 | + case 'NATU': |
|
| 89 | + case 'ORDN': |
|
| 90 | + case 'RETI': |
|
| 91 | + case 'PROB': |
|
| 92 | + case 'WILL': |
|
| 93 | + case 'EVEN': |
|
| 94 | + $className = ucfirst(strtolower($recordType)); |
|
| 95 | + $class = '\\Gedcom\\Parser\\Indi\\'.$className; |
|
| 96 | 96 | |
| 97 | - $event = $class::parse($parser); |
|
| 98 | - $indi->addEven($event); |
|
| 99 | - break; |
|
| 100 | - case 'CAST': |
|
| 101 | - case 'DSCR': |
|
| 102 | - case 'EDUC': |
|
| 103 | - case 'IDNO': |
|
| 104 | - case 'NATI': |
|
| 105 | - case 'NCHI': |
|
| 106 | - case 'NMR': |
|
| 107 | - case 'OCCU': |
|
| 108 | - case 'PROP': |
|
| 109 | - case 'RELI': |
|
| 110 | - case 'RESI': |
|
| 111 | - case 'SSN': |
|
| 112 | - case 'TITL': |
|
| 113 | - $className = ucfirst(strtolower($recordType)); |
|
| 114 | - $class = '\\Gedcom\\Parser\\Indi\\'.$className; |
|
| 97 | + $event = $class::parse($parser); |
|
| 98 | + $indi->addEven($event); |
|
| 99 | + break; |
|
| 100 | + case 'CAST': |
|
| 101 | + case 'DSCR': |
|
| 102 | + case 'EDUC': |
|
| 103 | + case 'IDNO': |
|
| 104 | + case 'NATI': |
|
| 105 | + case 'NCHI': |
|
| 106 | + case 'NMR': |
|
| 107 | + case 'OCCU': |
|
| 108 | + case 'PROP': |
|
| 109 | + case 'RELI': |
|
| 110 | + case 'RESI': |
|
| 111 | + case 'SSN': |
|
| 112 | + case 'TITL': |
|
| 113 | + $className = ucfirst(strtolower($recordType)); |
|
| 114 | + $class = '\\Gedcom\\Parser\\Indi\\'.$className; |
|
| 115 | 115 | |
| 116 | - $att = $class::parse($parser); |
|
| 117 | - $indi->addAttr($att); |
|
| 118 | - break; |
|
| 119 | - case 'BAPL': |
|
| 120 | - case 'CONL': |
|
| 121 | - case 'ENDL': |
|
| 122 | - case 'SLGC': |
|
| 123 | - $className = ucfirst(strtolower($recordType)); |
|
| 124 | - $class = '\\Gedcom\\Parser\\Indi\\'.$className; |
|
| 116 | + $att = $class::parse($parser); |
|
| 117 | + $indi->addAttr($att); |
|
| 118 | + break; |
|
| 119 | + case 'BAPL': |
|
| 120 | + case 'CONL': |
|
| 121 | + case 'ENDL': |
|
| 122 | + case 'SLGC': |
|
| 123 | + $className = ucfirst(strtolower($recordType)); |
|
| 124 | + $class = '\\Gedcom\\Parser\\Indi\\'.$className; |
|
| 125 | 125 | |
| 126 | - $lds = $class::parse($parser); |
|
| 127 | - $indi->{'add'.$recordType}[] = $lds; |
|
| 128 | - break; |
|
| 129 | - case 'FAMC': |
|
| 130 | - $famc = \Gedcom\Parser\Indi\Famc::parse($parser); |
|
| 131 | - if ($famc) { |
|
| 132 | - $indi->addFamc($famc); |
|
| 133 | - } |
|
| 134 | - break; |
|
| 135 | - case 'FAMS': |
|
| 136 | - $fams = \Gedcom\Parser\Indi\Fams::parse($parser); |
|
| 137 | - if ($fams) { |
|
| 138 | - $indi->addFams($fams); |
|
| 139 | - } |
|
| 140 | - break; |
|
| 141 | - case 'SUBM': |
|
| 142 | - $indi->addSubm($parser->normalizeIdentifier($record[2])); |
|
| 143 | - break; |
|
| 144 | - case 'ASSO': |
|
| 145 | - $asso = \Gedcom\Parser\Indi\Asso::parse($parser); |
|
| 146 | - $indi->addAsso($asso); |
|
| 147 | - break; |
|
| 148 | - case 'ALIA': |
|
| 149 | - $indi->addAlia($parser->normalizeIdentifier($record[2])); |
|
| 150 | - break; |
|
| 151 | - case 'ANCI': |
|
| 152 | - $indi->addAnci($parser->normalizeIdentifier($record[2])); |
|
| 153 | - break; |
|
| 154 | - case 'DESI': |
|
| 155 | - $indi->addDesi($parser->normalizeIdentifier($record[2])); |
|
| 156 | - break; |
|
| 157 | - case 'RFN': |
|
| 158 | - $indi->setRfn(trim($record[2])); |
|
| 159 | - break; |
|
| 160 | - case 'AFN': |
|
| 161 | - $indi->setAfn(trim($record[2])); |
|
| 162 | - break; |
|
| 163 | - case 'REFN': |
|
| 164 | - $ref = \Gedcom\Parser\Refn::parse($parser); |
|
| 165 | - $indi->addRefn($ref); |
|
| 166 | - break; |
|
| 167 | - case 'RIN': |
|
| 168 | - $indi->setRin(trim($record[2])); |
|
| 169 | - break; |
|
| 170 | - case 'CHAN': |
|
| 171 | - $chan = \Gedcom\Parser\Chan::parse($parser); |
|
| 172 | - $indi->setChan($chan); |
|
| 173 | - break; |
|
| 174 | - case 'NOTE': |
|
| 175 | - $note = \Gedcom\Parser\NoteRef::parse($parser); |
|
| 176 | - if ($note) { |
|
| 177 | - $indi->addNote($note); |
|
| 178 | - } |
|
| 179 | - break; |
|
| 180 | - case 'SOUR': |
|
| 181 | - $sour = \Gedcom\Parser\SourRef::parse($parser); |
|
| 182 | - $indi->addSour($sour); |
|
| 183 | - break; |
|
| 184 | - case 'OBJE': |
|
| 185 | - $obje = \Gedcom\Parser\ObjeRef::parse($parser); |
|
| 186 | - $indi->addObje($obje); |
|
| 187 | - break; |
|
| 188 | - default: |
|
| 189 | - $parser->logUnhandledRecord(self::class.' @ '.__LINE__); |
|
| 126 | + $lds = $class::parse($parser); |
|
| 127 | + $indi->{'add'.$recordType}[] = $lds; |
|
| 128 | + break; |
|
| 129 | + case 'FAMC': |
|
| 130 | + $famc = \Gedcom\Parser\Indi\Famc::parse($parser); |
|
| 131 | + if ($famc) { |
|
| 132 | + $indi->addFamc($famc); |
|
| 133 | + } |
|
| 134 | + break; |
|
| 135 | + case 'FAMS': |
|
| 136 | + $fams = \Gedcom\Parser\Indi\Fams::parse($parser); |
|
| 137 | + if ($fams) { |
|
| 138 | + $indi->addFams($fams); |
|
| 139 | + } |
|
| 140 | + break; |
|
| 141 | + case 'SUBM': |
|
| 142 | + $indi->addSubm($parser->normalizeIdentifier($record[2])); |
|
| 143 | + break; |
|
| 144 | + case 'ASSO': |
|
| 145 | + $asso = \Gedcom\Parser\Indi\Asso::parse($parser); |
|
| 146 | + $indi->addAsso($asso); |
|
| 147 | + break; |
|
| 148 | + case 'ALIA': |
|
| 149 | + $indi->addAlia($parser->normalizeIdentifier($record[2])); |
|
| 150 | + break; |
|
| 151 | + case 'ANCI': |
|
| 152 | + $indi->addAnci($parser->normalizeIdentifier($record[2])); |
|
| 153 | + break; |
|
| 154 | + case 'DESI': |
|
| 155 | + $indi->addDesi($parser->normalizeIdentifier($record[2])); |
|
| 156 | + break; |
|
| 157 | + case 'RFN': |
|
| 158 | + $indi->setRfn(trim($record[2])); |
|
| 159 | + break; |
|
| 160 | + case 'AFN': |
|
| 161 | + $indi->setAfn(trim($record[2])); |
|
| 162 | + break; |
|
| 163 | + case 'REFN': |
|
| 164 | + $ref = \Gedcom\Parser\Refn::parse($parser); |
|
| 165 | + $indi->addRefn($ref); |
|
| 166 | + break; |
|
| 167 | + case 'RIN': |
|
| 168 | + $indi->setRin(trim($record[2])); |
|
| 169 | + break; |
|
| 170 | + case 'CHAN': |
|
| 171 | + $chan = \Gedcom\Parser\Chan::parse($parser); |
|
| 172 | + $indi->setChan($chan); |
|
| 173 | + break; |
|
| 174 | + case 'NOTE': |
|
| 175 | + $note = \Gedcom\Parser\NoteRef::parse($parser); |
|
| 176 | + if ($note) { |
|
| 177 | + $indi->addNote($note); |
|
| 178 | + } |
|
| 179 | + break; |
|
| 180 | + case 'SOUR': |
|
| 181 | + $sour = \Gedcom\Parser\SourRef::parse($parser); |
|
| 182 | + $indi->addSour($sour); |
|
| 183 | + break; |
|
| 184 | + case 'OBJE': |
|
| 185 | + $obje = \Gedcom\Parser\ObjeRef::parse($parser); |
|
| 186 | + $indi->addObje($obje); |
|
| 187 | + break; |
|
| 188 | + default: |
|
| 189 | + $parser->logUnhandledRecord(self::class.' @ '.__LINE__); |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | $parser->forward(); |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | $parser->forward(); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - $date = $chan->getYear() .'-'. $chan->getMonth() .'-'. $chan->getDay() ; |
|
| 58 | + $date = $chan->getYear().'-'.$chan->getMonth().'-'.$chan->getDay(); |
|
| 59 | 59 | $chan->setDatetime($date); |
| 60 | 60 | |
| 61 | 61 | return $chan; |
@@ -111,7 +111,7 @@ |
||
| 111 | 111 | |
| 112 | 112 | public function setDatetime($date) |
| 113 | 113 | { |
| 114 | - $this->datetime = $date .' '. $this->time; |
|
| 114 | + $this->datetime = $date.' '.$this->time; |
|
| 115 | 115 | |
| 116 | 116 | return $this; |
| 117 | 117 | } |
@@ -119,21 +119,21 @@ discard block |
||
| 119 | 119 | $birthday = $indi->getBirthday(); |
| 120 | 120 | if (!empty($birthday)) { |
| 121 | 121 | $output .= $level.' BIRT '."\n"; |
| 122 | - $output .= ($level+1).' DATE '.$birthday."\n"; |
|
| 122 | + $output .= ($level + 1).' DATE '.$birthday."\n"; |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | // $deathday |
| 126 | 126 | $deathday = $indi->getDeathday(); |
| 127 | 127 | if (!empty($deathday)) { |
| 128 | 128 | $output .= $level.' DEAT '."\n"; |
| 129 | - $output .= ($level+1).' DATE '.$deathday."\n"; |
|
| 129 | + $output .= ($level + 1).' DATE '.$deathday."\n"; |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | // $burialday |
| 133 | 133 | $burialday = $indi->getBurialday(); |
| 134 | 134 | if (!empty($burialday)) { |
| 135 | 135 | $output .= $level.' BURI '."\n"; |
| 136 | - $output .= ($level+1).' DATE '.$burialday."\n"; |
|
| 136 | + $output .= ($level + 1).' DATE '.$burialday."\n"; |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | // $rin |
@@ -229,8 +229,8 @@ discard block |
||
| 229 | 229 | $chan = $indi->getChan(); |
| 230 | 230 | if (!empty($chan)) { |
| 231 | 231 | $output .= $level.' CHAN '."\n"; |
| 232 | - $output .= ($level+1).' DATE '.$chan[0]."\n"; |
|
| 233 | - $output .= ($level+1).' TIME '.$chan[1]."\n"; |
|
| 232 | + $output .= ($level + 1).' DATE '.$chan[0]."\n"; |
|
| 233 | + $output .= ($level + 1).' TIME '.$chan[1]."\n"; |
|
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | // Bapl |