Unlink xrefs properly when struct is deleted.

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

diff --git a/gom/gom_modify.c b/gom/gom_modify.c
index bc65a3a380412b2386af7e855cd1685ed7f4430b..11db4d775d5c5be0be9e49c0e995bb772b324846 100644 (file)
--- a/gom/gom_modify.c
+++ b/gom/gom_modify.c
@@ -23,8 +23,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include "utf8tools.h"
+#include "user_rec.h"
 #include "gom.h"
 #include "gom_internal.h"
 
@@ -79,33 +79,111 @@ char* gom_set_string_for_locale(char** data, const char* locale_str)
   return result;
 }
 
-int update_date(struct date_value** dv, struct tm* tm_ptr)
+void unref_xref_value(struct xref_value *xref)
 {
-  int result;
-  struct date_value* dval = gedcom_new_date_value(NULL);
-  dval->type        = DV_NO_MODIFIER;
-  dval->date1.cal   = CAL_GREGORIAN;
-  dval->date1.day   = tm_ptr->tm_mday;
-  dval->date1.month = tm_ptr->tm_mon + 1;
-  dval->date1.year  = tm_ptr->tm_year + 1900;
-  result = gedcom_normalize_date(DI_FROM_NUMBERS, dval);
-
-  if (result == 0) {
-    if (*dv) free(*dv);
-    *dv = dval;
+  if (xref)
+    gedcom_unlink_xref(xref->type, xref->string);
+}
+
+void UNREFALLFUNC(xref_list)(struct xref_list* obj)
+{
+  if (obj) {
+    struct xref_list* runner;
+    for (runner = obj; runner; runner = runner->next) {
+      unref_xref_value(runner->xref);
+      UNREFALLFUNC(user_data)(runner->extra);
+    }
+  }
+}
+
+void CLEANFUNC(xref_list)(struct xref_list *obj)
+{
+  if (obj) {
+    DESTROY_CHAIN_ELTS(user_data, obj->extra);
+  }
+}
+
+struct xref_value* gom_set_xref(struct xref_value** data, const char* xref)
+{
+  struct xref_value* result = NULL;
+  struct xref_value* newval = NULL;
+  
+  if (data) {
+    if (xref) {
+      newval = gedcom_get_by_xref(xref);
+      if (!newval)
+       gedcom_error(_("No record found for xref '%s'"), xref);
+    }
+    
+    /* Unreference the old value if not NULL */
+    if (*data)
+      result = gedcom_unlink_xref((*data)->type, (*data)->string);
+    else
+      result = newval;
+    
+    /* Reference the new value if not NULL */
+    if (result != NULL && newval) {
+      result = gedcom_link_xref(newval->type, newval->string);
+      /* On error, perform rollback to old value (guaranteed to work) */
+      if (result == NULL)
+       gedcom_link_xref((*data)->type, (*data)->string);
+    }
+    
+    if (result != NULL) {
+      *data = newval;
+      result = newval;
+    }
   }
   return result;
 }
 
-int update_time(char** tv, struct tm* tm_ptr)
+struct xref_list* gom_add_xref(struct xref_list** data, const char* xref)
 {
-  char tval[16];
-  sprintf(tval, "%02d:%02d:%02d",
-         tm_ptr->tm_hour, tm_ptr->tm_min, tm_ptr->tm_sec);
+  struct xref_value* result = NULL;
+  struct xref_value* newval = NULL;
+  struct xref_list* xrl = NULL;
+
+  if (data && xref) {
+    newval = gedcom_get_by_xref(xref);
+    if (!newval)
+      gedcom_error(_("No record found for xref '%s'"), xref);
+    else {
+      result = gedcom_link_xref(newval->type, newval->string);
+      if (result != NULL) {
+       MAKE_CHAIN_ELT(xref_list, *data, xrl);
+       if (xrl) xrl->xref = newval;
+      }
+    }
+  }
 
-  if (gom_set_string(tv, tval))
-    return 0;
-  else
-    return 1;
+  return xrl;
 }
 
+int gom_remove_xref(struct xref_list** data, const char* xref)
+{
+  struct xref_value* xr = NULL;
+  int result = 1;
+  
+  if (data && xref) {
+    xr = gedcom_get_by_xref(xref);
+    if (!xr)
+      gedcom_error(_("No record found for xref '%s'"), xref);
+    else {
+      struct xref_list* xrl = NULL;
+      for (xrl = *data ; xrl ; xrl = xrl->next) {
+       if (xrl->xref == xr) {
+         UNLINK_CHAIN_ELT(xref_list, *data, xrl);
+         gedcom_unlink_xref(xr->type, xr->string);
+         CLEANFUNC(xref_list)(xrl);
+         SAFE_FREE(xrl);
+         result = 0;
+         break;
+       }
+      }
+      if (result == 1)
+       gedcom_error(_("Xref '%s' to remove not part of chain"), xref);
+    }
+  }
+
+  return result;
+}