X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_absyn.c;h=1df3e3f76c87d9ce72e40e6782eba3cc2b798c3e;hb=f7a3769dede0071696bdcc13ae2ee1efe6d52d96;hp=34c4dd15c8949b45a578083ff44c6ab4fccd4815;hpb=69983aaec470e41649c4dfae8a9e7cbcf061cacf;p=idzebra-moved-to-github.git

diff --git a/data1/d1_absyn.c b/data1/d1_absyn.c
index 34c4dd1..1df3e3f 100644
--- a/data1/d1_absyn.c
+++ b/data1/d1_absyn.c
@@ -1,4 +1,4 @@
-/* $Id: d1_absyn.c,v 1.21 2005-06-29 16:52:26 adam Exp $
+/* $Id: d1_absyn.c,v 1.24 2006-05-10 08:13:17 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -443,7 +443,6 @@ static const char * mk_xpath_regexp (data1_handle dh, const char *expr)
 {
     const char *p = expr;
     int abs = 1;
-    int i;
     int e = 0;
     char *stack[32];
     char *res_p, *res = 0;
@@ -461,7 +460,7 @@ static const char * mk_xpath_regexp (data1_handle dh, const char *expr)
     {
 	int is_predicate = 0;
 	char *s;
-	int j;
+	int i, j;
         for (i = 0; *p && !strchr("/",*p); i++, p++)
 	    ;
 	res_size += (i+3); /* we'll add / between later .. */
@@ -490,8 +489,10 @@ static const char * mk_xpath_regexp (data1_handle dh, const char *expr)
     }
     res_p = res = nmem_malloc(data1_nmem_get(dh), res_size + 10);
 
-    i = 0;
-    sprintf(res_p, ".*/");
+    if (stack[e-1][0] == '@')  /* path/@attr spec (leaf is attribute) */
+	strcpy(res_p, "/");
+    else
+	strcpy(res_p, "[^@]*/");  /* path .. (index all cdata below it) */
     res_p = res_p + strlen(res_p);
     while (--e >= 0) {
 	sprintf(res_p, "%s/", stack[e]);
@@ -1226,3 +1227,11 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file,
     yaz_log(YLOG_DEBUG, "%s: data1_read_absyn end", file);
     return res;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+