handle new OBJE and SOUR structures

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

Author: Matthias Rabe

lib/ged_parse.inc.rb

@@ -145,14 +145,25 @@ def add_detail(level, tag, val)
 			super
 		end
 
+		def get_sources(ged, tag)
+			sources= []
+			get_details(tag).each {|src_id|
+				sources << ged.find_by_source_gid(src_id[:value])
+			}
+			return sources
+		end
+
 		def idno;		return get_cached_detail(:idno,		"IDNO");	end
 		def sex;		return get_cached_detail(:sex,		"SEX");		end
 		def birth;		return get_cached_detail(:birth,	"BIRT_DATE");	end
 		def birth_place;	return get_cached_detail(:birth_place,	"BIRT_PLAC");	end
+		def birth_sources(ged);	return get_sources(ged, "BIRT_SOUR");			end
 		def leaf;		return get_cached_detail(:leaf,		"CHR_DATE");	end
 		def leaf_place;		return get_cached_detail(:leaf_place,	"CHR_PLAC");	end
+		def leaf_sources(ged);	return get_sources(ged, "CHR_SOUR");			end
 		def died;		return get_cached_detail(:died,		"DEAT_DATE");	end
 		def died_place;		return get_cached_detail(:died_place,	"DEAT_PLAC");	end
+		def died_sources(ged);	return get_sources(ged, "DEAT_SOUR");			end
 		def objs;		return get_details("OBJE");	end
 
 		def male?;	return sex == "M";	end
@@ -220,7 +231,7 @@ def initialize(gid)
 
 		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
+		def note;	return get_cached_detail(:title, "FILE_TITL");	end
 	end
 
 	class Place < GedSection
@@ -243,6 +254,16 @@ def initialize(gid)
 			@name= gid
 			@type= :source
 		end
+
+		def title;	return get_cached_detail(:title, "TITL");	end
+		def author;	return get_cached_detail(:author, "AUTH");	end
+
+		def footnote
+			details = []
+			details << title if title.to_s != ""
+			details << author if author.to_s != ""
+			return details.join("; ")
+		end
 	end
 
 	class Gedcom
@@ -345,7 +366,7 @@ def refresh
 								level.to_i-object_level.to_i+1,
 								tag, rest)
 						end
-						next if not object_level.nil?
+						next if not object_section.nil?
 					end
 
 					if tag == "PLAC" and find_by_place(rest).nil?
@@ -369,7 +390,7 @@ def refresh
 									level.to_i-place_level.to_i+1,
 									tag, rest)
 						end
-						next if not place_level.nil?
+						next if not place_section.nil?
 					end
 
 					#add a detail to the section
@@ -428,8 +449,8 @@ def find_by_node_gid(gid)
 		end
 
 		def find_by_object_gid(gid)
-			@objects.each do |n|
-				return n if n.gid == gid
+			@objects.each do |o|
+				return o if o.gid == gid
 			end
 			return nil
 		end
@@ -441,6 +462,13 @@ def find_by_place(name)
 			return nil
 		end
 
+		def find_by_source_gid(gid)
+			@sources.each do |s|
+				return s if s.gid == gid
+			end
+			return nil
+		end
+
 		def getFamilyWithChild(indi)
 			@families.each {|f|
 				f.children.each {|fc|

reports/book.inc.rb

@@ -318,6 +318,7 @@ def report_person_print_notes(ged, indi)
 				text= note.text
 				text= text.gsub("**********", "********** ") # hack to avaid LaTeX warning
 			end
+
 			items << "\\item[#{key}] #{replace_newline(h(text))}"
 		}
 	}
@@ -338,15 +339,30 @@ def report_print_galerie(ged, section)
 	items= {};
 	section.objs.each {|o|
 		img= nil; titl= nil; note= nil; ok= false
-		o[:children].each {|oc|
-			case oc[:field]
-			when "OBJE_FORM"	then ok= IMG_FMTS.include? oc[:value].downcase
-			when "OBJE_FILE"	then img= oc[:value]
-			when "OBJE_TITL"	then titl= oc[:value]
-			when "OBJE_NOTE"	then note= oc[:value]
+
+		obj = ged.find_by_object_gid(o[:value])
+		if not obj.nil?
+			ok = IMG_FMTS.include? obj.type.downcase
+			img = obj.fname
+			note = obj.note
+		else # fallback for older gedcoms
+			o[:children].each {|oc|
+				case oc[:field]
+				when "OBJE_FORM"	then ok= IMG_FMTS.include? oc[:value].downcase
+				when "OBJE_FILE"	then img= oc[:value]
+				when "OBJE_TITL"	then titl= oc[:value]
+				when "OBJE_NOTE"	then note= oc[:value]
+				end
+			}
+		end
+
+		if ok
+			if File.exist?img
+				items[img]= nvl(note, titl)
+			else
+				$stderr.puts "'#{img}' not found - skipped"
 			end
-		}
-		items[img]= nvl(note, titl) if ok
+		end
 	}
 	items= items.to_a