X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Finterface.c;h=152599a2ec0fea2c63443b934335c0c3535fb314;hb=4fe12100984a41d439dc9b4138d6cd8df36285f8;hp=0ac773bdb689c617d90ef9318e5ce8ab8b551c39;hpb=706c9bfcdfc8d16c3a65243d708af135c2e7c894;p=gedcom-parse.git

diff --git a/gedcom/interface.c b/gedcom/interface.c
index 0ac773b..152599a 100644
--- a/gedcom/interface.c
+++ b/gedcom/interface.c
@@ -1,5 +1,5 @@
 /* Implementation of the interface to applications.
-   Copyright (C) 2001 The Genes Development Team
+   Copyright (C) 2001, 2002 The Genes Development Team
    This file is part of the Gedcom parser library.
    Contributed by Peter Verthez <Peter.Verthez@advalvas.be>, 2001.
 
@@ -39,24 +39,29 @@ void gedcom_subscribe_to_record(Gedcom_rec rec,
 				Gedcom_rec_start_cb cb_start,
 				Gedcom_rec_end_cb cb_end)
 {
-  record_start_callback[rec] = cb_start;
-  record_end_callback[rec]   = cb_end;
+  if (cb_start) {
+    record_start_callback[rec] = cb_start;
+    record_end_callback[rec]   = cb_end;
+  }
 }
 
 void gedcom_subscribe_to_element(Gedcom_elt elt,
 				 Gedcom_elt_start_cb cb_start,
 				 Gedcom_elt_end_cb cb_end)
 {
-  element_start_callback[elt] = cb_start;
-  element_end_callback[elt]   = cb_end;
+  if (cb_start) {
+    element_start_callback[elt] = cb_start;
+    element_end_callback[elt]   = cb_end;
+  }
 }
 
 Gedcom_ctxt start_record(Gedcom_rec rec,
-			 int level, char *xref, char *tag)
+			 int level, Gedcom_val xref, struct tag_struct tag,
+			 char *raw_value, Gedcom_val parsed_value)
 {
   Gedcom_rec_start_cb cb = record_start_callback[rec];
   if (cb != NULL)
-    return (*cb)(level, xref, tag);
+    return (*cb)(level, xref, tag.string, raw_value, tag.value, parsed_value);
   else
     return NULL;
 }
@@ -69,15 +74,16 @@ void end_record(Gedcom_rec rec, Gedcom_ctxt self)
 }
 
 Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent, 
-			  int level, char *tag, char *raw_value,
+			  int level, struct tag_struct tag, char *raw_value,
 			  Gedcom_val parsed_value)
 {
   Gedcom_elt_start_cb cb = element_start_callback[elt];
   Gedcom_ctxt ctxt = parent;
   if (cb != NULL)
-    ctxt = (*cb)(parent, level, tag, raw_value, parsed_value);
-  else if (default_cb != NULL)
-    (*default_cb)(parent, level, tag, raw_value);
+    ctxt = (*cb)(parent, level, tag.string, raw_value,
+		 tag.value, parsed_value);
+  else if (default_cb != NULL && parent != NULL)
+    (*default_cb)(parent, level, tag.string, raw_value, tag.value);
   return ctxt;
 }