X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Finterface.c;h=ac79bed8c7e45a8e3ddf9377b9a61c50f80cd340;hb=156c27bb04852eb8189994325d5f69691c1b869a;hp=c4db84bd4a05ae280b407a34fcabf312ab945d0d;hpb=8093e53a57e174b019f07760f5bf815271ceee9b;p=gedcom-parse.git

diff --git a/gedcom/interface.c b/gedcom/interface.c
index c4db84b..ac79bed 100644
--- a/gedcom/interface.c
+++ b/gedcom/interface.c
@@ -1,11 +1,22 @@
-/*  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.                                   *
+/* Implementation of the interface to applications.
+   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.
 
- (C) 2001 by The Genes Development Team
- Original author: Peter Verthez (Peter.Verthez@advalvas.be)
-*/
+   The Gedcom parser library is free software; you can redistribute it
+   and/or modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The Gedcom parser library is distributed in the hope that it will be
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the Gedcom parser library; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 /* $Id$ */
 /* $Name$ */
@@ -13,14 +24,16 @@
 #include "gedcom_internal.h"
 #include "interface.h"
 
-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;
+static Gedcom_rec_start_cb record_start_callback [NR_OF_RECS] = { NULL };
+static Gedcom_rec_end_cb   record_end_callback   [NR_OF_RECS] = { NULL };
+static Gedcom_elt_start_cb element_start_callback[NR_OF_ELTS] = { NULL };
+static Gedcom_elt_end_cb   element_end_callback  [NR_OF_ELTS] = { NULL };
+static Gedcom_def_cb       default_cb                         = NULL;
 
 void gedcom_set_default_callback(Gedcom_def_cb func)
 {
+  if (default_cb)
+    gedcom_error(_("Internal error: Duplicate registration for default callback"));
   default_cb = func;
 }
 
@@ -28,45 +41,56 @@ 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 (record_start_callback[rec] || record_end_callback[rec])
+    gedcom_error(_("Internal error: Duplicate registration for record type %d"), rec);
+  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 (element_start_callback[elt] || element_end_callback[elt])
+    gedcom_error(_("Internal error: Duplicate registration for element type %d"), elt);
+  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)(rec, level, xref, tag.string, raw_value, tag.value,
+		 parsed_value);
   else
     return NULL;
 }
 
-void end_record(Gedcom_rec rec, Gedcom_ctxt self)
+void end_record(Gedcom_rec rec, Gedcom_ctxt self, Gedcom_val parsed_value)
 {
   Gedcom_rec_end_cb cb = record_end_callback[rec];
   if (cb != NULL)
-    (*cb)(self);
+    (*cb)(rec, self, parsed_value);
 }
 
 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;
 }
 
@@ -75,6 +99,19 @@ 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);
 }
 
+const char* val_type_str[] = { N_("null value"),
+			       N_("character string"),
+			       N_("date"),
+			       N_("cross-reference") };
+
+void gedcom_cast_error(const char* file, int line,
+		       Gedcom_val_type tried_type,
+		       Gedcom_val_type real_type)
+{
+  gedcom_warning
+    (_("Wrong cast of value in file %s, at line %d: %s instead of %s"),
+     file, line, _(val_type_str[tried_type]), _(val_type_str[real_type]));
+}