X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Finterface.c;h=7556667a253200a4b58ed9d7fab4f0f7f326ec0b;hb=610f424e2c0eb060719d84ffa05d55264d7af1d3;hp=8a69ffed288db983459cbb00649c178a5dbfcd4d;hpb=8c92a223c34fbd674f26520fb990c64a7b2f9147;p=gedcom-parse.git

diff --git a/gedcom/interface.c b/gedcom/interface.c
index 8a69ffe..7556667 100644
--- a/gedcom/interface.c
+++ b/gedcom/interface.c
@@ -56,11 +56,13 @@ void gedcom_subscribe_to_element(Gedcom_elt elt,
 }
 
 Gedcom_ctxt start_record(Gedcom_rec rec,
-			 int level, Gedcom_val xref, struct tag_struct 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.string, tag.value);
+    return (*cb)(rec, level, xref, tag.string, raw_value, tag.value,
+		 parsed_value);
   else
     return NULL;
 }
@@ -69,7 +71,7 @@ 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, 
@@ -79,10 +81,10 @@ Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent,
   Gedcom_elt_start_cb cb = element_start_callback[elt];
   Gedcom_ctxt ctxt = parent;
   if (cb != NULL)
-    ctxt = (*cb)(parent, level, tag.string, raw_value,
+    ctxt = (*cb)(elt, parent, level, tag.string, raw_value,
 		 tag.value, parsed_value);
-  else if (default_cb != NULL)
-    (*default_cb)(parent, level, tag.string, raw_value, tag.value);
+  else if (default_cb != NULL && parent != NULL)
+    (*default_cb)(elt, parent, level, tag.string, raw_value, tag.value);
   return ctxt;
 }
 
@@ -91,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,