A little simplification in the write interface.

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

diff --git a/gom/multimedia.c b/gom/multimedia.c
index 4faaf1fb6d98a0b52f28fe507d78ccddcbe1f1a9..5fb331cb4a483888d12f8743c4b2e3a33bdeab01 100644 (file)
--- a/gom/multimedia.c
+++ b/gom/multimedia.c
@@ -38,7 +38,8 @@ 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)     
+NULL_CB(multimedia, obje_blob_start)
+STRING_END_CB(multimedia, obje_blob_end, data)
 XREF_CB(multimedia, obje_obje_start, continued, make_multimedia_record)
 
 Gedcom_ctxt obje_blob_cont_start(_ELT_PARAMS_)
@@ -48,30 +49,9 @@ Gedcom_ctxt obje_blob_cont_start(_ELT_PARAMS_)
 
   if (! ctxt)
     NO_CONTEXT;
-  else {
-    struct multimedia *obj = SAFE_CTXT_CAST(multimedia, ctxt);
-    if (obj) {
-      char *str = GEDCOM_STRING(parsed_value);
-      if (obj->data) {
-       char *newvalue = concat_strings (WITHOUT_NL, obj->data, str);
-       if (newvalue)
-         obj->data = newvalue;
-       else {
-         free(obj->data);
-         obj->data = NULL;
-       }
-      }
-      else
-       obj->data = strdup(str);
-      
-      if (! obj->data) {
-       MEMORY_ERROR;
-       free(obj);
-      }
-      else
-       result = make_gom_ctxt(elt, ctxt->obj_type, ctxt->ctxt_ptr);
-    }
-  }
+  else
+    result = make_gom_ctxt(elt, ctxt->obj_type, ctxt->ctxt_ptr);
+  
   return (Gedcom_ctxt)result;
 }
 
@@ -80,7 +60,7 @@ 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);
@@ -100,7 +80,7 @@ void multimedia_add_user_ref(Gom_ctxt ctxt, struct user_ref_number* ref)
     LINK_CHAIN_ELT(user_ref_number, obj->ref, ref);
 }
 
-void multimedia_set_record_id(Gom_ctxt ctxt, char *rin)
+void multimedia_set_record_id(Gom_ctxt ctxt, const char *rin)
 {
   struct multimedia *obj = SAFE_CTXT_CAST(multimedia, ctxt);
   if (obj) {
@@ -148,7 +128,7 @@ struct multimedia* gom_get_first_multimedia()
   return gom_first_multimedia;
 }
 
-struct multimedia* make_multimedia_record(char* xrefstr)
+struct multimedia* make_multimedia_record(const char* xrefstr)
 {
   struct multimedia* multi = NULL;
   MAKE_CHAIN_ELT(multimedia, gom_first_multimedia, multi);
@@ -158,3 +138,39 @@ struct multimedia* make_multimedia_record(char* xrefstr)
   }
   return multi;
 }
+
+int write_multimedia_recs(Gedcom_write_hndl hndl)
+{
+  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;
+}
+