X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=recctrl%2Falvis.c;h=194ae198dd76f9e66cfaabd993e2dbe9a7dd5890;hp=546fd7af92c8195fed6733948e42c9403cdcf426;hb=4494cb5dd6d79d72f15c41af16833cc373044a36;hpb=35f5aba7d93a1ae18767463ba90c3cd340b4d9bd diff --git a/recctrl/alvis.c b/recctrl/alvis.c index 546fd7a..194ae19 100644 --- a/recctrl/alvis.c +++ b/recctrl/alvis.c @@ -1,4 +1,4 @@ -/* $Id: alvis.c,v 1.8 2005-08-24 08:30:37 adam 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 @@ -41,6 +44,7 @@ struct filter_schema { const char *stylesheet; struct filter_schema *next; const char *default_schema; + /* char default_schema; */ const char *include_snippet; xsltStylesheetPtr stylesheet_xsp; }; @@ -48,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; @@ -126,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); @@ -174,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; @@ -207,10 +238,23 @@ static ZEBRA_RES create_schemas(struct filter_info *tinfo, const char *fname) 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); + /*yaz_log(YLOG_LOG, "XSLT add %s %s %s", + schema->name, schema->identifier, schema->stylesheet); */ + + /* find requested schema */ + + 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")) { @@ -234,30 +278,49 @@ static struct filter_schema *lookup_schema(struct filter_info *tinfo, const char *est) { struct filter_schema *schema; + for (schema = tinfo->schemas; schema; schema = schema->next) - { - if (est) - { + { + /* find requested schema */ + if (est) + { if (schema->identifier && !strcmp(schema->identifier, est)) - return schema; + return schema; + if (schema->name && !strcmp(schema->name, est)) return schema; - } - if (schema->default_schema) + } + /* or return default schema if defined */ + else if (schema->default_schema) return schema; } + + /* return first schema if no default schema defined */ + if (tinfo->schemas) + return tinfo->schemas; + 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"; + if (!args || !*args){ + yaz_log(YLOG_WARN, "alvis 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, "alvis filter: profilePath %s", tinfo->profile_path); + destroy_schemas(tinfo); create_schemas(tinfo, args); + return ZEBRA_OK; } static void filter_destroy(void *clientData) @@ -334,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; @@ -350,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, @@ -546,8 +613,9 @@ 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[20]; + /* const char *esn = zebra_xslt_ns; */ + const char *esn = 0; + const char *params[32]; struct filter_info *tinfo = clientData; xmlDocPtr resDoc; xmlDocPtr doc; @@ -581,13 +649,25 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p) 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); + + if (esn) + set_param_str(params, "schema", esn, p->odr); + else + if (schema->name) + set_param_str(params, "schema", schema->name, p->odr); + else if (schema->identifier) + set_param_str(params, "schema", schema->identifier, p->odr); + else + set_param_str(params, "schema", "", 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_int(params, "id", p->localno, p->odr); if (window_size >= 0) set_param_xml(params, "snippet", snippet_doc(p, 1, window_size), @@ -625,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; @@ -676,3 +759,11 @@ idzebra_filter &filter_type, 0, }; +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +