X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fnote_sub.c;h=63ef644150a4348dacc569cfbb20d502da1a11bb;hb=4946f8418bfa1c41bb410995dbc9c5ac272c4c74;hp=008b9d046b1d1335de826d7b37faed114a42747e;hpb=bdf47fdee469d5a1d7ddfd06a0e4b26f3b40b0f4;p=gedcom-parse.git

diff --git a/gom/note_sub.c b/gom/note_sub.c
index 008b9d0..63ef644 100644
--- a/gom/note_sub.c
+++ b/gom/note_sub.c
@@ -56,77 +56,68 @@ Gedcom_ctxt sub_note_start(_ELT_PARAMS_)
     if (! note)
       MEMORY_ERROR;
     else {
-      int err = 0;
       memset (note, 0, sizeof(struct note_sub));
-      if (GEDCOM_IS_STRING(parsed_value)) {
-	note->text = strdup(GEDCOM_STRING(parsed_value));
-	if (! note->text) {
-	  MEMORY_ERROR;
-	  free(note);
-	  err = 1;
-	}
-      }
-      else if (GEDCOM_IS_XREF_PTR(parsed_value))
+      if (GEDCOM_IS_XREF_PTR(parsed_value))
 	note->reference = GEDCOM_XREF_PTR(parsed_value);
 
-      if (! err) {
-	switch (ctxt->ctxt_type) {
-	  case ELT_SUB_PLAC:
-	    place_add_note(ctxt, note); break;
-	  case ELT_SUB_FAM_EVT:
-	  case ELT_SUB_FAM_EVT_EVEN:
-	  case ELT_SUB_INDIV_ATTR:
-	  case ELT_SUB_INDIV_RESI:
-	  case ELT_SUB_INDIV_BIRT:
-	  case ELT_SUB_INDIV_GEN:
-	  case ELT_SUB_INDIV_ADOP:
-	  case ELT_SUB_INDIV_EVEN:
-	    event_add_note(ctxt, note); break;
-	  case ELT_SUB_SOUR:
-	    citation_add_note(ctxt, note); break;
-	  case ELT_SUB_MULTIM_OBJE:
-	    multimedia_link_add_note(ctxt, note); break;
-	  case ELT_SUB_LSS_SLGS:
-	  case ELT_SUB_LIO_BAPL:
-	  case ELT_SUB_LIO_SLGC:
-	    lds_event_add_note(ctxt, note); break;
-	  case REC_FAM:
-	    family_add_note(ctxt, note); break;
-	  case ELT_SUB_CHAN:
-	    change_date_add_note(ctxt, note); break;
-	  case ELT_SUB_PERS_NAME:
-	    name_add_note(ctxt, note); break;
-	  case ELT_SUB_FAMC: 
-	  case ELT_SUB_FAMS:
-	    family_link_add_note(ctxt, note); break;
-	  case ELT_SUB_ASSO:
-	    association_add_note(ctxt, note); break;
-	  case REC_INDI:
-	    individual_add_note(ctxt, note); break;
-	  case REC_OBJE:
-	    multimedia_add_note(ctxt, note); break;
-	  case REC_REPO:
-	    repository_add_note(ctxt, note); break;
-	  case ELT_SOUR_DATA:
-	    source_add_note_to_data(ctxt, note); break;
-	  case ELT_SUB_REPO:
-	    source_add_note_to_repo(ctxt, note); break;
-	  case REC_SOUR:
-	    source_add_note(ctxt, note); break;
-	  default:
-	    UNEXPECTED_CONTEXT(ctxt->ctxt_type);
-	}
-	result = MAKE_GOM_CTXT(elt, note_sub, note);
+      switch (ctxt->ctxt_type) {
+	case ELT_SUB_PLAC:
+	  place_add_note(ctxt, note); break;
+	case ELT_SUB_FAM_EVT:
+	case ELT_SUB_FAM_EVT_EVEN:
+	case ELT_SUB_INDIV_ATTR:
+	case ELT_SUB_INDIV_RESI:
+	case ELT_SUB_INDIV_BIRT:
+	case ELT_SUB_INDIV_GEN:
+	case ELT_SUB_INDIV_ADOP:
+	case ELT_SUB_INDIV_EVEN:
+	  event_add_note(ctxt, note); break;
+	case ELT_SUB_SOUR:
+	  citation_add_note(ctxt, note); break;
+	case ELT_SUB_MULTIM_OBJE:
+	  multimedia_link_add_note(ctxt, note); break;
+	case ELT_SUB_LSS_SLGS:
+	case ELT_SUB_LIO_BAPL:
+	case ELT_SUB_LIO_SLGC:
+	  lds_event_add_note(ctxt, note); break;
+	case REC_FAM:
+	  family_add_note(ctxt, note); break;
+	case ELT_SUB_CHAN:
+	  change_date_add_note(ctxt, note); break;
+	case ELT_SUB_PERS_NAME:
+	  name_add_note(ctxt, note); break;
+	case ELT_SUB_FAMC: 
+	case ELT_SUB_FAMS:
+	  family_link_add_note(ctxt, note); break;
+	case ELT_SUB_ASSO:
+	  association_add_note(ctxt, note); break;
+	case REC_INDI:
+	  individual_add_note(ctxt, note); break;
+	case REC_OBJE:
+	  multimedia_add_note(ctxt, note); break;
+	case REC_REPO:
+	  repository_add_note(ctxt, note); break;
+	case ELT_SOUR_DATA:
+	  source_add_note_to_data(ctxt, note); break;
+	case ELT_SUB_REPO:
+	  source_add_note_to_repo(ctxt, note); break;
+	case REC_SOUR:
+	  source_add_note(ctxt, note); break;
+	default:
+	  UNEXPECTED_CONTEXT(ctxt->ctxt_type);
       }
+      result = MAKE_GOM_CTXT(elt, note_sub, note);
     }
   }
 
   return (Gedcom_ctxt)result;
 }
 
+STRING_END_CB(note_sub, sub_note_end, text)
+     
 void note_sub_subscribe()
 {
-  gedcom_subscribe_to_element(ELT_SUB_NOTE, sub_note_start, def_elt_end);
+  gedcom_subscribe_to_element(ELT_SUB_NOTE, sub_note_start, sub_note_end);
 }
 
 void note_sub_add_citation(Gom_ctxt ctxt, struct source_citation* cit)
@@ -136,18 +127,6 @@ void note_sub_add_citation(Gom_ctxt ctxt, struct source_citation* cit)
     LINK_CHAIN_ELT(source_citation, note->citation, cit);    
 }
 
-void note_sub_add_to_note(NL_TYPE type, Gom_ctxt ctxt, char* str)
-{
-  struct note_sub *note = SAFE_CTXT_CAST(note_sub, ctxt);
-  if (note) {
-    char *newvalue = concat_strings (type, note->text, str);
-    if (newvalue)
-      note->text = newvalue;
-    else
-      MEMORY_ERROR;
-  }
-}
-
 void note_sub_add_user_data(Gom_ctxt ctxt, struct user_data* data)
 {
   struct note_sub *obj = SAFE_CTXT_CAST(note_sub, ctxt);
@@ -163,3 +142,28 @@ void note_sub_cleanup(struct note_sub* note)
     DESTROY_CHAIN_ELTS(user_data, note->extra, user_data_cleanup);
   }
 }
+
+int write_note_subs(Gedcom_write_hndl hndl, int parent, struct note_sub* note)
+{
+  int result = 0;
+  struct note_sub* obj;
+
+  if (!note) return 1;
+
+  for (obj = note; obj; obj = obj->next) {
+    if (obj->reference) {
+      result |= gedcom_write_element_xref(hndl, ELT_SUB_NOTE, 0,
+					  parent, obj->reference);
+    }
+    else {
+      result |= gedcom_write_element_str(hndl, ELT_SUB_NOTE, 0,
+					 parent, obj->text);
+    }
+    if (obj->citation)
+      result |= write_citations(hndl, ELT_SUB_NOTE, obj->citation);
+    if (obj->extra)
+      result |= write_user_data(hndl, obj->extra);
+  }
+
+  return result;
+}