gedcom 0.9.2 → 0.9.3

data/History.txt

@@ -7,5 +7,7 @@
   Required adding IndividualRecord.child? and IndividualRecord.spouse? for tests.
   Fixed bug in IndividualRecord.spouses and IndividualRecord.parents_family as neither worked and were used by tests.
 * Removed 'require chart.rb' which was left in production code by mistake
+* Added in the GEDCOM 5.5.1 Draft changes. Most changes are alternatives to the 5.5 standard, but the Multimedia record
+  File and Format structure is different, so these are now classes, rather than attributes.
 
 

data/Manifest.txt

@@ -47,6 +47,14 @@ lib/gedcom/trailer_record.rb
 lib/gedcom/transmission.rb
 lib/gedcom/transmission_base.rb
 lib/gedcom/xref.rb
+lib/gedcom/multimedia_file_record.rb
+lib/gedcom/multimedia_format_record.rb
+lib/gedcom/placename_map_record.rb
+lib/gedcom/placename_phonetic_record.rb
+lib/gedcom/placename_romanized_record.rb
+lib/gedcom/name_phonetic_record.rb
+lib/gedcom/name_romanized_record.rb
+lib/gedcom/copyright_record.rb
 lib/gedcom.rb
 lib/parser/class_tracker.rb
 lib/parser/ged_line.rb

data/lib/gedcom.rb

@@ -64,7 +64,7 @@ require 'gedcom_parser.rb'
 #require 'chart.rb'
 
 class Gedcom
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
   attr_accessor :transmissions
   
   def initialize(transmission = nil)

data/lib/gedcom/address_record.rb

@@ -52,6 +52,26 @@ require 'gedcom_base.rb'
 #* Those ending in _ref are GEDCOM XREF index keys
 #* Those ending in _record are array of classes of that type.
 #* The remainder are arrays of attributes that could be present in this record.
+#
+# GEDCOM 5.5.1 Draft adds (at same level as ADDR)
+#  I have not included these in the Address_record, but include them in the parent
+#  records that include ADDRESS_STRUCTURE. This is functionally equivalent, as they are not
+#  sub-records of ADDR, but at the same level.
+#
+#  n EMAIL <ADDRESS_EMAIL>               {0:3}
+#  n FAX <ADDRESS_FAX>                   {0:3}
+#  n WWW <ADDRESS_WEB_PAGE>              {0:3}
+#
+#==ADDRESS_EMAIL:= {SIZE=5:120}
+#  An electronic address that can be used for contact such as an email address.
+#
+#== ADDRESS_FAX:= {SIZE=5:60}
+#  A FAX telephone number appropriate for sending data facsimiles.
+#
+#==ADDRESS_WEB_PAGE:= {SIZE=5:120}
+#  The world wide web page address.
+#
+
 class Address_record < GEDCOMBase
   attr_accessor :address,  :address_line1, :address_line2, :city, :state, :post_code, :country, :address_type
   attr_accessor :note_citation_record

data/lib/gedcom/copyright_record.rb

@@ -0,0 +1,45 @@
+require 'gedcom_base.rb'
+
+#Copyright_record was introduced in 0.9.3 to allow CONT and CONC tags after the COPR record.
+#Gedcom 5.5
+#=HEADER:=
+#  n HEAD                                          {1:1}
+#    +1 SOUR <APPROVED_SYSTEM_ID>                  {1:1}
+#      +2 VERS <VERSION_NUMBER>                    {0:1}
+#      +2 NAME <NAME_OF_PRODUCT>                   {0:1}
+#      +2 CORP <NAME_OF_BUSINESS>                  {0:1}
+#        +3 <<ADDRESS_STRUCTURE>>                  {0:1}
+#      +2 DATA <NAME_OF_SOURCE_DATA>               {0:1}
+#        +3 DATE <PUBLICATION_DATE>                {0:1}
+#        +3 COPR <COPYRIGHT_SOURCE_DATA>           {0:1}
+#       ...
+#GEDCOM 5.5.1
+#=HEADER:=
+#  n HEAD                                          {1:1}
+#    +1 SOUR <APPROVED_SYSTEM_ID>                  {1:1}
+#      +2 VERS <VERSION_NUMBER>                    {0:1}
+#      +2 NAME <NAME_OF_PRODUCT>                   {0:1}
+#      +2 CORP <NAME_OF_BUSINESS>                  {0:1}
+#        +3 <<ADDRESS_STRUCTURE>>                  {0:1}
+#      +2 DATA <NAME_OF_SOURCE_DATA>               {0:1}
+#        +3 DATE <PUBLICATION_DATE>                {0:1}
+#        +3 COPR <COPYRIGHT_SOURCE_DATA>           {0:1}
+#           +4 [CONT|CONC]<COPYRIGHT_SOURCE_DATA>  {0:M}
+#       ...
+
+class Copyright_record   < GEDCOMBase
+  attr_accessor :copyright
+  attr_accessor :note_citation_record
+
+  ClassTracker <<  :Copyright_record
+
+  #new sets up the state engine arrays @this_level and @sub_level, which drive the to_gedcom method generating GEDCOM output.
+  def initialize(*a)
+    super(*a)
+    @this_level = [ [:cont, "COPR", :copyright] ]
+    @sub_level =  [ #level + 1
+                    [:walk, nil, :note_citation_record], #to allow for user defined subtags
+                  ]
+  end
+  
+end

data/lib/gedcom/corporate_record.rb

@@ -17,8 +17,28 @@ require 'gedcom_base.rb'
 #* Those ending in _ref are GEDCOM XREF index keys
 #* Those ending in _record are array of classes of that type.
 #* The remainder are arrays of attributes that could be present in this record.
+#
+# GEDCOM 5.5.1 Draft adds (at same level as ADDR)
+#  I have not included these in the Address_record, but include them in the parent
+#  records that include ADDRESS_STRUCTURE. This is functionally equivalent, as they are not
+#  sub-records of ADDR, but at the same level.
+#
+#  n EMAIL <ADDRESS_EMAIL>               {0:3}
+#  n FAX <ADDRESS_FAX>                   {0:3}
+#  n WWW <ADDRESS_WEB_PAGE>              {0:3}
+#
+#==ADDRESS_EMAIL:= {SIZE=5:120}
+#  An electronic address that can be used for contact such as an email address.
+#
+#== ADDRESS_FAX:= {SIZE=5:60}
+#  A FAX telephone number appropriate for sending data facsimiles.
+#
+#==ADDRESS_WEB_PAGE:= {SIZE=5:120}
+#  The world wide web page address.
+#
 class Corporate_record < GEDCOMBase
   attr_accessor :company_name, :phonenumber, :address_record
+  attr_accessor :address_email, :address_fax, :address_web_page #GEDCOM 5.5.1 Draft
   attr_accessor :note_citation_record
 
   ClassTracker <<  :Corporate_record
@@ -29,6 +49,9 @@ class Corporate_record < GEDCOMBase
     @this_level = [ [:print, "CORP", :company_name] ]
     @sub_level =  [  #level + 1
                     [:print, "PHON", :phonenumber],
+                    [:print, "EMAIL", :address_email],
+                    [:print, "WWW", :address_web_page],
+                    [:print, "FAX", :address_fax],
                     [:walk,  nil,    :address_record],
                     [:walk, nil,    :note_citation_record],
                   ]

data/lib/gedcom/date_record.rb

@@ -147,7 +147,7 @@ require 'gedcom_base.rb'
 #
 #  The following are equivalent and interchangeable:
 #  Short form       Long Form
-#  ---------—       ---------—-
+#  ----------       -----------
 #  1852             BET 1 JAN 1852 AND 31 DEC 1852
 #  1852             BET 1 JAN 1852 AND DEC 1852
 #  1852             BET JAN 1852 AND 31 DEC 1852
@@ -208,17 +208,13 @@ class Date_record < GEDCOMBase
   #GEDCOM says that this should be the most vaild record. If you need all the dates, use date_value,
   #which will give you an array of DATE values.
   def date
-    if @date_value
-      @date_value.first
-    else
-      ''
-    end
+    @date_value ? @date_value.first : ''
   end
 
   #If you want just one date, then this returns the first TIME record (probably the only one).
   #GEDCOM says that this should be the most vaild record. If you need all the dates, use date_value,
   #which will give you an array of TIME values.
   def time
-    @time_value.first
+    @time_value != nil ? @time_value.first : ''
   end
 end

data/lib/gedcom/event_record.rb

@@ -134,7 +134,7 @@ require 'gedcom_base.rb'
 #  change its basic process. The form of using the TYPE tag with defined event tags has not been used
 #  by very many products. The MARR tag could be subordinated with a TYPE tag and
 #  EVENT_DESCRIPTOR value of Common Law. Other possible descriptor values might include
-#  "Childbirth—unmarried," "Common Law," or "Tribal Custom," for example. The event descriptor
+#  "Childbirth-unmarried," "Common Law," or "Tribal Custom," for example. The event descriptor
 #  should use the same word or phrase and in the same language, when possible, as was used by the
 #  recorder of the event. Systems that display data from the GEDCOM form should be able to display the
 #  descriptor value in their screen or printed output.
@@ -153,6 +153,25 @@ require 'gedcom_base.rb'
 #* Those ending in _ref are GEDCOM XREF index keys
 #* Those ending in _record are array of classes of that type.
 #* The remainder are arrays of attributes that could be present in this record.
+#
+# GEDCOM 5.5.1 Draft adds (at same level as ADDR)
+#  I have not included these in the Address_record, but include them in the parent
+#  records that include ADDRESS_STRUCTURE. This is functionally equivalent, as they are not
+#  sub-records of ADDR, but at the same level.
+#
+#  n EMAIL <ADDRESS_EMAIL>               {0:3}
+#  n FAX <ADDRESS_FAX>                   {0:3}
+#  n WWW <ADDRESS_WEB_PAGE>              {0:3}
+#
+#==ADDRESS_EMAIL:= {SIZE=5:120}
+#  An electronic address that can be used for contact such as an email address.
+#
+#== ADDRESS_FAX:= {SIZE=5:60}
+#  A FAX telephone number appropriate for sending data facsimiles.
+#
+#==ADDRESS_WEB_PAGE:= {SIZE=5:120}
+#  The world wide web page address.
+#
 class Event_record < GEDCOMBase
   attr_accessor :restriction #not standard at the event level, but we might want this in DB.
   attr_accessor :event_type, :event_descriptor
@@ -160,6 +179,7 @@ class Event_record < GEDCOMBase
   attr_accessor :agency, :cause_record, :source_citation_record, :submitter_ref
   attr_accessor :multimedia_citation_record, :note_citation_record, :event_age_record, :adoption_record
   attr_accessor :lds_temp_code, :lds_date_status, :lds_slgc_family_ref
+  attr_accessor :address_email, :address_fax, :address_web_page, :religion #GEDCOM 5.5.1 Draft
 
   ClassTracker <<  :Event_record
   
@@ -175,6 +195,9 @@ class Event_record < GEDCOMBase
                     [:walk, nil, :place_record],
                     [:walk, nil, :address_record],
                     [:print, "PHON", :phonenumber],
+                    [:print, "EMAIL", :address_email],
+                    [:print, "WWW", :address_web_page],
+                    [:print, "FAX", :address_fax],
                     [:print, "AGE", :age],
                     [:walk, nil,  :event_age_record],
                     [:print, "AGNC", :agency],
@@ -184,6 +207,7 @@ class Event_record < GEDCOMBase
                     [:xref, "SUBM", :submitter_ref],
                     [:walk, nil, :adoption_record],
                     [:xref, "FAMC",  :lds_slgc_family_ref],
+                    [:print, "RELI", :religion], #GEDCOM 5.5.1
                   ]
   end
       

data/lib/gedcom/families_individuals.rb

@@ -44,6 +44,7 @@ class Families_individuals < GEDCOMBase
   attr_accessor :relationship_type, :parents_family_ref, :family_ref, :pedigree
   attr_accessor :note_citation_record
   attr_accessor :source_citation_record #Only for FAMS (where did I get this idea from ?)
+  attr_accessor :child_linkage_status #GEDCOM 5.5.1
 
   ClassTracker <<  :Families_individuals
   
@@ -53,6 +54,7 @@ class Families_individuals < GEDCOMBase
                   ]
     @sub_level =  [ #level 1
                     [:print, "PEDI",    :pedigree ], #Only for FAMC
+                    [:print, "STAT",    :pedigree ], #Only for FAMC
                     [:walk, nil,    :source_citation_record ], #Only for FAMS (where did I get this idea from ?)
                     [:walk, nil,    :note_citation_record ]
                   ]

data/lib/gedcom/gedcom_all.rb

@@ -1,5 +1,7 @@
+#Included by transmission.
 require 'address_record.rb'
 require 'adoption_record.rb'
+require 'association_record.rb'
 require 'cause_record.rb'
 require 'change_date_record.rb'
 require 'character_set_record.rb'
@@ -8,19 +10,19 @@ require 'citation_event_type_record.rb'
 require 'corporate_record.rb'
 require 'date_record.rb'
 require 'encoded_line_record.rb'
+require 'events_list_record.rb'
 require 'event_age_record.rb'
 require 'event_record.rb'
-require 'events_list_record.rb'
 require 'families_individuals.rb'
 require 'family_record.rb'
 require 'gedcom_base.rb'
 require 'gedcom_record.rb'
+require 'ged_string.rb'
 require 'header_data_record.rb'
 require 'header_record.rb'
 require 'header_source_record.rb'
 require 'individual_attribute_record.rb'
 require 'individual_record.rb'
-require 'association_record.rb'
 require 'multimedia_citation_record.rb'
 require 'multimedia_record.rb'
 require 'name_record.rb'
@@ -40,4 +42,12 @@ require 'text_record.rb'
 require 'trailer_record.rb'
 require 'transmission_base.rb'
 require 'xref.rb'
-require 'ged_string.rb'
+#After 5.5.1
+require 'multimedia_file_record.rb'
+require 'multimedia_format_record.rb'
+require 'placename_map_record.rb'
+require 'placename_phonetic_record.rb'
+require 'placename_romanized_record.rb'
+require 'name_phonetic_record.rb'
+require 'name_romanized_record.rb'
+require 'copyright_record.rb'

data/lib/gedcom/gedcom_base.rb

@@ -275,6 +275,10 @@ class GEDCOMBase
   #validate that the record referenced by the XREF actually exists in this transmission.
   #Genearte a warning if it does not. It does not stop the processing of this line.
   def xref_check( level, tag, xref )
+    if xref.class != Xref
+      print "#{level+1} XREF_CHECK ****************#{level}, #{tag}. #{xref.class} != Xref?\n"
+      return
+    end
     if @transmission != nil && @transmission.find(xref.index, xref.xref_value) == nil
       #Warning message that reference points to an unknown target.
       print "#{level+1} NOTE ****************#{level}, #{tag} Key not found: #{xref.index} #{xref.xref_value}\n"

data/lib/gedcom/header_data_record.rb

@@ -31,7 +31,7 @@ require 'gedcom_base.rb'
 #* Those ending in _record are array of classes of that type.
 #* The remainder are arrays of attributes that could be present in this record.
 class Header_data_record < GEDCOMBase
-  attr_accessor :data_source, :date, :copyright
+  attr_accessor :data_source, :date, :copyright_record
   attr_accessor :note_citation_record
 
   ClassTracker <<  :Header_data_record
@@ -42,8 +42,14 @@ class Header_data_record < GEDCOMBase
     @this_level = [ [:print, "DATA", :data_source] ]
     @sub_level =  [ #level + 1
                     [:print, "DATE", :date],
-                    [:print, "COPR", :copyright],
+                    #[:print, "COPR", :copyright], #GEDCOM5.5
+                    [:walk, nil, :copyright_record], #GEDCOM5.5.1 "COPR"
                     [:walk, nil,    :note_citation_record],
                   ]
   end  
+  
+  def copyright
+    copyright_record != nil ? copyright_record.first.copyright : nil
+  end
+      
 end

data/lib/gedcom/header_record.rb

@@ -71,5 +71,6 @@ class Header_record < GEDCOMBase
                     [:walk, nil, :place_record], 
                     [:walk, nil, :note_citation_record],
                   ]
-  end  
+  end 
+  
 end

data/lib/gedcom/individual_attribute_record.rb

@@ -103,6 +103,7 @@ class Individual_attribute_record < Event_record
     when "RESI" then tag
     when "SSN"  then tag
     when "TITL" then tag
+    when "FACT" then tag #GEDCOM 5.5.1
     else super(tag)
     end
   end

data/lib/gedcom/multimedia_citation_record.rb

@@ -6,6 +6,11 @@ require 'gedcom_base.rb'
 #
 #=MULTIMEDIA_LINK:=
 #  n OBJE @<XREF:OBJE>@           {1:1}
+#| n OBJE
+#	+1 FILE <MULTIMEDIA_FILE_REFN> 
+#		+2 FORM <MULTIMEDIA_FORMAT>
+#			+3 MEDI	<SOURCE_MEDIA_TYPE> 
+#	+1 TITL <DESCRIPTIVE_TITLE>
 #
 #  This structure provides two options in handling the GEDCOM multimedia interface. The first
 #  alternative (embedded) includes all of the data, including the multimedia object, within the
@@ -41,12 +46,12 @@ class Multimedia_citation_record < GEDCOMBase
   def to_gedcom(level=0)
     if @multimedia_ref != nil
       @this_level = [ [:xref, "OBJE", :multimedia_ref] ]
-      @sub_level =  [#level 1
+      @sub_level =  [#level +1
                       [:walk, nil,    :note_citation_record ],
                     ]
     else
       @this_level = [ [:walk, nil, :multimedia_record] ]
-      @sub_level =  [#level 1
+      @sub_level =  [#level +1
                     ]
     end
     super(level)

data/lib/gedcom/multimedia_file_record.rb

@@ -0,0 +1,80 @@
+require 'gedcom_base.rb'
+
+#
+#=GEDCOM 5.5.1
+#=MULTIMEDIA_LINK:=
+#  n OBJE  <XREF>                         {1:1} is a reference to level 0 multimedia record.
+#  | 
+#  n OBJE                                 {1:1} is inline reference to an external file, rather than multimedia record.
+#    +1 FILE <MULTIMEDIA_FILE_REFN>       {1:M}	Now 1:M in 5.5.1, was 1:1 in 5.5
+#    	+2 FORM	 <MULTIMEDIA_FORMAT>        {1:1} Was as level 1 in GEDCOM 5.5
+#    		+3 MEDI <SOURCE_MEDIA_TYPE>       {0:1} New in 5.5.1
+#    +1 TITL <DESCRIPTIVE_TITLE>          {0:1} 
+#
+# No blobs in 5.5.1
+#
+#The attributes are all arrays for the level +1 tags/records. 
+#* Those ending in _ref are GEDCOM XREF index keys
+#* Those ending in _record are array of classes of that type.
+#* The remainder are arrays of attributes that could be present in this record.
+
+class Multimedia_file_record < GEDCOMBase
+  attr_accessor :multimedia_format_record, :filename
+  #attr_accessor :title #Level above in the link version
+  attr_accessor :note_citation_record #for user defined tags
+  
+  ClassTracker <<  :Multimedia_file_record
+  
+  def to_gedcom(level=0)
+    
+    @this_level =  [ [:print, "FILE", :filename]]
+    @sub_level =  [#level 1
+                    #[:print, "TITL",    :title ],                 #For OBJE record version
+                    [:walk, nil,    :multimedia_format_record ],  # "FORM" 
+                    [:walk, nil,    :note_citation_record ],      #for user defined tags
+                  ]
+    
+    super(level)
+  end
+  
+  
+end
+
+#=GEDCOM 5.5.1
+#Almost the same structure inline in OBJE record. 
+#   Note TITL subordinate to FILE, rather than at same level.
+#        TYPE used, where MEDI used in Link version.
+#=MULTIMEDIA_RECORD:=
+#  0 @XREF:OBJE@ OBJE                     {0:M}
+#    +1 FILE <MULTIMEDIA_FILE_REFN>       {1:M}	New in 5.5.1
+#    	+2 FORM	 <MULTIMEDIA_FORMAT>        {1:1} Was as level 1 in GEDCOM 5.5
+#    		+3 TYPE <SOURCE_MEDIA_TYPE>       {0:1} New in 5.5.1
+#    	+2 TITL <DESCRIPTIVE_TITLE>         {0:1} Was as level 1 in GEDCOM 5.5
+#    ....
+#
+#The attributes are all arrays for the level +1 tags/records. 
+#* Those ending in _ref are GEDCOM XREF index keys
+#* Those ending in _record are array of classes of that type.
+#* The remainder are arrays of attributes that could be present in this record.
+
+class Multimedia_obje_file_record < GEDCOMBase
+  attr_accessor :multimedia_obje_format_record, :filename
+  attr_accessor :title #Level above in the link version
+  attr_accessor :note_citation_record #for user defined tags
+  
+  ClassTracker <<  :Multimedia_obje_file_record
+  
+  def to_gedcom(level=0)
+    
+    @this_level =  [ [:print, "FILE", :filename]]
+    @sub_level =  [#level 1
+                    [:print, "TITL",    :title ],                 #For OBJE record version
+                    [:walk, nil,    :multimedia_obje_format_record ],  # "FORM" 
+                    [:walk, nil,    :note_citation_record ],      #for user defined tags
+                  ]
+    
+    super(level)
+  end
+  
+  
+end