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

diff --git a/doc/installation.xml b/doc/installation.xml
index b5e7ac6..8a19a06 100644 (file)
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -25,13 +25,23 @@
 
    <variablelist>
     <varlistentry>
-     <term><ulink url="&url.yaz;">yaz</ulink>
+     <term><ulink url="&url.yaz;">&yaz;</ulink>
       (required)</term>
      <listitem>
       <para>
        &zebra; uses &yaz; to support <ulink url="&url.z39.50;">&acro.z3950;</ulink> / 
-       <ulink url="&url.sru;">&acro.sru;</ulink>.
-       Also the memory management utilites from &yaz; is used by &zebra;.
+       <ulink url="&url.sru;">&acro.sru;</ulink>.
+       Zebra also uses a lot of other utilities (not related to networking),
+       such as memory management and XML support.
+      </para>
+      <para>
+       For the <link linkend="record-model-domxml">DOM XML</link>
+       / <link linkend="record-model-alvisxslt">ALVIS</link>
+       record filters, &yaz; must be compiled with 
+       <ulink url="&url.libxml2;">Libxml2</ulink>
+       and
+       <ulink url="&url.libxslt;">Libxslt</ulink>
+       support and Libxml2 must be version 2.6.15 or later.
       </para>
      </listitem>
     </varlistentry>

diff --git a/examples/gils/Makefile.am b/examples/gils/Makefile.am
index a9e8127..eba7697 100644 (file)
--- a/examples/gils/Makefile.am
+++ b/examples/gils/Makefile.am
@@ -1,8 +1,16 @@
 
-EXTRA_DIST = zebra.cfg 
+gilsdatadir=$(datadir)/$(PACKAGE)$(PACKAGE_SUFFIX)-examples/gils
+       
+gilsdata_DATA = zebra.cfg
 
 clean:
-       rm -f *.mf *..LCK zebrasrv.pid
+       rm -f *.mf *.LCK zebrasrv.pid
+
+install-data-hook:
+       test -z "$(DESTDIR)$(gilsdatadir)/records" || $(MKDIR_P) "$(DESTDIR)$(gilsdatadir)/records"
+       for p in $(srcdir)/records/*.grs; do \
+                $(INSTALL_DATA) $$p $(DESTDIR)$(gilsdatadir)/records; \
+        done
 
 dist-hook:
        -mkdir $(distdir)/records

diff --git a/index/rpnsearch.c b/index/rpnsearch.c
index fc78870..0bbfdf1 100644 (file)
--- a/index/rpnsearch.c
+++ b/index/rpnsearch.c
@@ -203,7 +203,7 @@ static void esc_str(char *out_buf, size_t out_size,
     }
 }
 
-#define REGEX_CHARS " []()|.*+?!\"$"
+#define REGEX_CHARS " ^[]()|.*+?!\"$"
 
 static void add_non_space(const char *start, const char *end,
                           WRBUF term_dict,