X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Falvis.c;h=194ae198dd76f9e66cfaabd993e2dbe9a7dd5890;hb=05f31b27a8b7d81cfd3e9767ad2c2b58771bc142;hp=01db97047cf0a9827abbbf73b802f527d473ba67;hpb=1722bbb1db5ba2b1cf096388cf3206863ae0a203;p=idzebra-moved-to-github.git diff --git a/recctrl/alvis.c b/recctrl/alvis.c index 01db970..194ae19 100644 --- a/recctrl/alvis.c +++ b/recctrl/alvis.c @@ -1,4 +1,4 @@ -/* $Id: alvis.c,v 1.14 2006-05-24 12:56:56 marc Exp $ +/* $Id: alvis.c,v 1.17 2006-05-31 16:11:58 marc Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -25,12 +25,15 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include +#include + #include #include #include #include #include #include +#include #include #include @@ -49,6 +52,8 @@ struct filter_schema { struct filter_info { xmlDocPtr doc; char *fname; + char *full_name; + const char *profile_path; const char *split_level; const char *split_path; ODR odr; @@ -127,6 +132,8 @@ static void *filter_init(Res res, RecType recType) struct filter_info *tinfo = (struct filter_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); @@ -175,21 +182,44 @@ static void destroy_schemas(struct filter_info *tinfo) static ZEBRA_RES create_schemas(struct filter_info *tinfo, const char *fname) { + char tmp_full_name[1024]; xmlNodePtr ptr; tinfo->fname = xstrdup(fname); - tinfo->doc = xmlParseFile(tinfo->fname); - if (!tinfo->doc) + + 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, "alvis filter: loading config file %s", tinfo->full_name); + + tinfo->doc = xmlParseFile(tinfo->full_name); + + if (!tinfo->doc){ + yaz_log(YLOG_WARN, "alvis filter: could not parse config file %s", + tinfo->full_name); + return ZEBRA_FAIL; + } + ptr = xmlDocGetRootElement(tinfo->doc); if (!ptr || ptr->type != XML_ELEMENT_NODE || - XML_STRCMP(ptr->name, "schemaInfo")) - return ZEBRA_FAIL; + XML_STRCMP(ptr->name, "schemaInfo")){ + yaz_log(YLOG_WARN, + "alvis filter: config file %s :" + " expected root element ", + tinfo->full_name); + return ZEBRA_FAIL; + } + for (ptr = ptr->children; ptr; ptr = ptr->next) { if (ptr->type != XML_ELEMENT_NODE) continue; if (!XML_STRCMP(ptr->name, "schema")) - { + { + char tmp_xslt_full_name[1024]; struct _xmlAttr *attr; struct filter_schema *schema = xmalloc(sizeof(*schema)); schema->name = 0; @@ -213,11 +243,17 @@ static ZEBRA_RES create_schemas(struct filter_info *tinfo, const char *fname) /* find requested schema */ - 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, + "alvis filter: could not parse xslt stylesheet %s", + tmp_xslt_full_name); + } + } else if (!XML_STRCMP(ptr->name, "split")) @@ -269,10 +305,19 @@ static struct filter_schema *lookup_schema(struct filter_info *tinfo, static ZEBRA_RES filter_config(void *clientData, Res res, const char *args) { struct filter_info *tinfo = clientData; - if (!args || !*args) - return ZEBRA_FAIL; + if (!args || !*args){ + yaz_log(YLOG_WARN, "alvis filter: need config file"); + return ZEBRA_FAIL; + } + if (tinfo->fname && !strcmp(args, tinfo->fname)) return ZEBRA_OK; + + tinfo->profile_path + /* = res_get_def(res, "profilePath", DEFAULT_PROFILE_PATH); */ + = res_get(res, "profilePath"); + yaz_log(YLOG_LOG, "alvis filter: profilePath %s", tinfo->profile_path); + destroy_schemas(tinfo); create_schemas(tinfo, args); return ZEBRA_OK; @@ -352,11 +397,12 @@ 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) { + 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 *type_str = "update"; const char *id_str = 0; const char *rank_str = 0; struct _xmlAttr *attr; @@ -368,17 +414,20 @@ static void index_record(struct filter_info *tinfo,struct recExtractCtrl *ctrl, } 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); + + if (!strcmp("update", type_str)) + index_node(tinfo, ctrl, ptr, recWord); + else if (!strcmp("delete", type_str)) + yaz_log(YLOG_WARN, "alvis filter delete: to be implemented"); + else + yaz_log(YLOG_WARN, "alvis filter: unknown record type '%s'", + type_str); } static int extract_doc(struct filter_info *tinfo, struct recExtractCtrl *p, @@ -656,20 +705,23 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p) { xmlChar *buf_out; int len_out; - xmlDocDumpMemory(resDoc, &buf_out, &len_out); + + xsltSaveResultToString(&buf_out, &len_out, resDoc, + schema->stylesheet_xsp); p->output_format = VAL_TEXT_XML; p->rec_len = len_out; p->rec_buf = odr_malloc(p->odr, p->rec_len); memcpy(p->rec_buf, buf_out, p->rec_len); - xmlFree(buf_out); } else if (p->output_format == VAL_SUTRS) { xmlChar *buf_out; int len_out; - xmlDocDumpMemory(resDoc, &buf_out, &len_out); + + xsltSaveResultToString(&buf_out, &len_out, resDoc, + schema->stylesheet_xsp); p->output_format = VAL_SUTRS; p->rec_len = len_out;