X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Falvis.c;h=3f4754ef15d39584d76797b8d0ec90cc3b426a32;hb=1bf3c420dad254b9b0275f28541772e28197e19f;hp=9d4ff4c42e74c62709c7a48040a92b392f7a1ed7;hpb=7415d28c149c1bab51fe93aeaccdd14085b69bd9;p=idzebra-moved-to-github.git

diff --git a/index/alvis.c b/index/alvis.c
index 9d4ff4c..3f4754e 100644
--- a/index/alvis.c
+++ b/index/alvis.c
@@ -1,5 +1,5 @@
-/* $Id: alvis.c,v 1.1 2006-07-03 14:27:09 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: alvis.c,v 1.4 2006-11-03 23:17:08 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <stdio.h>
@@ -35,6 +35,10 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
 
+#if YAZ_HAVE_EXSLT
+#include <libexslt/exslt.h>
+#endif
+
 #include <idzebra/util.h>
 #include <idzebra/recctrl.h>
 
@@ -140,6 +144,10 @@ static void *filter_init(Res res, RecType recType)
     tinfo->doc = 0;
     tinfo->schemas = 0;
 
+#if YAZ_HAVE_EXSLT
+    exsltRegisterAll(); 
+#endif
+
 #if ENABLE_INPUT_CALLBACK
     xmlRegisterDefaultInputCallbacks();
     xmlRegisterInputCallbacks(zebra_xmlInputMatchCallback,
@@ -336,7 +344,7 @@ static void filter_destroy(void *clientData)
 static int ioread_ex(void *context, char *buffer, int len)
 {
     struct recExtractCtrl *p = context;
-    return (*p->readf)(p->fh, buffer, len);
+    return p->stream->readf(p->stream, buffer, len);
 }
 
 static int ioclose_ex(void *context)
@@ -555,7 +563,7 @@ static int filter_extract(void *clientData, struct recExtractCtrl *p)
 static int ioread_ret(void *context, char *buffer, int len)
 {
     struct recRetrieveCtrl *p = context;
-    return (*p->readf)(p->fh, buffer, len);
+    return p->stream->readf(p->stream, buffer, len);
 }
 
 static int ioclose_ret(void *context)