New function data1_concat_text that concatenates text nodes.

[idzebra-moved-to-github.git] / data1 / d1_absyn.c

diff --git a/data1/d1_absyn.c b/data1/d1_absyn.c
index c7f8ba7..12ea5d7 100644 (file)
--- a/data1/d1_absyn.c
+++ b/data1/d1_absyn.c
@@ -1,4 +1,4 @@
-/* $Id: d1_absyn.c,v 1.6 2003-02-04 12:06:46 pop Exp $
+/* $Id: d1_absyn.c,v 1.8 2003-03-01 22:45:37 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -665,7 +665,6 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file,
            int i;
            char *p, *xpath_expr, *termlists;
            const char *regexp;
-           int type, value;
            struct DFA *dfa = dfa = dfa_init();
            data1_termlist **tp;
             
@@ -702,10 +701,11 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file,
            cur_xpelement->dfa = dfa;
 
 #ifdef ENHANCED_XELM 
-            cur_xpelement->xpath_len = parse_xpath_str(xpath_expr, 
-                                                      cur_xpelement->xpath, 
-                                                      data1_nmem_get(dh));
-
+            cur_xpelement->xpath_len =
+                zebra_parse_xpath_str(xpath_expr, 
+                                      cur_xpelement->xpath, XPATH_STEP_COUNT,
+                                      data1_nmem_get(dh));
+            
            /*
            dump_xp_steps(cur_xpelement->xpath,cur_xpelement->xpath_len);
            */
@@ -958,7 +958,6 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file,
        }
         else if (!strcmp(cmd, "systag"))
         {
-            struct data1_systag *st;
             if (argc != 3)
             {
                yaz_log(LOG_WARN, "%s:%d: Bad # or args for systag",