X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_absyn.c;h=83d44ae0c75cb4081a88c11a3678b790c8825f67;hb=4cea1b9769079a2cdc143f4fe483e69d5b77a813;hp=c7f8ba71d1ed2be2222a75d522e1a4e371c8381e;hpb=26a5a4b96b90361859cf856d6c41852b03ca2f84;p=idzebra-moved-to-github.git

diff --git a/data1/d1_absyn.c b/data1/d1_absyn.c
index c7f8ba7..83d44ae 100644
--- a/data1/d1_absyn.c
+++ b/data1/d1_absyn.c
@@ -1,5 +1,5 @@
-/* $Id: d1_absyn.c,v 1.6 2003-02-04 12:06:46 pop Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: d1_absyn.c,v 1.12 2004-09-28 10:15:02 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -27,11 +27,15 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <yaz/oid.h>
 #include <yaz/log.h>
-#include <data1.h>
+#include <idzebra/data1.h>
 #include <zebra_xpath.h>
+#include <d1_absyn.h>
 
 #define D1_MAX_NESTING  128
 
+#if PRIVATE_DATA1_ABSYN
+#endif
+
 struct data1_systag {
     char *name;
     char *value;
@@ -58,7 +62,7 @@ data1_absyn *data1_absyn_search (data1_handle dh, const char *name)
 
     while (p)
     {
-	if (!strcmp (name, p->name))
+	if (!yaz_matchstr (name, p->name))
 	    return p->absyn;
 	p = p->next;
     }
@@ -76,12 +80,15 @@ void data1_absyn_destroy (data1_handle dh)
     while (p)
     {
         data1_absyn *abs = p->absyn;
-        data1_xpelement *xpe = abs->xp_elements;
-        while (xpe) {
-            logf (LOG_DEBUG,"Destroy xp element %s",xpe->xpath_expr);
-            if (xpe->dfa) {  dfa_delete (&xpe->dfa); }
-            xpe = xpe->next;
-        } 
+	if (abs)
+	{
+	    data1_xpelement *xpe = abs->xp_elements;
+	    while (xpe) {
+		logf (LOG_DEBUG,"Destroy xp element %s",xpe->xpath_expr);
+		if (xpe->dfa) {  dfa_delete (&xpe->dfa); }
+		xpe = xpe->next;
+	    } 
+	}
         p = p->next;
     }
 }
@@ -130,7 +137,7 @@ data1_attset *data1_attset_search_name (data1_handle dh, const char *name)
 
     while (p)
     {
-	if (!strcmp (name, p->name))
+	if (!yaz_matchstr (name, p->name))
 	    return p->attset;
 	p = p->next;
     }
@@ -359,28 +366,57 @@ const char * mk_xpath_regexp (data1_handle dh, char *expr)
    pop, 2002-12-13
  */
 static int parse_termlists (data1_handle dh, data1_termlist ***tpp,
-			    char *p, const char *file, int lineno,
+			    char *cp, const char *file, int lineno,
 			    const char *element_name, data1_absyn *res,
 			    int xpelement)
 {
     data1_termlist **tp = *tpp;
-    do
+    while(1)
     {
 	char attname[512], structure[512];
 	char *source;
-	int r;
-	
-	if (!(r = sscanf(p, "%511[^:,]:%511[^,]", attname,
-			 structure)))
+	int r, i;
+	int level = 0;
+	structure[0] = '\0';
+	for (i = 0; cp[i] && i<sizeof(attname)-1; i++)
+	    if (strchr(":,", cp[i]))
+		break;
+	    else
+		attname[i] = cp[i];
+	if (i == 0)
 	{
-	    yaz_log(LOG_WARN,
-		    "%s:%d: Syntax error in termlistspec '%s'",
-		    file, lineno, p);
-	    return -1;
+	    if (*cp)
+		yaz_log(LOG_WARN,
+			"%s:%d: Syntax error in termlistspec '%s'",
+			file, lineno, cp);
+	    break;
 	}
+	attname[i] = '\0';
+	r = 1;
+	cp += i;
+	if (*cp == ':')
+	    cp++;
+
+	for (i = 0; cp[i] && i<sizeof(structure)-1; i++)
+	    if (level == 0 && strchr(",", cp[i]))
+		break;
+	    else
+	    {
+		structure[i] = cp[i];
+		if (cp[i] == '(')
+		    level++;
+		else if (cp[i] == ')')
+		    level--;
+	    }
+	structure[i] = '\0';
+	if (i)
+	    r = 2;
+	cp += i;
+	if (*cp)
+	    cp++;  /* skip , */
 
 	*tp = (data1_termlist *)
-	  nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
+	    nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
 	(*tp)->next = 0;
         
 	if (!xpelement) {
@@ -413,7 +449,7 @@ static int parse_termlists (data1_handle dh, data1_termlist ***tpp,
 		nmem_strdup (data1_nmem_get (dh), structure);
 	tp = &(*tp)->next;
     }
-    while ((p = strchr(p, ',')) && *(++p));
+
     *tpp = tp;
     return 0;
 }
@@ -469,6 +505,16 @@ int read_absyn_line(FILE *f, int *lineno, char *line, int len,
     return argc;
 }
 
+data1_marctab *data1_absyn_getmarctab(data1_handle dh, data1_absyn *absyn)
+{
+    return absyn->marc;
+}
+
+YAZ_EXPORT data1_element *data1_absyn_getelements(data1_handle dh,
+						  data1_absyn *absyn)
+{
+    return absyn->main_elements;
+}
 
 data1_absyn *data1_read_absyn (data1_handle dh, const char *file,
                                int file_must_exist)
@@ -665,7 +711,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 +747,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 +1004,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",