X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Finterface.c;h=7556667a253200a4b58ed9d7fab4f0f7f326ec0b;hb=9430c3f93860ce406faba17e0d0b6496ff797bb1;hp=58604442e4671c4533ce32c228775913a21f1f7c;hpb=e33cdc26ace551aae08fcd71a9f0d460c89b789d;p=gedcom-parse.git

diff --git a/gedcom/interface.c b/gedcom/interface.c
index 5860444..7556667 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.
 
@@ -56,11 +56,13 @@ void gedcom_subscribe_to_element(Gedcom_elt elt,
 }
 
 Gedcom_ctxt start_record(Gedcom_rec rec,
-			 int level, Gedcom_val 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)(rec, level, xref, tag.string, raw_value, tag.value,
+		 parsed_value);
   else
     return NULL;
 }
@@ -69,19 +71,20 @@ void end_record(Gedcom_rec rec, Gedcom_ctxt self)
 {
   Gedcom_rec_end_cb cb = record_end_callback[rec];
   if (cb != NULL)
-    (*cb)(self);
+    (*cb)(rec, 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)(elt, parent, level, tag.string, raw_value,
+		 tag.value, parsed_value);
+  else if (default_cb != NULL && parent != NULL)
+    (*default_cb)(elt, parent, level, tag.string, raw_value, tag.value);
   return ctxt;
 }
 
@@ -90,12 +93,13 @@ void end_element(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self,
 {
   Gedcom_elt_end_cb cb = element_end_callback[elt];
   if (cb != NULL)
-    (*cb)(parent, self, parsed_value);
+    (*cb)(elt, parent, self, parsed_value);
 }
 
 char* val_type_str[] = { N_("null value"),
 			 N_("character string"),
-			 N_("date") };
+			 N_("date"),
+                         N_("cross-reference") };
 
 void gedcom_cast_error(char* file, int line,
 		       Gedcom_val_type tried_type,