Filter 'text' loadable as most other filter types. 'grs.sgml' always

static.

diff --git a/configure.ac b/configure.ac
index 44f15ba..36a2c3f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl Zebra, Index Data ApS, 1995-2006
-dnl $Id: configure.ac,v 1.36 2006-11-05 19:57:40 adam Exp $
+dnl $Id: configure.ac,v 1.37 2006-11-06 20:48:42 adam Exp $
 dnl
 AC_PREREQ(2.59)
-AC_INIT([idzebra],[2.0.4],[adam@indexdata.dk])
+AC_INIT([idzebra],[2.0.5],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE([1.8])
@@ -289,8 +289,8 @@ AC_DEFUN([ZEBRA_MODULE],[
        fi
        ])
 
-ZEBRA_MODULE(text,static,    [  --enable-mod-text       Text filter])
-ZEBRA_MODULE(grs-sgml,static,[  --enable-mod-grs-sgml   Simple SGML/XML filter])
+AC_DEFINE(IDZEBRA_STATIC_GRS_SGML)
+ZEBRA_MODULE(text,shared,    [  --enable-mod-text       Text filter])
 ZEBRA_MODULE(grs-regx,shared,[  --enable-mod-grs-regx   REGX/TCL filter])
 ZEBRA_MODULE(grs-marc,shared,[  --enable-mod-grs-marc   MARC filter])
 ZEBRA_MODULE(safari,shared,  [  --enable-mod-safari Safari filter (DBC)])

diff --git a/debian/changelog b/debian/changelog
index e76a0d8..d73c106 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
 idzebra (2.0.4-1) unstable; urgency=low
 
+  * Internal.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Mon,  6 Nov 2006 21:46:17 +0100
+
+idzebra (2.0.4-1) unstable; urgency=low
+
   * Upstream.
 
  -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 16 Oct 2006 13:02:45 +0200

diff --git a/debian/control b/debian/control
index a902bc0..1b3ef87 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Description: IDZebra virtual package (the works)
 Package: libidzebra-2.0-modules
 Section: libs
 Architecture: any
-Depends: libidzebra-2.0-mod-grs-xml, libidzebra-2.0-mod-grs-regx, libidzebra-2.0-mod-grs-marc, libidzebra-2.0-mod-alvis
+Depends: libidzebra-2.0-mod-grs-xml, libidzebra-2.0-mod-grs-regx, libidzebra-2.0-mod-grs-marc, libidzebra-2.0-mod-alvis, libidzebra-2.0-mod-text
 Description: IDZebra modules 
  This virtual package contains all base IDZebra filter modules.
  .
@@ -96,6 +96,19 @@ Description: IDZebra filter alvis (XSLT filter for XML)
  formats (eg. email, XML, MARC) and allows access to them through exact
  boolean search expressions and relevance-ranked free-text queries.
 
+Package: libidzebra-2.0-mod-text
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: IDZebra filter text
+ This package includes the a very simple text filter which indexes
+ all tokens in simple text.
+ .
+ IDZebra is a high-performance, general-purpose structured text indexing
+ and retrieval engine. It reads structured records in a variety of input
+ formats (eg. email, XML, MARC) and allows access to them through exact
+ boolean search expressions and relevance-ranked free-text queries.
+
 Package: libidzebra-2.0-mod-grs-marc
 Section: libs
 Architecture: any

diff --git a/debian/libidzebra-2.0-mod-text.install b/debian/libidzebra-2.0-mod-text.install
new file mode 100644 (file)
index 0000000..715baa5
--- /dev/null
+++ b/debian/libidzebra-2.0-mod-text.install
@@ -0,0 +1 @@
+usr/lib/idzebra-2.0/modules/mod-text.so

diff --git a/index/Makefile.am b/index/Makefile.am
index bf0c6bb..a9e9493 100644 (file)
--- a/index/Makefile.am
+++ b/index/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.56 2006-11-03 23:17:08 adam Exp $
+## $Id: Makefile.am,v 1.57 2006-11-06 20:48:43 adam Exp $
 
 aux_libs = \
  ../rset/libidzebra-rset.la \
@@ -45,20 +45,27 @@ mod_alvis_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_alvis_la_LADD =
 mod_alvis_la_LIBADD = $(zebralib) $(mod_alvis_la_LADD)
 
+mod_text_la_SOURCES = rectext.c
+mod_text_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
+mod_text_la_LADD =
+mod_text_la_LIBADD = $(zebralib) $(mod_text_la_LADD)
+
 modlib_LTLIBRARIES = $(SHARED_MODULE_LA) 
 EXTRA_LTLIBRARIES = \
        mod-grs-regx.la \
        mod-grs-xml.la \
        mod-grs-marc.la  \
        mod-safari.la \
-       mod-alvis.la
+       mod-alvis.la \
+       mod-text.la
 
 EXTRA_libidzebra_2_0_la_SOURCES = \
  $(mod_grs_regx_la_SOURCES) \
  $(mod_grs_xml_la_SOURCES) \
  $(mod_grs_marc_la_SOURCES) \
  $(mod_safari_la_SOURCES) \
- $(mod_alvis_la_SOURCES)
+ $(mod_alvis_la_SOURCES) \
+ $(mod_text_la_SOURCES)
 
 lib_LTLIBRARIES = $(zebralib)
 
@@ -69,7 +76,6 @@ libidzebra_2_0_la_SOURCES = \
   recctrl.c \
   recgrs.c \
   sgmlread.c \
-  rectext.c \
   attribute.c \
   compact.c \
   dir.c dirs.c \

diff --git a/index/recctrl.c b/index/recctrl.c
index beadf14..713880f 100644 (file)
--- a/index/recctrl.c
+++ b/index/recctrl.c
@@ -1,4 +1,4 @@
-/* $Id: recctrl.c,v 1.3 2006-10-11 08:55:52 adam Exp $
+/* $Id: recctrl.c,v 1.4 2006-11-06 20:48:43 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -109,14 +109,12 @@ RecTypeClass recTypeClass_create (Res res, NMEM nmem)
 #endif
 
 #ifdef IDZEBRA_STATIC_ALVIS
-#if HAVE_XSLT
     if (1)
     {
        extern RecType idzebra_filter_alvis[];
        recTypeClass_add (&rts, idzebra_filter_alvis, nmem, 0);
     }
 #endif
-#endif
 
     return rts;
 }