From 2bada0b20d0aca13e248d920070c7aa91cacc8f4 Mon Sep 17 00:00:00 2001 From: Marc Cromme Date: Thu, 15 Feb 2007 14:44:48 +0000 Subject: [PATCH] removed dead code pieces which are reminisences from the original alvis-style parsin and indexing stuff. Now only new dom indexing code is present. --- index/mod_dom.c | 146 +------------------------------------------------------ 1 file changed, 1 insertion(+), 145 deletions(-) diff --git a/index/mod_dom.c b/index/mod_dom.c index f4f5643..38ac3d4 100644 --- a/index/mod_dom.c +++ b/index/mod_dom.c @@ -1,4 +1,4 @@ -/* $Id: mod_dom.c,v 1.13 2007-02-15 14:33:41 marc Exp $ +/* $Id: mod_dom.c,v 1.14 2007-02-15 14:44:48 marc Exp $ Copyright (C) 1995-2007 Index Data ApS @@ -42,12 +42,6 @@ #include #include - - -/* Alvis style indexing */ -#define ZEBRA_SCHEMA_XSLT_NS "http://indexdata.dk/zebra/xslt/1" -static const char *zebra_xslt_ns = ZEBRA_SCHEMA_XSLT_NS; - /* DOM filter style indexing */ #define ZEBRA_DOM_NS "http://indexdata.com/zebra-2.0" static const char *zebra_dom_ns = ZEBRA_DOM_NS; @@ -664,144 +658,6 @@ static int ioclose_ex(void *context) } - -/* Alvis style indexing */ -static void index_cdata(struct filter_info *tinfo, struct recExtractCtrl *ctrl, - xmlNodePtr ptr, RecWord *recWord) -{ - for(; ptr; ptr = ptr->next) - { - index_cdata(tinfo, ctrl, ptr->children, recWord); - if (ptr->type != XML_TEXT_NODE) - continue; - recWord->term_buf = (const char *)ptr->content; - recWord->term_len = XML_STRLEN(ptr->content); - (*ctrl->tokenAdd)(recWord); - } -} - -/* Alvis style indexing */ -static void index_node(struct filter_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 || - XML_STRCMP(ptr->ns->href, zebra_xslt_ns)) - continue; - if (!XML_STRCMP(ptr->name, "index")) - { - 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 (attr_content(attr, "name", &name_str)) - ; - else if (attr_content(attr, "xpath", &xpath_str)) - ; - else if (attr_content(attr, "type", &type_str)) - ; - else - yaz_log(YLOG_WARN, "%s: dom filter: " - "bad attribute %s for ", - tinfo->fname, attr->name); - } - if (name_str) - { - /* save default type */ - int prev_type = recWord->index_type; - - /* type was given */ - if (type_str && *type_str) - recWord->index_type = *type_str; - - recWord->index_name = name_str; - index_cdata(tinfo, ctrl, ptr->children, recWord); - - /* restore it again */ - recWord->index_type = prev_type; - } - } - } -} - -/* Alvis style indexing */ -static void index_record(struct filter_info *tinfo,struct recExtractCtrl *ctrl, - xmlNodePtr ptr, RecWord *recWord) -{ - const char *type_str = "update"; - - if (ptr && ptr->type == XML_ELEMENT_NODE && ptr->ns && - !XML_STRCMP(ptr->ns->href, zebra_xslt_ns) - && !XML_STRCMP(ptr->name, "record")) - { - const char *id_str = 0; - const char *rank_str = 0; - struct _xmlAttr *attr; - for (attr = ptr->properties; attr; attr = attr->next) - { - if (attr_content(attr, "type", &type_str)) - ; - else if (attr_content(attr, "id", &id_str)) - ; - else if (attr_content(attr, "rank", &rank_str)) - ; - else - yaz_log(YLOG_WARN, "%s: dom filter: " - "bad attribute %s for ", - tinfo->fname, attr->name); - } - if (id_str) - sscanf(id_str, "%255s", ctrl->match_criteria); - - if (rank_str) - ctrl->staticrank = atozint(rank_str); - ptr = ptr->children; - } - - if (!strcmp("update", type_str)) - index_node(tinfo, ctrl, ptr, recWord); - else if (!strcmp("delete", type_str)) - yaz_log(YLOG_WARN, "%s dom filter: " - "delete: to be implemented"); - else - yaz_log(YLOG_WARN, "dom filter: " - "unknown record type '%s'", - type_str); -} - - -/* Alvis style indexing */ -static void extract_doc_alvis(struct filter_info *tinfo, - struct recExtractCtrl *extctr, - xmlDocPtr doc) -{ - if (doc){ - RecWord recWord; - xmlChar *buf_out; - int len_out; - xmlNodePtr root_ptr; - - (*extctr->init)(extctr, &recWord); - - if (extctr->flagShowRecords){ - xmlDocDumpMemory(doc, &buf_out, &len_out); - fwrite(buf_out, len_out, 1, stdout); - xmlFree(buf_out); - } - root_ptr = xmlDocGetRootElement(doc); - if (root_ptr) - index_record(tinfo, extctr, root_ptr, &recWord); - else - yaz_log(YLOG_WARN, "%s dom filter: " - "No root for index XML record"); - } -} - - /* DOM filter style indexing */ static int attr_content_xml(struct _xmlAttr *attr, const char *name, xmlChar **dst_content) -- 1.7.10.4