X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fmultimedia.c;h=38ffa3ff6f8973ad04b30bdcc8a7e78cdc61b636;hb=72689522e287ca3b2231e7d8881f0fe5bea48f15;hp=43dd6b7e52788a44b91c7f21e9117d93ce9fe0cd;hpb=7ea4ef8cae7b52f2bf66371a5e7b493cbd12900e;p=gedcom-parse.git

diff --git a/gom/multimedia.c b/gom/multimedia.c
index 43dd6b7..38ffa3f 100644
--- a/gom/multimedia.c
+++ b/gom/multimedia.c
@@ -34,23 +34,36 @@
 
 struct multimedia* gom_first_multimedia = NULL;
 
-REC_CB(multimedia, obje_start, make_multimedia_record)
-GET_REC_BY_XREF(multimedia, XREF_OBJE, gom_get_multimedia_by_xref)
-STRING_CB(multimedia, obje_form_start, form)
-STRING_CB(multimedia, obje_titl_start, title)     
-NULL_CB(multimedia, obje_blob_start)     
-XREF_CB(multimedia, obje_obje_start, continued, make_multimedia_record)
+DEFINE_MAKEFUNC(multimedia, gom_first_multimedia)
+DEFINE_DESTROYFUNC(multimedia, gom_first_multimedia)
+DEFINE_ADDFUNC(multimedia, XREF_OBJE)
+DEFINE_DELETEFUNC(multimedia)
+DEFINE_GETXREFFUNC(multimedia, XREF_OBJE)
+     
+DEFINE_REC_CB(multimedia, obje_start)
+DEFINE_STRING_CB(multimedia, obje_form_start, form)
+DEFINE_STRING_CB(multimedia, obje_titl_start, title)     
+DEFINE_NULL_CB(multimedia, obje_blob_start)
+DEFINE_STRING_END_CB(multimedia, obje_blob_end, data)
+DEFINE_XREF_CB(multimedia, obje_obje_start, continued, multimedia)
+
+DEFINE_ADDFUNC2(multimedia, note_sub, note)
+DEFINE_ADDFUNC2(multimedia, user_ref_number, ref)
+DEFINE_ADDFUNC2(multimedia, user_data, extra)
+DEFINE_ADDFUNC2_NOLIST(multimedia, change_date, change_date)
+DEFINE_ADDFUNC2_STR(multimedia, record_id)
 
 Gedcom_ctxt obje_blob_cont_start(_ELT_PARAMS_)
 {
   Gom_ctxt ctxt = (Gom_ctxt)parent;
-  struct multimedia *obj = SAFE_CTXT_CAST(multimedia, ctxt);
-  char *str = GEDCOM_STRING(parsed_value);
-  if (obj->data)
-    obj->data = concat_strings (WITHOUT_NL, obj->data, str);
+  Gom_ctxt result = NULL;
+
+  if (! ctxt)
+    NO_CONTEXT;
   else
-    obj->data = strdup(str);
-  return (Gedcom_ctxt) make_gom_ctxt(elt, ctxt->obj_type, ctxt->ctxt_ptr);
+    result = make_gom_ctxt(elt, ctxt->obj_type, ctxt->ctxt_ptr);
+  
+  return (Gedcom_ctxt)result;
 }
 
 void multimedia_subscribe()
@@ -58,58 +71,30 @@ void multimedia_subscribe()
   gedcom_subscribe_to_record(REC_OBJE, obje_start, def_rec_end);
   gedcom_subscribe_to_element(ELT_OBJE_FORM, obje_form_start, def_elt_end);
   gedcom_subscribe_to_element(ELT_OBJE_TITL, obje_titl_start, def_elt_end);
-  gedcom_subscribe_to_element(ELT_OBJE_BLOB, obje_blob_start, def_elt_end);
+  gedcom_subscribe_to_element(ELT_OBJE_BLOB, obje_blob_start, obje_blob_end);
   gedcom_subscribe_to_element(ELT_OBJE_BLOB_CONT, obje_blob_cont_start,
 			      def_elt_end);
   gedcom_subscribe_to_element(ELT_OBJE_OBJE, obje_obje_start, def_elt_end);
 }
 
-void multimedia_add_note(Gom_ctxt ctxt, struct note_sub* note)
+void CLEANFUNC(multimedia)(struct multimedia* obj)
 {
-  struct multimedia* obj = SAFE_CTXT_CAST(multimedia, ctxt);
-  LINK_CHAIN_ELT(note_sub, obj->note, note)
-}
-
-void multimedia_add_user_ref(Gom_ctxt ctxt, struct user_ref_number* ref)
-{
-  struct multimedia *obj = SAFE_CTXT_CAST(multimedia, ctxt);
-  LINK_CHAIN_ELT(user_ref_number, obj->ref, ref)
-}
-
-void multimedia_set_record_id(Gom_ctxt ctxt, char *rin)
-{
-  struct multimedia *obj = SAFE_CTXT_CAST(multimedia, ctxt);
-  obj->record_id = strdup(rin);
-}
-
-void multimedia_set_change_date(Gom_ctxt ctxt, struct change_date* chan)
-{
-  struct multimedia *obj = SAFE_CTXT_CAST(multimedia, ctxt);
-  obj->change_date = chan;
-}
-
-void multimedia_add_user_data(Gom_ctxt ctxt, struct user_data* data)
-{
-  struct multimedia *obj = SAFE_CTXT_CAST(multimedia, ctxt);
-  LINK_CHAIN_ELT(user_data, obj->extra, data)
-}
-
-void multimedia_cleanup(struct multimedia* obj)
-{
-  SAFE_FREE(obj->xrefstr);
-  SAFE_FREE(obj->form);
-  SAFE_FREE(obj->title);
-  DESTROY_CHAIN_ELTS(note_sub, obj->note, note_sub_cleanup)
-  SAFE_FREE(obj->data);
-  DESTROY_CHAIN_ELTS(user_ref_number, obj->ref, user_ref_cleanup)
-  SAFE_FREE(obj->record_id);
-  change_date_cleanup(obj->change_date);
-  DESTROY_CHAIN_ELTS(user_data, obj->extra, user_data_cleanup)
+  if (obj) {
+    SAFE_FREE(obj->xrefstr);
+    SAFE_FREE(obj->form);
+    SAFE_FREE(obj->title);
+    DESTROY_CHAIN_ELTS(note_sub, obj->note);
+    SAFE_FREE(obj->data);
+    DESTROY_CHAIN_ELTS(user_ref_number, obj->ref);
+    SAFE_FREE(obj->record_id);
+    CLEANFUNC(change_date)(obj->change_date);
+    DESTROY_CHAIN_ELTS(user_data, obj->extra);
+  }
 }
 
 void multimedias_cleanup()
 {
-  DESTROY_CHAIN_ELTS(multimedia, gom_first_multimedia, multimedia_cleanup);
+  DESTROY_CHAIN_ELTS(multimedia, gom_first_multimedia);
 }
 
 struct multimedia* gom_get_first_multimedia()
@@ -117,10 +102,38 @@ struct multimedia* gom_get_first_multimedia()
   return gom_first_multimedia;
 }
 
-struct multimedia* make_multimedia_record(char* xrefstr)
+int write_multimedia_recs(Gedcom_write_hndl hndl)
 {
-  struct multimedia* multi;
-  MAKE_CHAIN_ELT(multimedia, gom_first_multimedia, multi);
-  multi->xrefstr = strdup(xrefstr);
-  return multi;
+  int result = 0;
+  struct multimedia* obj;
+
+  for (obj = gom_first_multimedia; obj; obj = obj->next) {
+    result |= gedcom_write_record_str(hndl, REC_OBJE, obj->xrefstr, NULL);
+    if (obj->form)
+      result |= gedcom_write_element_str(hndl, ELT_OBJE_FORM, 0,
+					 REC_OBJE, obj->form);
+    if (obj->title)
+      result |= gedcom_write_element_str(hndl, ELT_OBJE_TITL, 0,
+					 REC_OBJE, obj->title);
+    if (obj->note)
+      result |= write_note_subs(hndl, REC_OBJE, obj->note);
+    if (obj->data)
+      result |= gedcom_write_element_str(hndl, ELT_OBJE_BLOB, 0,
+					 REC_OBJE, obj->data);
+    if (obj->continued)
+      result |= gedcom_write_element_xref(hndl, ELT_OBJE_OBJE, 0,
+					  REC_OBJE, obj->continued);
+    if (obj->ref)
+      result |= write_user_refs(hndl, REC_OBJE, obj->ref);
+    if (obj->record_id)
+      result |= gedcom_write_element_str(hndl, ELT_SUB_IDENT_RIN, 0,
+					 REC_OBJE, obj->record_id);
+    if (obj->change_date)
+      result |= write_change_date(hndl, REC_OBJE, obj->change_date);
+    if (obj->extra)
+      result |= write_user_data(hndl, obj->extra);
+  }
+  
+  return result;
 }
+