X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Fregxread.c;h=299f2ef009d2dbd5775e531933eb9e05c1ff3371;hb=c7802a517bf6c79fefd72501e85f08f267c39ea9;hp=0662a1a0e847188c4d707cfba8e51d69f49a2ec2;hpb=0a76e10d0d8914522c3d54723250f8141e7ad13f;p=idzebra-moved-to-github.git

diff --git a/recctrl/regxread.c b/recctrl/regxread.c
index 0662a1a..299f2ef 100644
--- a/recctrl/regxread.c
+++ b/recctrl/regxread.c
@@ -4,7 +4,21 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: regxread.c,v $
- * Revision 1.30  1999-07-14 10:55:28  adam
+ * Revision 1.34  2000-11-29 14:24:01  adam
+ * Script configure uses yaz pthreads options. Added locking for
+ * zebra_register_{lock,unlock}.
+ *
+ * Revision 1.33  1999/11/30 13:48:04  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.32  1999/09/07 07:19:21  adam
+ * Work on character mapping. Implemented replace rules.
+ *
+ * Revision 1.31  1999/07/14 13:05:29  adam
+ * Tcl filter works with objects when TCL is version 8 or later; filter
+ * works with strings otherwise (slow).
+ *
+ * Revision 1.30  1999/07/14 10:55:28  adam
  * Fixed memory leak.
  *
  * Revision 1.29  1999/07/12 07:27:54  adam
@@ -185,13 +199,17 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <tpath.h>
+#include <yaz/tpath.h>
 #include <zebrautl.h>
 #include <dfa.h>
 #include "grsread.h"
 
 #if HAVE_TCL_H
 #include <tcl.h>
+
+#if MAJOR_VERSION >= 8
+#define HAVE_TCL_OBJECTS
+#endif
 #endif
 
 #define REGX_DEBUG 0
@@ -210,7 +228,7 @@
 
 struct regxCode {
     char *str;
-#if HAVE_TCL_H
+#if HAVE_TCL_OBJECTS
     Tcl_Obj *tcl_obj;
 #endif
 };
@@ -358,7 +376,7 @@ static void regxCodeDel (struct regxCode **pp)
     struct regxCode *p = *pp;
     if (p)
     {
-#if HAVE_TCL_H
+#if HAVE_TCL_OBJECTS
 	if (p->tcl_obj)
 	    Tcl_DecrRefCount (p->tcl_obj);
 #endif
@@ -376,7 +394,7 @@ static void regxCodeMk (struct regxCode **pp, const char *buf, int len)
     p->str = (char *) xmalloc (len+1);
     memcpy (p->str, buf, len);
     p->str[len] = '\0';
-#if HAVE_TCL_H
+#if HAVE_TCL_OBJECTS
     p->tcl_obj = Tcl_NewStringObj ((char *) buf, len);
     if (p->tcl_obj)
 	Tcl_IncrRefCount (p->tcl_obj);
@@ -506,7 +524,7 @@ static void lexSpecDestroy (struct lexSpec **pp)
 	lexContextDestroy (lt);
 	lt = lt_next;
     }
-#if HAVE_TCL_H
+#if HAVE_TCL_OBJECTS
     if (p->tcl_interp)
 	Tcl_DeleteInterp (p->tcl_interp);
 #endif
@@ -1018,9 +1036,9 @@ static void tagStrip (const char **tag, int *len)
 static void tagBegin (struct lexSpec *spec, 
                       const char *tag, int len)
 {
-    struct data1_node *parent = spec->d1_stack[spec->d1_level -1];
+    struct data1_node *parent;
     data1_element *elem = NULL;
-    data1_node *partag = get_parent_tag(spec->dh, parent);
+    data1_node *partag;
     data1_node *res;
     data1_element *e = NULL;
     int localtag = 0;
@@ -1031,11 +1049,12 @@ static void tagBegin (struct lexSpec *spec,
         return ;
     }
     tagStrip (&tag, &len);
+
+    parent = spec->d1_stack[spec->d1_level -1];
+    partag = get_parent_tag(spec->dh, parent);
    
-    res = data1_mk_node (spec->dh, spec->m);
+    res = data1_mk_node_type (spec->dh, spec->m, DATA1N_tag);
     res->parent = parent;
-    res->which = DATA1N_tag;
-    res->u.tag.get_bytes = -1;
 
     if (len >= DATA1_LOCALDATA)
 	res->u.tag.tag = (char *) nmem_malloc (spec->m, len+1);
@@ -1058,9 +1077,6 @@ static void tagBegin (struct lexSpec *spec,
 				      spec->d1_stack[0]->u.root.absyn,
 				      e, res->u.tag.tag);
     res->u.tag.element = elem;
-    res->u.tag.node_selected = 0;
-    res->u.tag.make_variantlist = 0;
-    res->u.tag.no_data_requested = 0;
     res->root = parent->root;
 
     parent->last_child = res;
@@ -1441,10 +1457,11 @@ static void execTcl (struct lexSpec *spec, struct regxCode *code)
 	    var_buf[var_len] = ch;
 	}
     }
-    if (code->tcl_obj)
-	ret = Tcl_GlobalEvalObj(spec->tcl_interp, code->tcl_obj);
-    else
-	ret = Tcl_GlobalEval (spec->tcl_interp, code->str);
+#if HAVE_TCL_OBJECTS
+    ret = Tcl_GlobalEvalObj(spec->tcl_interp, code->tcl_obj);
+#else
+    ret = Tcl_GlobalEval (spec->tcl_interp, code->str);
+#endif
     if (ret != TCL_OK)
     {
     	const char *err = Tcl_GetVar(spec->tcl_interp, "errorInfo", 0);