Merge pull request #29 from familytree365/fix/gedcom_import_export

Fix error export and fill name, birthday, deathday, burial day, gid, …

Author: curtisdelicata

src/Record/Indi.php

@@ -27,6 +27,11 @@ class Indi extends \Gedcom\Record implements Noteable, Objectable, Sourceable
      */
     protected $id;
 
+    /**
+     * @var string
+     */
+    protected $gid;
+
     /**
      * @var string
      */
@@ -201,6 +206,26 @@ public function getId()
         return $this->id;
     }
 
+    /**
+     * @param string $id
+     *
+     * @return Indi
+     */
+    public function setGid($gid = '')
+    {
+        $this->gid = $gid;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getGid()
+    {
+        return $this->gid;
+    }
+
     /**
      * @param string $uid
      *

src/Writer/Indi.php

@@ -27,21 +27,18 @@ public static function convert(\Gedcom\Record\Indi &$indi)
 
         // id
         $id = $indi->getId();
-        $output = $level.' @'.$id."@ INDI\n";
+
+        // gid
+        $gid = $indi->getGid();
+        $output = $level.' @'.$gid."@ INDI\n";
 
         // increase level after start indi
         $level++;
 
-        // name
-        // $name = $indi->getName();
-        // if(!empty($name)){
-        //     $output.=$level." NAME ".$name."\n";
-        // }
-
-        // chan
-        $chan = $indi->getChan();
-        if (!empty($chan)) {
-            $output .= $level.' CHAN '.$chan."\n";
+        // uid
+        $uid = $indi->getUid();
+        if (!empty($uid)) {
+            $output .= $level.' _UID '.$uid."\n";
         }
 
         // $attr
@@ -118,6 +115,27 @@ public static function convert(\Gedcom\Record\Indi &$indi)
             $output .= $level.' SEX '.$sex."\n";
         }
 
+        // $birthday
+        $birthday = $indi->getBirthday();
+        if (!empty($birthday)) {
+            $output .= $level.' BIRT '."\n";
+            $output .= ($level+1).' DATE '.$birthday."\n";
+        }
+
+        // $deathday
+        $deathday = $indi->getDeathday();
+        if (!empty($deathday)) {
+            $output .= $level.' DEAT '."\n";
+            $output .= ($level+1).' DATE '.$deathday."\n";
+        }
+
+        // $burialday
+        $burialday = $indi->getBurialday();
+        if (!empty($burialday)) {
+            $output .= $level.' BURI '."\n";
+            $output .= ($level+1).' DATE '.$burialday."\n";
+        }
+
         // $rin
         $rin = $indi->getRin();
         if (!empty($rin)) {
@@ -207,6 +225,14 @@ public static function convert(\Gedcom\Record\Indi &$indi)
             }
         }
 
+        // chan
+        $chan = $indi->getChan();
+        if (!empty($chan)) {
+            $output .= $level.' CHAN '."\n";
+            $output .= ($level+1).' DATE '.$chan[0]."\n";
+            $output .= ($level+1).' TIME '.$chan[1]."\n";
+        }
+
         // Bapl
         // Currently Bapl is empty
         // $bapl = $indi->getBapl();