fixup for gedcom 5.5 obje

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

Author: Matthias Rabe

lib/ged_parse.inc.rb

@@ -364,7 +364,9 @@ def refresh
 						end
 					end
 				else
-					if tag == "OBJE" and find_by_object_gid(rest).nil?
+					if tag == "OBJE" and rest.to_s == ""
+						# nothing to do, rest is only empty on gedcom 5.5
+					elsif tag == "OBJE" and find_by_object_gid(rest).nil?
 						object_section= Object.new(rest)
 						object_level= level
 					elsif not object_section.nil?

reports/book.inc.rb

@@ -135,13 +135,24 @@ def report_person_print_profile(ged, indi, own_fams)
 	mugshot= DEFAULT_MUGSHOT
 	indi.objs.each {|o|
 		img= 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]
-			end
-		}
-		(mugshot= img; break) if ok
+
+		obj = ged.find_by_object_gid(o[:value])
+		if not obj.nil?
+			ok = IMG_FMTS.include? obj.type.downcase
+			img = obj.fname
+		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]
+				end
+			}
+		end
+
+		if ok
+			(mugshot= img; break) if File.exist?img
+			$stderr.puts "'#{img}' not found - skipped"
+		end
 	}
 
 	$params[:ofile].print "\\begin{minipage}[t]{45mm} \n"