also read OBJE and SOUR

Signed-off-by: Matthias Rabe <[email protected]>

Author: Matthias Rabe

lib/ged_parse.inc.rb

@@ -209,6 +209,20 @@ def get_cached_detail(sym, tag);		raise "NOT AVAILABLE FOR NOTES";	end
 		def fields;					raise "NOT AVAILABLE FOR NOTES";	end
 	end
 
+	class Object < GedSection
+		attr_reader :name
+
+		def initialize(gid)
+			super
+			@name= gid
+			@type= :object
+		end
+
+		def fname;	return get_cached_detail(:file, "FILE");	end
+		def type;	return get_cached_detail(:type, "FILE_FORM");	end
+		def note;	return  get_cached_detail(:title, "FILE_TITL");	end
+	end
+
 	class Place < GedSection
 		attr_reader :name
 
@@ -221,8 +235,18 @@ def initialize(gid)
 		def objs;		return get_details("OBJE");	end
 	end
 
+	class Source < GedSection
+		attr_reader :name
+
+		def initialize(gid)
+			super
+			@name= gid
+			@type= :source
+		end
+	end
+
 	class Gedcom
-		attr_reader :individuals, :families, :tags, :sections, :places, :sources
+		attr_reader :individuals, :families, :notes, :objects, :sections, :places, :sources, :tags
 
 		def initialize(file_name)
 			@file_name= file_name
@@ -233,9 +257,10 @@ def refresh
 			@individuals= []
 			@families= []
 			@notes= []
+			@objects= []
 			@sections= []
 			@places= []
-			@sources= [] #TODO
+			@sources= []
 			@tags= []
 
 			f= File.new(@file_name, 'r')
@@ -251,31 +276,31 @@ def refresh
 			section_type= ""
 			section= nil
 
-			place_section= nil
-			place_level= nil
-			place_level_higher= false
+			object_section, object_level			= nil, nil, false
+			place_section,  place_level,  place_level_higher= nil, nil, false
 
 			f.each do |gedline|
-
 				level, tag, rest= gedline.chop.split(' ', 3)
 
 				if level.to_i == 0
-					place_section= nil
-					place_level= nil
-					place_level_higher= false
+					object_section = nil
+					place_section  = nil
 
 					# push the last section
 					case section_type
 					when ""		then 1
 					when "INDI"	then @individuals.push section if section
 					when "FAM"	then @families.push section if section
 					when "NOTE"	then @notes.push section if section
+					when "OBJE"	then @objects.push section if section
+					when "SOUR"	then @sources.push section if section
 					else
 						@sections.push section if section
 					end
 
 					#start a new section
-					case rest.to_s.chomp
+					type= rest.to_s.chomp
+					case type
 					when "INDI"
 						#create an individual
 						section= Individual.new(tag)
@@ -284,47 +309,76 @@ def refresh
 						#create a family
 						section= Family.new(tag)
 						section_type= 'FAM'
+					when "OBJE"
+						#create an object
+						section= Object.new(tag)
+						section_type= 'OBJE'
+					when "SOUR"
+						#create a source
+						section= Source.new(tag)
+						section_type= 'SOUR'
 					else
 						#create a general section
 						if not rest.nil? and rest[0..3] == "NOTE"
 							section= Note.new(tag)
 							section.add_detail 1, "TEXT", rest[5..-1]
 							section_type= "NOTE"
 						else
+							$stderr.puts "unknown "+
+								"type:'#{type}' tag:#{tag}" \
+								if not ["", "SUBM", "REPO"].include? type
 							section= GedSection.new(tag)
 							section_type= ""
 						end
 					end
 				else
-					#add a detail to the section
-					if section_type == 'FAM' && ['HUSB', 'WIFE', 'CHIL'].include?(tag)
-						section.add_relation(tag, find_by_individual_gid(rest)) if section
-					else
-						section.add_detail level, tag, rest if section
+					if tag == "OBJE" and find_by_object_gid(rest).nil?
+						object_section= Object.new(rest)
+						object_level= level
+					elsif not object_section.nil?
+						if level <= object_level
+							@objects.push object_section \
+								if object_section.fields.length > 0
+							object_section= nil
+						else
+							object_section.add_detail(
+								level.to_i-object_level.to_i+1,
+								tag, rest)
+						end
+						next if not object_level.nil?
 					end
 
 					if tag == "PLAC" and find_by_place(rest).nil?
 						place_section= Place.new(rest)
 						@places.push place_section
 						place_level= level
 						place_level_higher= false
-					end
-
-					if place_section
+					elsif not place_section.nil?
 						if level < place_level
 							place_section= nil
-							place_level= nil
-							place_level_higher= false
 						elsif level == place_level
 							place_level_higher= false
 							if "OBJE".include? tag
 								place_level_higher= true
-								place_section.add_detail((level.to_i-place_level.to_i+1), tag, rest)
+								place_section.add_detail(
+									level.to_i-place_level.to_i+1,
+									tag, rest)
 							end
 						elsif place_level_higher
-							place_section.add_detail((level.to_i-place_level.to_i+1), tag, rest)
+							place_section.add_detail(
+									level.to_i-place_level.to_i+1,
+									tag, rest)
 						end
+						next if not place_level.nil?
+					end
+
+					#add a detail to the section
+					if section_type == 'FAM' && ['HUSB', 'WIFE', 'CHIL'].include?(tag)
+						section.add_relation(tag, find_by_individual_gid(rest)) if section
+					else
+						section.add_detail level, tag, rest if section
 					end
+
 				end
 			end
 
@@ -333,13 +387,16 @@ def refresh
 			when "INDI"	then @individuals.push section if section
 			when "FAM"	then @families.push section if section
 			when "NOTE"	then @notes.push section if section
+			when "OBJE"	then @objects.push section if section
+			when "SOUR"	then @sources.push section if section
 			else
 				@sections.push section if section
 			end
 
 			@individuals.compact!
 			@families.compact!
 			@notes.compact!
+			@objects.compact!
 			@sections.compact!
 			@places.compact!
 			@sources.compact!
@@ -370,6 +427,13 @@ def find_by_node_gid(gid)
 			return nil
 		end
 
+		def find_by_object_gid(gid)
+			@objects.each do |n|
+				return n if n.gid == gid
+			end
+			return nil
+		end
+
 		def find_by_place(name)
 			@places.each do |p|
 				return p if p.name == name