Only try to delete address if present.

[gedcom-parse.git] / gom / gom.c

diff --git a/gom/gom.c b/gom/gom.c
index adf6caba464babf045030d39b0abbaae65727e94..6ca25d234ed2a5ebcef91c9e3b9b60ce38febe4d 100644 (file)
--- a/gom/gom.c
+++ b/gom/gom.c
@@ -103,15 +103,29 @@ 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;
   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();
 }
 
@@ -204,6 +218,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)