Moved common code to gom_internal.h

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

diff --git a/gom/multimedia.c b/gom/multimedia.c
index 80132926cd04bab746ec5bb87c6256243337e675..8ae88023e65c72ddf748d0f47a4ddc4be10b0b14 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);