Better warning messages.

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

diff --git a/gom/user_ref.c b/gom/user_ref.c
index e83c82db68e8f4df02d6936af38f82815b36457c..1dac775aba5eb8cc633704ceb3a247b7c634fc71 100644 (file)
--- a/gom/user_ref.c
+++ b/gom/user_ref.c
@@ -43,13 +43,8 @@ Gedcom_ctxt sub_user_ref_start(_ELT_PARAMS_)
   if (! ctxt)
     NO_CONTEXT;
   else {
-    struct user_ref_number *refn
-      = (struct user_ref_number *)malloc(sizeof(struct user_ref_number));
-
-    if (! refn)
-      MEMORY_ERROR;
-    else {
-      memset (refn, 0, sizeof(struct user_ref_number));
+    struct user_ref_number *refn = SUB_MAKEFUNC(user_ref_number)();
+    if (refn) {
       refn->value = strdup(GEDCOM_STRING(parsed_value));
       if (! refn->value) {
        MEMORY_ERROR;
@@ -58,17 +53,17 @@ Gedcom_ctxt sub_user_ref_start(_ELT_PARAMS_)
       else {
        switch (ctxt->ctxt_type) {
          case REC_FAM:
-           family_add_user_ref(ctxt, refn); break;
+           ADDFUNC2(family,user_ref_number)(ctxt, refn); break;
          case REC_INDI:
-           individual_add_user_ref(ctxt, refn); break;
+           ADDFUNC2(individual,user_ref_number)(ctxt, refn); break;
          case REC_OBJE:
-           multimedia_add_user_ref(ctxt, refn); break;
+           ADDFUNC2(multimedia,user_ref_number)(ctxt, refn); break;
          case REC_NOTE:
-           note_add_user_ref(ctxt, refn); break;
+           ADDFUNC2(note,user_ref_number)(ctxt, refn); break;
          case REC_REPO:
-           repository_add_user_ref(ctxt, refn); break;
+           ADDFUNC2(repository,user_ref_number)(ctxt, refn); break;
          case REC_SOUR:
-           source_add_user_ref(ctxt, refn); break;
+           ADDFUNC2(source,user_ref_number)(ctxt, refn); break;
          default:
            UNEXPECTED_CONTEXT(ctxt->ctxt_type);
        }
@@ -81,7 +76,15 @@ Gedcom_ctxt sub_user_ref_start(_ELT_PARAMS_)
   return (Gedcom_ctxt)result;
 }
 
-STRING_CB(user_ref_number, sub_user_ref_type_start, type)
+DEFINE_SUB_MAKEFUNC(user_ref_number)
+DEFINE_SUB_ADDFUNC(user_ref_number)
+DEFINE_SUB_FINDFUNC(user_ref_number)
+DEFINE_SUB_REMOVEFUNC(user_ref_number)
+DEFINE_SUB_MOVEFUNC(user_ref_number)
+     
+DEFINE_STRING_CB(user_ref_number, sub_user_ref_type_start, type)
+
+DEFINE_ADDFUNC2(user_ref_number, user_data, extra)
      
 Gedcom_ctxt sub_user_rin_start(_ELT_PARAMS_)
 {
@@ -95,17 +98,17 @@ Gedcom_ctxt sub_user_rin_start(_ELT_PARAMS_)
 
     switch (ctxt->ctxt_type) {
       case REC_FAM:
-       family_set_record_id(ctxt, str); break;
+       ADDFUNC2_STR(family,record_id)(ctxt, str); break;
       case REC_INDI:
-       individual_set_record_id(ctxt, str); break;
+       ADDFUNC2_STR(individual,record_id)(ctxt, str); break;
       case REC_OBJE:
-       multimedia_set_record_id(ctxt, str); break;
+       ADDFUNC2_STR(multimedia,record_id)(ctxt, str); break;
       case REC_NOTE:
-       note_set_record_id(ctxt, str); break;
+       ADDFUNC2_STR(note,record_id)(ctxt, str); break;
       case REC_REPO:
-       repository_set_record_id(ctxt, str); break;
+       ADDFUNC2_STR(repository,record_id)(ctxt, str); break;
       case REC_SOUR:
-       source_set_record_id(ctxt, str); break;
+       ADDFUNC2_STR(source,record_id)(ctxt, str); break;
       default:
        UNEXPECTED_CONTEXT(ctxt->ctxt_type);
     }
@@ -124,18 +127,41 @@ void user_ref_subscribe()
                              def_elt_end);
 }
 
-void user_ref_add_user_data(Gom_ctxt ctxt, struct user_data* data)
+void UNREFALLFUNC(user_ref_number)(struct user_ref_number* obj)
 {
-  struct user_ref_number *obj = SAFE_CTXT_CAST(user_ref_number, ctxt);
-  if (obj)
-    LINK_CHAIN_ELT(user_data, obj->extra, data);
+  if (obj) {
+    struct user_ref_number* runner;
+    for (runner = obj; runner; runner = runner->next)
+      UNREFALLFUNC(user_data)(runner->extra);
+  }
 }
 
-void user_ref_cleanup(struct user_ref_number* refn)
+void CLEANFUNC(user_ref_number)(struct user_ref_number* refn)
 {
   if (refn) {
     SAFE_FREE(refn->value);
     SAFE_FREE(refn->type);
-    DESTROY_CHAIN_ELTS(user_data, refn->extra, user_data_cleanup);
+    DESTROY_CHAIN_ELTS(user_data, refn->extra);
   }
 }
+
+int write_user_refs(Gedcom_write_hndl hndl, int parent,
+                   struct user_ref_number *refn)
+{
+  int result = 0;
+  struct user_ref_number* obj;
+
+  if (!refn) return 1;
+
+  for (obj = refn; obj; obj = obj->next) {
+    result |= gedcom_write_element_str(hndl, ELT_SUB_IDENT_REFN, 0,
+                                      parent, obj->value);
+    if (obj->type)
+      result |= gedcom_write_element_str(hndl, ELT_SUB_IDENT_REFN_TYPE, 0,
+                                        ELT_SUB_IDENT_REFN, obj->type);
+    if (obj->extra)
+      result |= write_user_data(hndl, obj->extra);    
+  }
+
+  return result;
+}