X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=recctrl%2Fxslt.c;h=6787510d478a003810ab6dce1f48205a5596730e;hb=6dfee19bc1cec29ff5ec5e9cd8021d1354a6126e;hp=ab7a18e3ce2ab28909ba294bdb0573e16df71f88;hpb=9eebf93dc2525854867cbc43920ea8ba4a199ab5;p=idzebra-moved-to-github.git diff --git a/recctrl/xslt.c b/recctrl/xslt.c index ab7a18e..6787510 100644 --- a/recctrl/xslt.c +++ b/recctrl/xslt.c @@ -1,4 +1,4 @@ -/* $Id: xslt.c,v 1.11 2005-06-23 06:45:47 adam Exp $ +/* $Id: xslt.c,v 1.17 2005-08-24 08:30:37 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -57,6 +57,9 @@ struct filter_info { #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, @@ -93,34 +96,32 @@ static void set_param_int(const char **params, const char *name, params[2] = 0; } +#define ENABLE_INPUT_CALLBACK 0 -int zebra_xmlInputMatchCallback (char const *filename) +#if ENABLE_INPUT_CALLBACK +static int zebra_xmlInputMatchCallback (char const *filename) { yaz_log(YLOG_LOG, "match %s", filename); return 0; } - -void * zebra_xmlInputOpenCallback (char const *filename) +static void * zebra_xmlInputOpenCallback (char const *filename) { return 0; } -int zebra_xmlInputReadCallback (void * context, char * buffer, int len) +static int zebra_xmlInputReadCallback (void * context, char * buffer, int len) { return 0; } -int zebra_xmlInputCloseCallback (void * context) +static int zebra_xmlInputCloseCallback (void * context) { return 0; } +#endif - - - - -static void *filter_init_xslt(Res res, RecType recType) +static void *filter_init(Res res, RecType recType) { struct filter_info *tinfo = (struct filter_info *) xmalloc(sizeof(*tinfo)); tinfo->reader = 0; @@ -131,7 +132,7 @@ static void *filter_init_xslt(Res res, RecType recType) tinfo->doc = 0; tinfo->schemas = 0; -#if 0 +#if ENABLE_INPUT_CALLBACK xmlRegisterDefaultInputCallbacks(); xmlRegisterInputCallbacks(zebra_xmlInputMatchCallback, zebra_xmlInputOpenCallback, @@ -141,21 +142,13 @@ static void *filter_init_xslt(Res res, RecType recType) 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"; - 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; @@ -188,13 +181,13 @@ static ZEBRA_RES create_schemas(struct filter_info *tinfo, const char *fname) return ZEBRA_FAIL; ptr = xmlDocGetRootElement(tinfo->doc); if (!ptr || ptr->type != XML_ELEMENT_NODE || - strcmp(ptr->name, "schemaInfo")) + XML_STRCMP(ptr->name, "schemaInfo")) 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")) { struct _xmlAttr *attr; struct filter_schema *schema = xmalloc(sizeof(*schema)); @@ -219,7 +212,7 @@ static ZEBRA_RES create_schemas(struct filter_info *tinfo, const char *fname) xsltParseStylesheetFile( (const xmlChar*) schema->stylesheet); } - else if (!strcmp(ptr->name, "split")) + else if (!XML_STRCMP(ptr->name, "split")) { struct _xmlAttr *attr; for (attr = ptr->properties; attr; attr = attr->next) @@ -296,8 +289,8 @@ static void index_cdata(struct filter_info *tinfo, struct recExtractCtrl *ctrl, 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); } } @@ -309,25 +302,19 @@ static void index_node(struct filter_info *tinfo, struct recExtractCtrl *ctrl, { index_node(tinfo, ctrl, ptr->children, recWord); if (ptr->type != XML_ELEMENT_NODE || !ptr->ns || - strcmp(ptr->ns->href, zebra_xslt_ns)) + XML_STRCMP(ptr->ns->href, zebra_xslt_ns)) continue; - if (!strcmp(ptr->name, "index")) + if (!XML_STRCMP(ptr->name, "index")) { - char *name_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, "name") - && attr->children && attr->children->type == XML_TEXT_NODE) - name_str = attr->children->content; - if (!strcmp(attr->name, "xpath") - && attr->children && attr->children->type == XML_TEXT_NODE) - xpath_str = attr->children->content; - if (!strcmp(attr->name, "type") - && attr->children && attr->children->type == XML_TEXT_NODE) - type_str = attr->children->content; + attr_content(attr, "name", &name_str); + attr_content(attr, "xpath", &xpath_str); + attr_content(attr, "type", &type_str); } if (name_str) { @@ -344,6 +331,38 @@ static void index_node(struct filter_info *tinfo, struct recExtractCtrl *ctrl, } } +static void index_record(struct filter_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_info *tinfo, struct recExtractCtrl *p, xmlDocPtr doc) { @@ -361,6 +380,7 @@ static int extract_doc(struct filter_info *tinfo, struct recExtractCtrl *p, if (schema && schema->stylesheet_xsp) { + xmlNodePtr root_ptr; xmlDocPtr resDoc = xsltApplyStylesheet(schema->stylesheet_xsp, doc, params); @@ -370,7 +390,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); @@ -412,12 +440,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); @@ -519,7 +547,7 @@ static const char *snippet_doc(struct recRetrieveCtrl *p, int text_mode, static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p) { const char *esn = zebra_xslt_ns; - const char *params[10]; + const char *params[20]; struct filter_info *tinfo = clientData; xmlDocPtr resDoc; xmlDocPtr doc; @@ -528,13 +556,18 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p) 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) @@ -554,7 +587,8 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p) if (p->score >= 0) set_param_int(params, "score", p->score, p->odr); set_param_int(params, "size", p->recordSize, p->odr); - + set_param_int(params, "id", p->localno, p->odr); + if (window_size >= 0) set_param_xml(params, "snippet", snippet_doc(p, 1, window_size), p->odr); @@ -621,20 +655,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, @@ -649,9 +673,6 @@ idzebra_filter #endif [] = { - &filter_type_xslt, -#ifdef LIBXML_READER_ENABLED - &filter_type_xslt1, -#endif + &filter_type, 0, };