Put local variables footer in all c, h files.
[idzebra-moved-to-github.git] / recctrl / xslt.c
index be771d3..cced009 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: xslt.c,v 1.8 2005-06-07 11:36:38 adam Exp $
+/* $Id: xslt.c,v 1.21 2006-05-10 08:13:31 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -25,37 +25,47 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <ctype.h>
 
 #include <yaz/diagbib1.h>
+#include <yaz/tpath.h>
+
 #include <libxml/xmlversion.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
+#include <libxml/xmlIO.h>
 #include <libxml/xmlreader.h>
 #include <libxslt/transform.h>
 
 #include <idzebra/util.h>
 #include <idzebra/recctrl.h>
 
-struct filter_schema {
+struct filter_xslt_schema {
     const char *name;
     const char *identifier;
     const char *stylesheet;
-    struct filter_schema *next;
+    struct filter_xslt_schema *next;
     const char *default_schema;
+    const char *include_snippet;
     xsltStylesheetPtr stylesheet_xsp;
 };
 
-struct filter_info {
+struct filter_xslt_info {
     xmlDocPtr doc;
     char *fname;
+    char *full_name;
+    const char *profile_path;
     const char *split_level;
     const char *split_path;
     ODR odr;
-    struct filter_schema *schemas;
+    struct filter_xslt_schema *schemas;
     xmlTextReaderPtr reader;
 };
 
-#define ZEBRA_INDEX_NS "http://indexdata.dk/zebra/indexing/1"
-#define ZEBRA_SCHEMA_IDENTITY_NS "http://indexdata.dk/zebra/identity/1"
-static const char *zebra_index_ns = ZEBRA_INDEX_NS;
+
+#define ZEBRA_SCHEMA_XSLT_NS "http://indexdata.dk/zebra/xslt/1"
+
+#define XML_STRCMP(a,b)   strcmp((char*)a, b)
+#define XML_STRLEN(a) strlen((char*)a)
+
+static const char *zebra_xslt_ns = ZEBRA_SCHEMA_XSLT_NS;
 
 static void set_param_xml(const char **params, const char *name,
                          const char *value, ODR odr)
@@ -91,46 +101,73 @@ static void set_param_int(const char **params, const char *name,
     params[2] = 0;
 }
 
+#define ENABLE_INPUT_CALLBACK 0
+
+#if ENABLE_INPUT_CALLBACK
+static int zebra_xmlInputMatchCallback (char const *filename)
+{
+    yaz_log(YLOG_LOG, "match %s", filename);
+    return 0;
+}
+
+static void * zebra_xmlInputOpenCallback (char const *filename)
+{
+    return 0;
+}
+
+static int zebra_xmlInputReadCallback (void * context, char * buffer, int len)
+{
+    return 0;
+}
 
-static void *filter_init_xslt(Res res, RecType recType)
+static int zebra_xmlInputCloseCallback (void * context)
 {
-    struct filter_info *tinfo = (struct filter_info *) xmalloc(sizeof(*tinfo));
+    return 0;
+}
+#endif
+
+static void *filter_init(Res res, RecType recType)
+{
+    struct filter_xslt_info *tinfo 
+      = (struct filter_xslt_info *) xmalloc(sizeof(*tinfo));
     tinfo->reader = 0;
     tinfo->fname = 0;
+    tinfo->full_name = 0;
+    tinfo->profile_path = 0;
     tinfo->split_level = 0;
     tinfo->split_path = 0;
     tinfo->odr = odr_createmem(ODR_ENCODE);
     tinfo->doc = 0;
     tinfo->schemas = 0;
-    return tinfo;
-}
 
-static void *filter_init_xslt1(Res res, RecType recType)
-{
-    struct filter_info *tinfo = (struct filter_info *)
-       filter_init_xslt(res, recType);
-    tinfo->split_level = "1";
+#if ENABLE_INPUT_CALLBACK
+    xmlRegisterDefaultInputCallbacks();
+    xmlRegisterInputCallbacks(zebra_xmlInputMatchCallback,
+                             zebra_xmlInputOpenCallback,
+                             zebra_xmlInputReadCallback,
+                             zebra_xmlInputCloseCallback);
+#endif
     return tinfo;
 }
 
 static int attr_content(struct _xmlAttr *attr, const char *name,
                        const char **dst_content)
 {
-    if (!strcmp(attr->name, name) && attr->children &&
+    if (!XML_STRCMP(attr->name, name) && attr->children &&
        attr->children->type == XML_TEXT_NODE)
     {
-       *dst_content = attr->children->content;
+       *dst_content = (const char *)(attr->children->content);
        return 1;
     }
     return 0;
 }
 
-static void destroy_schemas(struct filter_info *tinfo)
+static void destroy_schemas(struct filter_xslt_info *tinfo)
 {
-    struct filter_schema *schema = tinfo->schemas;
+    struct filter_xslt_schema *schema = tinfo->schemas;
     while (schema)
     {
-       struct filter_schema *schema_next = schema->next;
+       struct filter_xslt_schema *schema_next = schema->next;
        if (schema->stylesheet_xsp)
            xsltFreeStylesheet(schema->stylesheet_xsp);
        xfree(schema);
@@ -143,31 +180,54 @@ static void destroy_schemas(struct filter_info *tinfo)
     tinfo->doc = 0;
 }
 
-static ZEBRA_RES create_schemas(struct filter_info *tinfo, const char *fname)
+static ZEBRA_RES create_schemas(struct filter_xslt_info *tinfo, 
+                                const char *fname)
 {
+    char tmp_full_name[1024];
     xmlNodePtr ptr;
     tinfo->fname = xstrdup(fname);
-    tinfo->doc = xmlParseFile(tinfo->fname);
-    if (!tinfo->doc)
-       return ZEBRA_FAIL;
+
+    if (yaz_filepath_resolve(tinfo->fname, tinfo->profile_path, 
+                             NULL, tmp_full_name))
+      tinfo->full_name = xstrdup(tmp_full_name);
+    else
+      tinfo->full_name = xstrdup(tinfo->fname);
+
+    yaz_log(YLOG_LOG, "xslt filter: loading config file %s", tinfo->full_name);
+
+    tinfo->doc = xmlParseFile(tinfo->full_name);
+    if (!tinfo->doc) {
+      yaz_log(YLOG_WARN, "xslt filter: could not parse config file %s", 
+              tinfo->full_name);
+      return ZEBRA_FAIL;
+    }
+
     ptr = xmlDocGetRootElement(tinfo->doc);
     if (!ptr || ptr->type != XML_ELEMENT_NODE ||
-       strcmp(ptr->name, "schemaInfo"))
-       return ZEBRA_FAIL;
+       XML_STRCMP(ptr->name, "schemaInfo")){
+          yaz_log(YLOG_WARN, 
+                  "xslt filter:  config file %s :" 
+                  " expected root element <schemaInfo>", 
+              tinfo->full_name);  
+      return ZEBRA_FAIL;
+    }
+    
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
        if (ptr->type != XML_ELEMENT_NODE)
            continue;
-       if (!strcmp(ptr->name, "schema"))
+       if (!XML_STRCMP(ptr->name, "schema"))
        {
+            char tmp_xslt_full_name[1024];
            struct _xmlAttr *attr;
-           struct filter_schema *schema = xmalloc(sizeof(*schema));
+           struct filter_xslt_schema *schema = xmalloc(sizeof(*schema));
            schema->name = 0;
            schema->identifier = 0;
            schema->stylesheet = 0;
            schema->default_schema = 0;
            schema->next = tinfo->schemas;
            schema->stylesheet_xsp = 0;
+           schema->include_snippet = 0;
            tinfo->schemas = schema;
            for (attr = ptr->properties; attr; attr = attr->next)
            {
@@ -175,13 +235,21 @@ static ZEBRA_RES create_schemas(struct filter_info *tinfo, const char *fname)
                attr_content(attr, "name", &schema->name);
                attr_content(attr, "stylesheet", &schema->stylesheet);
                attr_content(attr, "default", &schema->default_schema);
+               attr_content(attr, "snippet", &schema->include_snippet);
            }
-           if (schema->stylesheet)
-               schema->stylesheet_xsp =
-                   xsltParseStylesheetFile(
-                       (const xmlChar*) schema->stylesheet);
+           if (schema->stylesheet){
+              yaz_filepath_resolve(schema->stylesheet, tinfo->profile_path, 
+                                   NULL, tmp_xslt_full_name);
+              schema->stylesheet_xsp 
+                = xsltParseStylesheetFile((const xmlChar*) tmp_xslt_full_name);
+              if (!schema->stylesheet_xsp)
+                yaz_log(YLOG_WARN, 
+                        "xslt filter: could not parse xslt stylesheet %s", 
+                        tmp_xslt_full_name);
+            }
+            
        }
-       else if (!strcmp(ptr->name, "split"))
+       else if (!XML_STRCMP(ptr->name, "split"))
        {
            struct _xmlAttr *attr;
            for (attr = ptr->properties; attr; attr = attr->next)
@@ -199,10 +267,10 @@ static ZEBRA_RES create_schemas(struct filter_info *tinfo, const char *fname)
     return ZEBRA_OK;
 }
 
-static struct filter_schema *lookup_schema(struct filter_info *tinfo,
+static struct filter_xslt_schema *lookup_schema(struct filter_xslt_info *tinfo,
                                           const char *est)
 {
-    struct filter_schema *schema;
+    struct filter_xslt_schema *schema;
     for (schema = tinfo->schemas; schema; schema = schema->next)
     {
        if (est)
@@ -218,20 +286,30 @@ static struct filter_schema *lookup_schema(struct filter_info *tinfo,
     return 0;
 }
 
-static void filter_config(void *clientData, Res res, const char *args)
+static ZEBRA_RES filter_config(void *clientData, Res res, const char *args)
 {
-    struct filter_info *tinfo = clientData;
-    if (!args || !*args)
-       args = "xsltfilter.xml";
+    struct filter_xslt_info *tinfo = clientData;
+    if (!args || !*args){
+      yaz_log(YLOG_WARN, "xslt filter: need config file");
+      return ZEBRA_FAIL;
+    }
+
     if (tinfo->fname && !strcmp(args, tinfo->fname))
-       return;
+       return ZEBRA_OK;
+    
+    tinfo->profile_path 
+      /* = res_get_def(res, "profilePath", DEFAULT_PROFILE_PATH); */
+      = res_get(res, "profilePath");
+    yaz_log(YLOG_LOG, "xslt filter: profilePath %s", tinfo->profile_path);
+
     destroy_schemas(tinfo);
     create_schemas(tinfo, args);
+    return ZEBRA_OK;
 }
 
 static void filter_destroy(void *clientData)
 {
-    struct filter_info *tinfo = clientData;
+    struct filter_xslt_info *tinfo = clientData;
     destroy_schemas(tinfo);
     if (tinfo->reader)
        xmlFreeTextReader(tinfo->reader);
@@ -250,53 +328,89 @@ static int ioclose_ex(void *context)
     return 0;
 }
 
-static void index_field(struct filter_info *tinfo, struct recExtractCtrl *ctrl,
+static void index_cdata(struct filter_xslt_info *tinfo, struct recExtractCtrl *ctrl,
                        xmlNodePtr ptr, RecWord *recWord)
 {
     for(; ptr; ptr = ptr->next)
     {
-       index_field(tinfo, ctrl, ptr->children, recWord);
+       index_cdata(tinfo, ctrl, ptr->children, recWord);
        if (ptr->type != XML_TEXT_NODE)
            continue;
-       recWord->term_buf = ptr->content;
-       recWord->term_len = strlen(ptr->content);
+       recWord->term_buf = (const char *)ptr->content;
+       recWord->term_len = XML_STRLEN(ptr->content);
        (*ctrl->tokenAdd)(recWord);
     }
 }
 
-static void index_node(struct filter_info *tinfo,  struct recExtractCtrl *ctrl,
+static void index_node(struct filter_xslt_info *tinfo,  struct recExtractCtrl *ctrl,
                       xmlNodePtr ptr, RecWord *recWord)
 {
     for(; ptr; ptr = ptr->next)
     {
        index_node(tinfo, ctrl, ptr->children, recWord);
        if (ptr->type != XML_ELEMENT_NODE || !ptr->ns ||
-           strcmp(ptr->ns->href, zebra_index_ns))
+           XML_STRCMP(ptr->ns->href, zebra_xslt_ns))
            continue;
-       if (!strcmp(ptr->name, "index"))
+       if (!XML_STRCMP(ptr->name, "index"))
        {
-           char *field_str = 0;
+           const char *name_str = 0;
+           const char *type_str = 0;
            const char *xpath_str = 0;
            struct _xmlAttr *attr;
            for (attr = ptr->properties; attr; attr = attr->next)
            {
-               if (!strcmp(attr->name, "field") 
-                   && attr->children && attr->children->type == XML_TEXT_NODE)
-                   field_str = attr->children->content;
-               if (!strcmp(attr->name, "xpath") 
-                   && attr->children && attr->children->type == XML_TEXT_NODE)
-                   xpath_str = attr->children->content;
+               attr_content(attr, "name", &name_str);
+               attr_content(attr, "xpath", &xpath_str);
+               attr_content(attr, "type", &type_str);
            }
-           if (field_str)
+           if (name_str)
            {
-               recWord->attrStr = field_str;
-               index_field(tinfo, ctrl, ptr->children, recWord);
+               int prev_type = recWord->index_type; /* save default type */
+
+               if (type_str && *type_str)
+                   recWord->index_type = *type_str; /* type was given */
+               recWord->index_name = name_str;
+               index_cdata(tinfo, ctrl, ptr->children, recWord);
+
+               recWord->index_type = prev_type;     /* restore it again */
            }
        }
     }
 }
 
-static int extract_doc(struct filter_info *tinfo, struct recExtractCtrl *p,
+static void index_record(struct filter_xslt_info *tinfo,struct recExtractCtrl *ctrl,
+                        xmlNodePtr ptr, RecWord *recWord)
+{
+    if (ptr && ptr->type == XML_ELEMENT_NODE && ptr->ns &&
+       !XML_STRCMP(ptr->ns->href, zebra_xslt_ns)
+       && !XML_STRCMP(ptr->name, "record"))
+    {
+       const char *type_str = "update";
+       const char *id_str = 0;
+       const char *rank_str = 0;
+       struct _xmlAttr *attr;
+       for (attr = ptr->properties; attr; attr = attr->next)
+       {
+           attr_content(attr, "type", &type_str);
+           attr_content(attr, "id", &id_str);
+           attr_content(attr, "rank", &rank_str);
+       }
+       if (id_str)
+           sscanf(id_str, "%255s", ctrl->match_criteria);
+       if (rank_str)
+       {
+           ctrl->staticrank = atoi(rank_str);
+           yaz_log(YLOG_LOG, "rank=%d",ctrl->staticrank);
+       }
+       else
+           yaz_log(YLOG_LOG, "no rank");
+       
+       ptr = ptr->children;
+    }
+    index_node(tinfo, ctrl, ptr, recWord);
+}
+    
+static int extract_doc(struct filter_xslt_info *tinfo, struct recExtractCtrl *p,
                       xmlDocPtr doc)
 {
     RecWord recWord;
@@ -304,16 +418,16 @@ static int extract_doc(struct filter_info *tinfo, struct recExtractCtrl *p,
     xmlChar *buf_out;
     int len_out;
 
-    struct filter_schema *schema = lookup_schema(tinfo, ZEBRA_INDEX_NS);
+    struct filter_xslt_schema *schema = lookup_schema(tinfo, zebra_xslt_ns);
 
     params[0] = 0;
-    set_param_str(params, "schema", ZEBRA_INDEX_NS, tinfo->odr);
+    set_param_str(params, "schema", zebra_xslt_ns, tinfo->odr);
 
     (*p->init)(p, &recWord);
-    recWord.reg_type = 'w';
 
     if (schema && schema->stylesheet_xsp)
     {
+       xmlNodePtr root_ptr;
        xmlDocPtr resDoc = 
            xsltApplyStylesheet(schema->stylesheet_xsp,
                                doc, params);
@@ -323,7 +437,15 @@ static int extract_doc(struct filter_info *tinfo, struct recExtractCtrl *p,
            fwrite(buf_out, len_out, 1, stdout);
            xmlFree(buf_out);
        }
-       index_node(tinfo, p, xmlDocGetRootElement(resDoc), &recWord);
+       root_ptr = xmlDocGetRootElement(resDoc);
+       if (root_ptr)
+           index_record(tinfo, p, root_ptr, &recWord);
+       else
+       {
+           yaz_log(YLOG_WARN, "No root for index XML record."
+                   " split_level=%s stylesheet=%s",
+                   tinfo->split_level, schema->stylesheet);
+       }
        xmlFreeDoc(resDoc);
     }
     xmlDocDumpMemory(doc, &buf_out, &len_out);
@@ -336,7 +458,7 @@ static int extract_doc(struct filter_info *tinfo, struct recExtractCtrl *p,
     return RECCTRL_EXTRACT_OK;
 }
 
-static int extract_split(struct filter_info *tinfo, struct recExtractCtrl *p)
+static int extract_split(struct filter_xslt_info *tinfo, struct recExtractCtrl *p)
 {
     int ret;
     int split_depth = 0;
@@ -365,12 +487,12 @@ static int extract_split(struct filter_info *tinfo, struct recExtractCtrl *p)
        {
            xmlNodePtr ptr = xmlTextReaderExpand(tinfo->reader);
            xmlNodePtr ptr2 = xmlCopyNode(ptr, 1);
-           xmlDocPtr doc = xmlNewDoc("1.0");
+           xmlDocPtr doc = xmlNewDoc((const xmlChar*) "1.0");
 
            xmlDocSetRootElement(doc, ptr2);
 
-           return extract_doc(tinfo, p, doc);      
-       }
+           return extract_doc(tinfo, p, doc);   
+       }
        ret = xmlTextReaderRead(tinfo->reader);
     }
     xmlFreeTextReader(tinfo->reader);
@@ -378,7 +500,7 @@ static int extract_split(struct filter_info *tinfo, struct recExtractCtrl *p)
     return RECCTRL_EXTRACT_EOF;
 }
 
-static int extract_full(struct filter_info *tinfo, struct recExtractCtrl *p)
+static int extract_full(struct filter_xslt_info *tinfo, struct recExtractCtrl *p)
 {
     if (p->first_record) /* only one record per stream */
     {
@@ -398,7 +520,7 @@ static int extract_full(struct filter_info *tinfo, struct recExtractCtrl *p)
 
 static int filter_extract(void *clientData, struct recExtractCtrl *p)
 {
-    struct filter_info *tinfo = clientData;
+    struct filter_xslt_info *tinfo = clientData;
 
     odr_reset(tinfo->odr);
 
@@ -422,44 +544,46 @@ static int ioclose_ret(void *context)
 }
 
 
-static const char *snippet_doc(struct recRetrieveCtrl *p)
+static const char *snippet_doc(struct recRetrieveCtrl *p, int text_mode,
+                              int window_size)
 {
     const char *xml_doc_str;
     int ord = 0;
     WRBUF wrbuf = wrbuf_alloc();
     zebra_snippets *res = 
-       zebra_snippets_window(p->doc_snippet, p->hit_snippet, 10);
+       zebra_snippets_window(p->doc_snippet, p->hit_snippet, window_size);
     zebra_snippet_word *w = zebra_snippets_list(res);
 
-#if 1
-    wrbuf_printf(wrbuf, "\'");
-#else
-    wrbuf_printf(wrbuf, "<snippet>\n");
-#endif
+    if (text_mode)
+       wrbuf_printf(wrbuf, "\'");
+    else
+       wrbuf_printf(wrbuf, "<snippet xmlns='%s'>\n", zebra_xslt_ns);
     for (; w; w = w->next)
     {
        if (ord == 0)
            ord = w->ord;
        else if (ord != w->ord)
+
            break;
-#if 1
-       wrbuf_printf(wrbuf, "%s%s%s ", 
-                    w->match ? "*" : "",
-                    w->term,
-                    w->match ? "*" : "");
-#else
-       wrbuf_printf(wrbuf, " <term %s ord='%d' seqno='%d'>", 
-                    (w->match ? "match='1'" : ""),
-                    w->ord, w->seqno);
-       wrbuf_xmlputs(wrbuf, w->term);
-       wrbuf_printf(wrbuf, "</term>\n");
-#endif
+       if (text_mode)
+           wrbuf_printf(wrbuf, "%s%s%s ", 
+                        w->match ? "*" : "",
+                        w->term,
+                        w->match ? "*" : "");
+       else
+       {
+           wrbuf_printf(wrbuf, " <term ord='%d' seqno='" ZINT_FORMAT "' %s>", 
+                        w->ord, w->seqno,
+                        (w->match ? "match='1'" : ""));
+           wrbuf_xmlputs(wrbuf, w->term);
+           wrbuf_printf(wrbuf, "</term>\n");
+       }
     }
-#if 1
-    wrbuf_printf(wrbuf, "\'");
-#else
-    wrbuf_printf(wrbuf, "</snippet>\n");
-#endif
+    if (text_mode)
+       wrbuf_printf(wrbuf, "\'");
+    else
+       wrbuf_printf(wrbuf, "</snippet>\n");
+
     xml_doc_str = odr_strdup(p->odr, wrbuf_buf(wrbuf));
 
     zebra_snippets_destroy(res);
@@ -469,22 +593,28 @@ static const char *snippet_doc(struct recRetrieveCtrl *p)
 
 static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
 {
-    const char *esn = ZEBRA_SCHEMA_IDENTITY_NS;
-    const char *params[10];
-    struct filter_info *tinfo = clientData;
+    const char *esn = zebra_xslt_ns;
+    const char *params[20];
+    struct filter_xslt_info *tinfo = clientData;
     xmlDocPtr resDoc;
     xmlDocPtr doc;
-    struct filter_schema *schema;
+    struct filter_xslt_schema *schema;
+    int window_size = -1;
 
     if (p->comp)
     {
-       if (p->comp->which != Z_RecordComp_simple
-           || p->comp->u.simple->which != Z_ElementSetNames_generic)
+       if (p->comp->which == Z_RecordComp_simple
+           && p->comp->u.simple->which == Z_ElementSetNames_generic)
        {
-           p->diagnostic = YAZ_BIB1_PRESENT_COMP_SPEC_PARAMETER_UNSUPP;
-           return 0;
+           esn = p->comp->u.simple->u.generic;
+       }
+       else if (p->comp->which == Z_RecordComp_complex 
+                && p->comp->u.complex->generic->elementSpec
+                && p->comp->u.complex->generic->elementSpec->which ==
+                Z_ElementSpec_elementSetName)
+       {
+           esn = p->comp->u.complex->generic->elementSpec->u.elementSetName;
        }
-       esn = p->comp->u.simple->u.generic;
     }
     schema = lookup_schema(tinfo, esn);
     if (!schema)
@@ -494,15 +624,23 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
        return 0;
     }
 
+    if (schema->include_snippet)
+       window_size = atoi(schema->include_snippet);
+
     params[0] = 0;
-    set_param_str(params, "schema", esn, p->odr);
+    set_param_int(params, "id", p->localno, p->odr);
     if (p->fname)
        set_param_str(params, "filename", p->fname, p->odr);
+    if (p->staticrank >= 0)
+       set_param_int(params, "rank", p->staticrank, p->odr);
+    set_param_str(params, "schema", esn, p->odr);
     if (p->score >= 0)
        set_param_int(params, "score", p->score, p->odr);
     set_param_int(params, "size", p->recordSize, p->odr);
-    
-    set_param_xml(params, "snippet", snippet_doc(p), p->odr);
+
+    if (window_size >= 0)
+       set_param_xml(params, "snippet", snippet_doc(p, 1, window_size),
+                     p->odr);
     doc = xmlReadIO(ioread_ret, ioclose_ret, p /* I/O handler */,
                    0 /* URL */,
                    0 /* encoding */,
@@ -513,6 +651,13 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
        return 0;
     }
 
+    if (window_size >= 0)
+    {
+       xmlNodePtr node = xmlDocGetRootElement(doc);
+       const char *snippet_str = snippet_doc(p, 0, window_size);
+       xmlDocPtr snippet_doc = xmlParseMemory(snippet_str, strlen(snippet_str));
+       xmlAddChild(node, xmlDocGetRootElement(snippet_doc));
+    }
     if (!schema->stylesheet_xsp)
        resDoc = doc;
     else
@@ -559,20 +704,10 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
     return 0;
 }
 
-static struct recType filter_type_xslt = {
+static struct recType filter_type = {
     0,
     "xslt",
-    filter_init_xslt,
-    filter_config,
-    filter_destroy,
-    filter_extract,
-    filter_retrieve
-};
-
-static struct recType filter_type_xslt1 = {
-    0,
-    "xslt1",
-    filter_init_xslt1,
+    filter_init,
     filter_config,
     filter_destroy,
     filter_extract,
@@ -587,9 +722,14 @@ idzebra_filter
 #endif
 
 [] = {
-    &filter_type_xslt,
-#ifdef LIBXML_READER_ENABLED
-    &filter_type_xslt1,
-#endif
+    &filter_type,
     0,
 };
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+