Full callback interface.

diff --git a/interface.c b/interface.c
index 038a7d541abc3abc249ef7013afe601913e4ea71..015c802bf82effdb1c34e736fbebc41f24242272 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -1,25 +1,50 @@
-#include "interface.h"
+/*  This program is free software; you can redistribute it and/or modify  *
+ *  it under the terms of the GNU General Public License as published by  *
+ *  the Free Software Foundation; either version 2 of the License, or     *
+ *  (at your option) any later version.                                   *
+
+ (C) 2001 by The Genes Development Team
+ Original author: Peter Verthez (Peter.Verthez@advalvas.be)
+*/
+
+/* $Id$ */
+/* $Name$ */
 
-Gedcom_rec_start_cb record_start_callback[] =
-  { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+#include "interface.h"
 
-Gedcom_rec_end_cb record_end_callback[] =
-  { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+static Gedcom_rec_start_cb record_start_callback [LAST_REC] = { NULL };
+static Gedcom_rec_end_cb   record_end_callback   [LAST_REC] = { NULL };
+static Gedcom_elt_start_cb element_start_callback[LAST_ELT] = { NULL };
+static Gedcom_elt_end_cb   element_end_callback  [LAST_ELT] = { NULL };
+static Gedcom_def_cb       default_cb                       = NULL;
 
+void gedcom_set_default_callback(Gedcom_def_cb func)
+{
+  default_cb = func;
+}
 
-void subscribe_to_record(Gedcom_rec rec,
-                        Gedcom_rec_start_cb cb_start,
-                        Gedcom_rec_end_cb cb_end)
+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;
 }
 
-Gedcom_ctxt start_record(Gedcom_rec rec, char *xreftag)
+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;
+}
+
+Gedcom_ctxt start_record(Gedcom_rec rec,
+                        int level, char *xref, char *tag)
 {
   Gedcom_rec_start_cb cb = record_start_callback[rec];
   if (cb != NULL)
-    return (*cb)(xreftag);
+    return (*cb)(level, xref, tag);
   else
     return NULL;
 }
@@ -33,16 +58,22 @@ 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,
-                         void *parsed_value)
+                         Gedcom_val parsed_value)
 {
-  printf("Start of element %d, parent context is %d\n", elt, (int)parent);
-  printf("  value is: %d %s %s\n", level, tag, raw_value);
-  return (Gedcom_ctxt)(elt+100);
+  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);
+  return ctxt;
 }
 
-void end_element(Gedcom_ctxt parent, Gedcom_ctxt self)
+void end_element(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self,
+                Gedcom_val parsed_value)
 {
-  printf("End of element, context is %d, parent context is %d\n",
-        (int)self, (int)parent);
+  Gedcom_elt_end_cb cb = element_end_callback[elt];
+  if (cb != NULL)
+    (*cb)(parent, self, parsed_value);
 }