X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fgom.c;h=743d2a4b975274ceb8320e6272005ba363b2fce0;hb=1b7536d78e236978e83fbf8acc9f90e2141e13b0;hp=adf6caba464babf045030d39b0abbaae65727e94;hpb=72689522e287ca3b2231e7d8881f0fe5bea48f15;p=gedcom-parse.git

diff --git a/gom/gom.c b/gom/gom.c
index adf6cab..743d2a4 100644
--- a/gom/gom.c
+++ b/gom/gom.c
@@ -52,6 +52,19 @@
 #include "gom.h"
 #include "gom_internal.h"
 
+const char* ctxt_names[] =
+{
+  "NULL",
+  
+  "header", "submission", "submitter", "family", "individual",
+  "multimedia", "note", "repository", "source", "user_rec",
+  
+  "address", "event", "place", "source_citation", "text",
+  "note_sub", "multimedia_link", "lds_event", "user_ref_number",
+  "change_date", "personal_name", "family_link", "pedigree",
+  "association", "source_event", "source_description"
+};
+
 void gom_default_callback (Gedcom_elt elt, Gedcom_ctxt parent, int level,
 			   char* tag, char* raw_value, int parsed_tag);
 
@@ -103,15 +116,30 @@ void subscribe_all()
   }
 }
 
+int gom_active = 0;
+
 int gom_parse_file(const char* file_name)
 {
-  subscribe_all();
+  if (gom_active) {
+    gom_cleanup();
+  }
+  else {
+    subscribe_all();
+  }
+  gom_active = 1;
+  gedcom_set_compat_options(0);
   return gedcom_parse_file(file_name);
 }
 
 int gom_new_model()
 {
-  subscribe_all();
+  if (gom_active) {
+    gom_cleanup();
+  }
+  else {
+    subscribe_all();
+  }
+  gom_active = 1;
   return gedcom_new_model();
 }
 
@@ -176,9 +204,15 @@ void destroy_gom_ctxt(Gom_ctxt ctxt)
 void gom_cast_error(const char* file, int line,
 		    OBJ_TYPE expected, OBJ_TYPE found)
 {
+  const char* expected_name = "<out-of-bounds>";
+  const char* found_name    = "<out-of-bounds>";
+  if (expected < T_LAST)
+    expected_name = ctxt_names[expected];
+  if (found < T_LAST)
+    found_name = ctxt_names[found];
   fprintf(stderr,
-	  "Wrong gom ctxt cast at %s, line %d: expected %d, found %d\n",
-	  file, line, expected, found);
+	  "Wrong gom ctxt cast at %s, line %d: expected %s, found %s\n",
+	  file, line, expected_name, found_name);
   abort();
 }
 
@@ -194,8 +228,11 @@ void gom_xref_already_in_use(const char *xrefstr)
 
 void gom_unexpected_context(const char* file, int line, OBJ_TYPE found)
 {
-  gedcom_warning(_("Internal error: Unexpected context at %s, line %d: %d"),
-		 file, line, found);
+  const char* found_name    = "<out-of-bounds>";
+  if (found < T_LAST)
+    found_name = ctxt_names[found];
+  gedcom_warning(_("Internal error: Unexpected context at %s, line %d: %s"),
+		 file, line, found_name);
 }
 
 void gom_no_context(const char* file, int line)
@@ -204,6 +241,16 @@ void gom_no_context(const char* file, int line)
 		 file, line);
 }
 
+void gom_move_error(const char* type)
+{
+  gedcom_warning(_("Could not move struct of type %s"), type);
+}
+
+void gom_find_error(const char* type)
+{
+  gedcom_warning(_("Could not find struct of type %s in chain"), type);
+}
+
 void gom_default_callback (Gedcom_elt elt UNUSED, Gedcom_ctxt parent UNUSED,
 			   int level, char* tag, char* raw_value,
 			   int parsed_tag UNUSED)
@@ -219,6 +266,7 @@ void def_rec_end(Gedcom_rec rec UNUSED, Gedcom_ctxt self,
   destroy_gom_ctxt(ctxt);
 }
 
+/* TODO: do this in a way so that elements out of context can be handled */
 void def_elt_end(Gedcom_elt elt UNUSED, Gedcom_ctxt parent UNUSED,
 		 Gedcom_ctxt self, Gedcom_val parsed_value UNUSED)
 {