Working on GEDCOM tags/elements

fisharebest · Jun 6, 2020 · 7fe676e · 7fe676e
1 parent 79de923
commit 7fe676e
Show file tree

Hide file tree

Showing 34 changed files with 79 additions and 79 deletions.
diff --git a/app/Fact.php b/app/Fact.php
@@ -355,7 +355,7 @@ public function canEdit(): bool
         }
 
         // Members cannot edit RESN, CHAN and locked records
-        return Auth::isEditor($this->record->tree()) && strpos($this->gedcom, "\n2 RESN locked") === false && $this->tag() !== 'RESN' && $this->tag() !== 'CHAN';
+        return Auth::isEditor($this->record->tree()) && strpos($this->gedcom, "\n2 RESN locked") === false && $this->tag !== 'RESN' && $this->tag !== 'CHAN';
     }
 
     /**
@@ -415,7 +415,7 @@ public function id(): string
      */
     public function tag(): string
     {
-        return $this->tag;
+        return $this->record::RECORD_TYPE . ':' . $this->tag;
     }
 
     /**
@@ -427,7 +427,7 @@ public function tag(): string
      */
     public function getTag(): string
     {
-        return $this->tag();
+        return $this->tag;
     }
 
     /**
@@ -606,7 +606,7 @@ public function summary(): string
             // Fact date
             $date = $this->date();
             if ($date->isOK()) {
-                if ($this->record() instanceof Individual && in_array($this->tag(), Gedcom::BIRTH_EVENTS, true) && $this->record()->tree()->getPreference('SHOW_PARENTS_AGE')) {
+                if ($this->record() instanceof Individual && in_array($this->tag, Gedcom::BIRTH_EVENTS, true) && $this->record()->tree()->getPreference('SHOW_PARENTS_AGE')) {
                     $attributes[] = $date->display() . FunctionsPrint::formatParentsAges($this->record(), $date);
                 } else {
                     $attributes[] = $date->display();
@@ -618,7 +618,7 @@ public function summary(): string
             }
         }
 
-        $class = 'fact_' . $this->tag();
+        $class = 'fact_' . $this->tag;
         if ($this->isPendingAddition()) {
             $class .= ' wt-new';
         } elseif ($this->isPendingDeletion()) {
@@ -683,8 +683,8 @@ public static function typeComparator(): Closure
                 return $a->sortOrder - $b->sortOrder;
             }
 
-            $atag = $a->tag();
-            $btag = $b->tag();
+            $atag = $a->tag;
+            $btag = $b->tag;
 
             // Events not in the above list get mapped onto one that is.
             if (!array_key_exists($atag, $factsort)) {

diff --git a/app/Functions/Functions.php b/app/Functions/Functions.php
@@ -630,7 +630,7 @@ public static function getRelationshipNameFromPath($path, Individual $person1 =
                             $event = $family->facts(['ANUL', 'DIV', 'ENGA', 'MARR'], true, Auth::PRIV_HIDE, true)->last();
 
                             if ($event instanceof Fact) {
-                                switch ($event->tag()) {
+                                switch ($event->getTag()) {
                                     case 'ANUL':
                                     case 'DIV':
                                         return I18N::translate('ex-husband');
@@ -654,7 +654,7 @@ public static function getRelationshipNameFromPath($path, Individual $person1 =
                             $event = $family->facts(['ANUL', 'DIV', 'ENGA', 'MARR'], true, Auth::PRIV_HIDE, true)->last();
 
                             if ($event instanceof Fact) {
-                                switch ($event->tag()) {
+                                switch ($event->getTag()) {
                                     case 'ANUL':
                                     case 'DIV':
                                         return I18N::translate('ex-wife');
@@ -677,7 +677,7 @@ public static function getRelationshipNameFromPath($path, Individual $person1 =
                             $event = $family->facts(['ANUL', 'DIV', 'ENGA', 'MARR'], true, Auth::PRIV_HIDE, true)->last();
 
                             if ($event instanceof Fact) {
-                                switch ($event->tag()) {
+                                switch ($event->getTag()) {
                                     case 'ANUL':
                                     case 'DIV':
                                         return I18N::translate('ex-spouse');

diff --git a/app/Functions/FunctionsEdit.php b/app/Functions/FunctionsEdit.php
@@ -2,7 +2,7 @@
 
 /**
  * webtrees: online genealogy
- * Copyright (C) 2017 webtrees development team
+ * Copyright (C) 2020 webtrees development team
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -733,7 +733,7 @@ public static function createEditForm(Fact $fact): void
         self::$tags = [];
 
         $level0type = $record::RECORD_TYPE;
-        $level1type = $fact->tag();
+        $level1type = $fact->getTag();
 
         // List of tags we would expect at the next level
         // NB insertMissingSubtags() already takes care of the simple cases

diff --git a/app/Functions/FunctionsPrint.php b/app/Functions/FunctionsPrint.php
@@ -296,7 +296,7 @@ public static function formatFactDate(Fact $event, GedcomRecord $record, $anchor
         }
 
         // Calculated age
-        $fact = $event->tag();
+        $fact = $event->getTag();
         if (preg_match('/\n2 DATE (.+)/', $factrec, $match)) {
             $date = new Date($match[1]);
             $html .= ' ' . $date->display($anchor);
@@ -461,7 +461,7 @@ public static function formatFactPlace(Fact $event, $anchor = false, $sub_record
     public static function checkFactUnique(array $uniquefacts, Collection $recfacts): array
     {
         foreach ($recfacts as $factarray) {
-            $fact = $factarray->tag();
+            $fact = $factarray->getTag();
 
             $key = array_search($fact, $uniquefacts, true);
             if ($key !== false) {

diff --git a/app/Functions/FunctionsPrintFacts.php b/app/Functions/FunctionsPrintFacts.php
@@ -76,7 +76,7 @@ public static function printFact(Fact $fact, GedcomRecord $record): void
     {
         $parent = $fact->record();
         $tree   = $parent->tree();
-        $tag    = $fact->tag();
+        $tag    = $fact->getTag();
         $label  = $fact->label();
         $value  = $fact->value();
         $type   = $fact->attribute('TYPE');

diff --git a/app/GedcomRecord.php b/app/GedcomRecord.php
@@ -824,7 +824,7 @@ public function facts(
         $facts = new Collection();
         if ($this->canShow($access_level)) {
             foreach ($this->facts as $fact) {
-                if (($filter === [] || in_array($fact->tag(), $filter, true)) && $fact->canShow($access_level)) {
+                if (($filter === [] || in_array($fact->getTag(), $filter, true)) && $fact->canShow($access_level)) {
                     $facts->push($fact);
                 }
             }
@@ -961,7 +961,7 @@ public function updateFact(string $fact_id, string $gedcom, bool $update_chan):
                     $new_gedcom .= "\n" . $gedcom;
                 }
                 $fact_id = 'NOT A VALID FACT ID'; // Only replace/delete one copy of a duplicate fact
-            } elseif ($fact->tag() !== 'CHAN' || !$update_chan) {
+            } elseif ($fact->getTag() !== 'CHAN' || !$update_chan) {
                 $new_gedcom .= "\n" . $fact->gedcom();
             }
         }

diff --git a/app/Http/Controllers/Admin/FixLevel0MediaController.php b/app/Http/Controllers/Admin/FixLevel0MediaController.php
@@ -170,7 +170,7 @@ public function fixLevel0MediaData(ServerRequestInterface $request): ResponseInt
                     return
                         !$fact->isPendingDeletion() &&
                         !preg_match('/^@' . Gedcom::REGEX_XREF . '@$/', $fact->value()) &&
-                        !in_array($fact->tag(), $ignore_facts, true);
+                        !in_array($fact->getTag(), $ignore_facts, true);
                 });
 
             // The link to the media object may have been deleted in a pending change.

diff --git a/app/Http/RequestHandlers/EditFact.php b/app/Http/RequestHandlers/EditFact.php
@@ -68,7 +68,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
         $can_edit_raw = Auth::isAdmin() || $tree->getPreference('SHOW_GEDCOM_RECORD');
 
-        $title = $record->fullName() . ' - ' . GedcomTag::getLabel($fact->tag());
+        $title = $record->fullName() . ' - ' . GedcomTag::getLabel($fact->getTag());
 
         return $this->viewResponse('edit/edit-fact', [
             'can_edit_raw' => $can_edit_raw,

diff --git a/app/Http/RequestHandlers/FamilyPage.php b/app/Http/RequestHandlers/FamilyPage.php
@@ -85,7 +85,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
         $facts = $family->facts([], true)
             ->filter(static function (Fact $fact): bool {
-                return !in_array($fact->tag(), ['HUSB', 'WIFE', 'CHIL'], true);
+                return !in_array($fact->getTag(), ['HUSB', 'WIFE', 'CHIL'], true);
             });
 
         return $this->viewResponse('family-page', [

diff --git a/app/Http/RequestHandlers/HeaderPage.php b/app/Http/RequestHandlers/HeaderPage.php
@@ -106,8 +106,8 @@ private function facts(Header $record): Collection
     {
         return $record->facts()
             ->sort(static function (Fact $x, Fact $y): int {
-                $sort_x = array_search($x->tag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
-                $sort_y = array_search($y->tag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
+                $sort_x = array_search($x->getTag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
+                $sort_y = array_search($y->getTag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
 
                 return $sort_x <=> $sort_y;
             });

diff --git a/app/Http/RequestHandlers/MediaPage.php b/app/Http/RequestHandlers/MediaPage.php
@@ -106,7 +106,7 @@ private function facts(Media $record): Collection
     {
         return $record->facts()
             ->filter(static function (Fact $fact): bool {
-                return $fact->tag() !== 'FILE';
+                return $fact->getTag() !== 'FILE';
             });
     }
 }
diff --git a/app/Http/RequestHandlers/MergeFactsPage.php b/app/Http/RequestHandlers/MergeFactsPage.php
@@ -82,13 +82,13 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $facts2 = [];
 
         foreach ($record1->facts() as $fact) {
-            if (!$fact->isPendingDeletion() && $fact->tag() !== 'CHAN') {
+            if (!$fact->isPendingDeletion() && $fact->getTag() !== 'CHAN') {
                 $facts1[$fact->id()] = $fact;
             }
         }
 
         foreach ($record2->facts() as $fact) {
-            if (!$fact->isPendingDeletion() && $fact->tag() !== 'CHAN') {
+            if (!$fact->isPendingDeletion() && $fact->getTag() !== 'CHAN') {
                 $facts2[$fact->id()] = $fact;
             }
         }

diff --git a/app/Http/RequestHandlers/NotePage.php b/app/Http/RequestHandlers/NotePage.php
@@ -104,7 +104,7 @@ private function facts(Note $record): Collection
     {
         return $record->facts()
             ->filter(static function (Fact $fact): bool {
-                return $fact->tag() !== 'CONT';
+                return $fact->getTag() !== 'CONT';
             });
     }
 }
diff --git a/app/Http/RequestHandlers/ReorderChildrenAction.php b/app/Http/RequestHandlers/ReorderChildrenAction.php
@@ -66,7 +66,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
         // Split facts into FAMS and other
         foreach ($family->facts() as $fact) {
-            if ($fact->tag() === 'CHIL') {
+            if ($fact->getTag() === 'CHIL') {
                 $sort_facts[$fact->id()] = $fact->gedcom();
             } else {
                 $keep_facts[] = $fact->gedcom();

diff --git a/app/Http/RequestHandlers/ReorderFamiliesAction.php b/app/Http/RequestHandlers/ReorderFamiliesAction.php
@@ -67,7 +67,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
         // Split facts into FAMS and other
         foreach ($individual->facts() as $fact) {
-            $tag = $fact->tag();
+            $tag = $fact->getTag();
 
             if ($tag === 'FAMC' || $tag === 'FAMS') {
                 $sort_facts[$fact->id()] = $fact->gedcom();

diff --git a/app/Http/RequestHandlers/ReorderMediaAction.php b/app/Http/RequestHandlers/ReorderMediaAction.php
@@ -67,7 +67,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
         // Split facts into OBJE and other
         foreach ($individual->facts() as $fact) {
-            if ($fact->tag() === 'OBJE') {
+            if ($fact->getTag() === 'OBJE') {
                 $sort_facts[$fact->id()] = $fact->gedcom();
             } else {
                 $keep_facts[] = $fact->gedcom();

diff --git a/app/Http/RequestHandlers/ReorderNamesAction.php b/app/Http/RequestHandlers/ReorderNamesAction.php
@@ -66,7 +66,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
         // Split facts into NAME and other
         foreach ($individual->facts() as $fact) {
-            if ($fact->tag() === 'NAME') {
+            if ($fact->getTag() === 'NAME') {
                 $sort_facts[$fact->id()] = $fact->gedcom();
             } else {
                 $keep_facts[] = $fact->gedcom();

diff --git a/app/Http/RequestHandlers/RepositoryPage.php b/app/Http/RequestHandlers/RepositoryPage.php
@@ -114,8 +114,8 @@ private function facts(Repository $record): Collection
     {
         return $record->facts()
             ->sort(static function (Fact $x, Fact $y): int {
-                $sort_x = array_search($x->tag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
-                $sort_y = array_search($y->tag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
+                $sort_x = array_search($x->getTag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
+                $sort_y = array_search($y->getTag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
 
                 return $sort_x <=> $sort_y;
             });

diff --git a/app/Http/RequestHandlers/SourcePage.php b/app/Http/RequestHandlers/SourcePage.php
@@ -122,8 +122,8 @@ private function facts(Source $record): Collection
     {
         return $record->facts()
             ->sort(static function (Fact $x, Fact $y): int {
-                $sort_x = array_search($x->tag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
-                $sort_y = array_search($y->tag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
+                $sort_x = array_search($x->getTag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
+                $sort_y = array_search($y->getTag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
 
                 return $sort_x <=> $sort_y;
             });

diff --git a/app/Http/RequestHandlers/SubmissionPage.php b/app/Http/RequestHandlers/SubmissionPage.php
@@ -104,8 +104,8 @@ private function facts(Submission $record): Collection
     {
         return $record->facts()
             ->sort(static function (Fact $x, Fact $y): int {
-                $sort_x = array_search($x->tag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
-                $sort_y = array_search($y->tag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
+                $sort_x = array_search($x->getTag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
+                $sort_y = array_search($y->getTag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
 
                 return $sort_x <=> $sort_y;
             });

diff --git a/app/Http/RequestHandlers/SubmitterPage.php b/app/Http/RequestHandlers/SubmitterPage.php
@@ -102,8 +102,8 @@ private function facts(Submitter $record): Collection
     {
         return $record->facts()
             ->sort(static function (Fact $x, Fact $y): int {
-                $sort_x = array_search($x->tag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
-                $sort_y = array_search($y->tag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
+                $sort_x = array_search($x->getTag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
+                $sort_y = array_search($y->getTag(), self::FACT_ORDER, true) ?: PHP_INT_MAX;
 
                 return $sort_x <=> $sort_y;
             });

diff --git a/app/Module/FixPrimaryTag.php b/app/Module/FixPrimaryTag.php
@@ -2,7 +2,7 @@
 
 /**
  * webtrees: online genealogy
- * Copyright (C) 2019 webtrees development team
+ * Copyright (C) 2020 webtrees development team
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -155,7 +155,7 @@ private function updateMediaLinks(Individual $individual, string $xref, bool $pr
         $facts4 = new Collection();
 
         foreach ($facts as $fact) {
-            if ($fact->tag() !== 'OBJE') {
+            if ($fact->getTag() !== 'OBJE') {
                 $facts1->push($fact);
             } elseif ($fact->value() !== '@' . $xref . '@') {
                 $facts3->push($fact);