Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra

diff --git a/NEWS b/NEWS
index 9954923..c18295b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+--- 2.0.41 2009/08/24
+
+Fix typos and other errors in the documentation. Thanks to Galen
+Charlton.
+
+Fix DOM filter so that full record ID (z:id) if given is used verbatim
+rather than truncated until first blank - in other words use memcpy
+rather than sscanf. For PI fix record attributes parsing which was
+completely broken.
+
 --- 2.0.40 2009/07/13
 
 Fixed problem in result set handling and segment handling.

diff --git a/configure.ac b/configure.ac
index e5171a9..8cf0f1e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl This file is part of the Zebra server.
 dnl   Copyright (C) 1994-2009 Index Data
 dnl
 AC_PREREQ(2.60)
-AC_INIT([idzebra],[2.0.40],[zebra-help@indexdata.dk])
+AC_INIT([idzebra],[2.0.41],[zebra-help@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE([1.9])

diff --git a/debian/changelog b/debian/changelog
index a5c0c38..532f693 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+idzebra (2.0.41-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 24 Aug 2009 14:39:22 +0200
+
 idzebra (2.0.40-1indexdata) unstable; urgency=low
 
   * Upstream.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 77e4ea9..b9c1df7 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -104,7 +104,7 @@ install-data-hook:
        cd $(DESTDIR)$(man1dir) && ln -sf idzebra-config$(PACKAGE_SUFFIX).1 idzebra-config.1
        if test -f index.html; then d=.; else d="$(srcdir)"; fi; \
        for p in $$d/*.html; do \
-               $(docDATA_INSTALL) $$p $(DESTDIR)$(docdir); \
+               $(INSTALL_DATA) $$p $(DESTDIR)$(docdir); \
        done
 
 uninstall-hook:

diff --git a/rset/rsprox.c b/rset/rsprox.c
index 896854e..6972828 100644 (file)
--- a/rset/rsprox.c
+++ b/rset/rsprox.c
@@ -194,10 +194,11 @@ static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf)
             }
             if (i == ct->no_children)
             {
-                memcpy (buf, p->buf[0], kctrl->key_size);
+                i = ct->no_children-1;
+                memcpy(buf, p->buf[i], kctrl->key_size);
                 if (term)
-                    *term = p->terms[0];
-                p->more[0] = rset_read (p->rfd[0], p->buf[0], &p->terms[0]);
+                    *term = p->terms[i];
+                p->more[i] = rset_read(p->rfd[i], p->buf[i], &p->terms[i]);
                 p->hits++;
                 return 1;
             }

diff --git a/test/api/test_search.c b/test/api/test_search.c
index b42d5ee..80e75d3 100644 (file)
--- a/test/api/test_search.c
+++ b/test/api/test_search.c
@@ -243,6 +243,24 @@ static void tst(int argc, char **argv)
     /* exl=0 distance=2 order=1 relation=2 (<=), known, unit=word */
     YAZ_CHECK(tl_query(zh, "@attr 1=1016 @prox 0 2 1 2 k 2 a y", 1));
 
+    /* exl=0 distance=1 order=1 relation=3 (=), known, unit=word */
+    YAZ_CHECK(tl_query(zh, "@attr 1=1016 @prox 0 1 1 3 k 2 a b", 1));
+
+    /* 3 term @prox test.. */
+    YAZ_CHECK(tl_query(zh, "@attr 1=1016 \"a b c\"", 1));
+
+    /* exl=0 distance=1 order=1 relation=2 (<=), known, unit=word */
+    /* right associative (does not work, so zero hits) */
+    YAZ_CHECK(tl_query(zh, "@attr 1=1016 @prox 0 1 1 2 k 2 a @prox 0 1 1 2 k 2 b c", 0));
+    /* left associative (works fine) */
+    YAZ_CHECK(tl_query(zh, "@attr 1=1016 @prox 0 1 1 2 k 2 @prox 0 1 1 2 k 2 a b c", 1));
+
+    /* exl=0 distance=1 order=1 relation=3 (=), known, unit=word *
+    /* right associative (does not work, so zero hits) */
+    YAZ_CHECK(tl_query(zh, "@attr 1=1016 @prox 0 1 1 3 k 2 a @prox 0 1 1 3 k 2 b c", 0));
+    /* left associative (works fine) */
+    YAZ_CHECK(tl_query(zh, "@attr 1=1016 @prox 0 1 1 3 k 2 @prox 0 1 1 3 k 2 a b c", 1));
+
     /* Non-indexed numeric use, but specified in bib1.att (bug #1142) */
     YAZ_CHECK(tl_query_x(zh, "@attr 1=1000 x", 0, 114));
     YAZ_CHECK(tl_query_x(zh, "@attr 1=1000 @attr 14=0 x", 0, 114));