-/* $Id: alvis.c,v 1.5 2006-11-10 12:56:26 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: alvis.c,v 1.15 2007-03-19 21:50:39 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
static int attr_content(struct _xmlAttr *attr, const char *name,
const char **dst_content)
{
- if (!XML_STRCMP(attr->name, name) && attr->children &&
- attr->children->type == XML_TEXT_NODE)
+ if (!XML_STRCMP(attr->name, name) && attr->children
+ && attr->children->type == XML_TEXT_NODE)
{
*dst_content = (const char *)(attr->children->content);
return 1;
char tmp_full_name[1024];
xmlNodePtr ptr;
tinfo->fname = xstrdup(fname);
-
- if (yaz_filepath_resolve(tinfo->fname, tinfo->profile_path,
+
+ if (yaz_filepath_resolve(tinfo->fname, tinfo->profile_path,
NULL, tmp_full_name))
- tinfo->full_name = xstrdup(tmp_full_name);
+ tinfo->full_name = xstrdup(tmp_full_name);
else
- tinfo->full_name = xstrdup(tinfo->fname);
-
+ 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){
+
+ 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")){
+ if (!ptr || ptr->type != XML_ELEMENT_NODE
+ || XML_STRCMP(ptr->name, "schemaInfo"))
+ {
yaz_log(YLOG_WARN,
"alvis filter: config file %s :"
" expected root element <schemaInfo>",
{
struct filter_info *tinfo = clientData;
destroy_schemas(tinfo);
+ xfree(tinfo->full_name);
if (tinfo->reader)
xmlFreeTextReader(tinfo->reader);
odr_destroy(tinfo->odr);
sscanf(id_str, "%255s", ctrl->match_criteria);
if (rank_str)
- ctrl->staticrank = atoi(rank_str);
-
+ ctrl->staticrank = atozint(rank_str);
ptr = ptr->children;
}
p /* I/O handler */,
0 /* URL */,
0 /* encoding */,
- XML_PARSE_XINCLUDE);
+ XML_PARSE_XINCLUDE
+ | XML_PARSE_NOENT
+ | XML_PARSE_NONET);
}
if (!tinfo->reader)
return RECCTRL_EXTRACT_ERROR_GENERIC;
{
int type = xmlTextReaderNodeType(tinfo->reader);
int depth = xmlTextReaderDepth(tinfo->reader);
- if (tinfo->split_level == 0 ||
- (tinfo->split_level > 0 &&
- type == XML_READER_TYPE_ELEMENT && tinfo->split_level == depth))
+ if (type == XML_READER_TYPE_ELEMENT && tinfo->split_level == depth)
{
xmlNodePtr ptr = xmlTextReaderExpand(tinfo->reader);
if (ptr)
return RECCTRL_EXTRACT_EOF;
}
+static int extract_full(struct filter_info *tinfo, struct recExtractCtrl *p)
+{
+ if (p->first_record) /* only one record per stream */
+ {
+ xmlDocPtr doc = xmlReadIO(ioread_ex, ioclose_ex, p /* I/O handler */,
+ 0 /* URL */,
+ 0 /* encoding */,
+ XML_PARSE_XINCLUDE
+ | XML_PARSE_NOENT
+ | XML_PARSE_NONET);
+ if (!doc)
+ return RECCTRL_EXTRACT_ERROR_GENERIC;
+ /* else {
+ xmlNodePtr root = xmlDocGetRootElement(doc);
+ if (!root)
+ return RECCTRL_EXTRACT_ERROR_GENERIC;
+ } */
+
+ return extract_doc(tinfo, p, doc);
+ }
+ else
+ return RECCTRL_EXTRACT_EOF;
+}
+
static int filter_extract(void *clientData, struct recExtractCtrl *p)
{
struct filter_info *tinfo = clientData;
odr_reset(tinfo->odr);
-
- return extract_split(tinfo, p);
+ if (tinfo->split_level == 0)
+ return extract_full(tinfo, p);
+ else
+ return extract_split(tinfo, p);
}
static int ioread_ret(void *context, char *buffer, int len)
else
wrbuf_printf(wrbuf, "</snippet>\n");
- xml_doc_str = odr_strdup(p->odr, wrbuf_buf(wrbuf));
+ xml_doc_str = odr_strdup(p->odr, wrbuf_cstr(wrbuf));
zebra_snippets_destroy(res);
- wrbuf_free(wrbuf, 1);
+ wrbuf_destroy(wrbuf);
return xml_doc_str;
}
doc = xmlReadIO(ioread_ret, ioclose_ret, p /* I/O handler */,
0 /* URL */,
0 /* encoding */,
- XML_PARSE_XINCLUDE);
+ XML_PARSE_XINCLUDE | XML_PARSE_NOENT | XML_PARSE_NONET);
if (!doc)
{
p->diagnostic = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
xmlChar *buf_out;
int len_out;
- xsltSaveResultToString(&buf_out, &len_out, resDoc,
- schema->stylesheet_xsp);
+ if (schema->stylesheet_xsp)
+ xsltSaveResultToString(&buf_out, &len_out, resDoc,
+ schema->stylesheet_xsp);
+ else
+ xmlDocDumpMemory(resDoc, &buf_out, &len_out);
p->output_format = VAL_TEXT_XML;
p->rec_len = len_out;
xmlChar *buf_out;
int len_out;
- xsltSaveResultToString(&buf_out, &len_out, resDoc,
- schema->stylesheet_xsp);
+ if (schema->stylesheet_xsp)
+ xsltSaveResultToString(&buf_out, &len_out, resDoc,
+ schema->stylesheet_xsp);
+ else
+ xmlDocDumpMemory(resDoc, &buf_out, &len_out);
p->output_format = VAL_SUTRS;
p->rec_len = len_out;