X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fuser_ref.c;h=c43874f829d2561d277540d4fc30ccef28774ec9;hb=8073f669d16f11bfd50d42bb2cf6fdb79d358565;hp=d0bcc7e88e8af3c78373b2381d6c0ba93961ee1e;hpb=7ea4ef8cae7b52f2bf66371a5e7b493cbd12900e;p=gedcom-parse.git

diff --git a/gom/user_ref.c b/gom/user_ref.c
index d0bcc7e..c43874f 100644
--- a/gom/user_ref.c
+++ b/gom/user_ref.c
@@ -38,60 +38,85 @@
 Gedcom_ctxt sub_user_ref_start(_ELT_PARAMS_)
 {
   Gom_ctxt ctxt = (Gom_ctxt)parent;
-  struct user_ref_number *refn = NULL;
+  Gom_ctxt result = NULL;
 
-  if (ctxt) {
-    refn = (struct user_ref_number *)malloc(sizeof(struct user_ref_number));
-    memset (refn, 0, sizeof(struct user_ref_number));
-    refn->value = strdup(GEDCOM_STRING(parsed_value));
-
-    switch (ctxt->ctxt_type) {
-      case REC_FAM:
-	family_add_user_ref(ctxt, refn); break;
-      case REC_INDI:
-	individual_add_user_ref(ctxt, refn); break;
-      case REC_OBJE:
-	multimedia_add_user_ref(ctxt, refn); break;
-      case REC_NOTE:
-	note_add_user_ref(ctxt, refn); break;
-      case REC_REPO:
-	repository_add_user_ref(ctxt, refn); break;
-      case REC_SOUR:
-	source_add_user_ref(ctxt, refn); break;
-      default:
-	UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+  if (! ctxt)
+    NO_CONTEXT;
+  else {
+    struct user_ref_number *refn = SUB_MAKEFUNC(user_ref_number)();
+    if (refn) {
+      refn->value = strdup(GEDCOM_STRING(parsed_value));
+      if (! refn->value) {
+	MEMORY_ERROR;
+	free(refn);
+      }
+      else {
+	int type = ctxt_type(ctxt);
+	switch (type) {
+	  case REC_FAM:
+	    ADDFUNC2(family,user_ref_number)(ctxt, refn); break;
+	  case REC_INDI:
+	    ADDFUNC2(individual,user_ref_number)(ctxt, refn); break;
+	  case REC_OBJE:
+	    ADDFUNC2(multimedia,user_ref_number)(ctxt, refn); break;
+	  case REC_NOTE:
+	    ADDFUNC2(note,user_ref_number)(ctxt, refn); break;
+	  case REC_REPO:
+	    ADDFUNC2(repository,user_ref_number)(ctxt, refn); break;
+	  case REC_SOUR:
+	    ADDFUNC2(source,user_ref_number)(ctxt, refn); break;
+	  default:
+	    UNEXPECTED_CONTEXT(type);
+	}
+	
+	result = MAKE_GOM_CTXT(elt, user_ref_number, refn);
+      }
     }
   }
 
-  return (Gedcom_ctxt) MAKE_GOM_CTXT(elt, user_ref_number, refn);
+  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_)
 {
   Gom_ctxt ctxt = (Gom_ctxt)parent;
-  if (ctxt) {
+  Gom_ctxt result = NULL;
+  
+  if (! ctxt)
+    NO_CONTEXT;
+  else {
     char *str = GEDCOM_STRING(parsed_value);
+    int type = ctxt_type(ctxt);
 
-    switch (ctxt->ctxt_type) {
+    switch (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);
+	UNEXPECTED_CONTEXT(type);
     }
+    result = dup_gom_ctxt(ctxt, elt);
   }
-  return (Gedcom_ctxt) make_gom_ctxt(elt, ctxt->obj_type, ctxt->ctxt_ptr);
+  return (Gedcom_ctxt)result;
 }
 
 void user_ref_subscribe()
@@ -104,17 +129,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);
-  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;
+}