X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Falvis.c;h=546fd7af92c8195fed6733948e42c9403cdcf426;hb=6dfee19bc1cec29ff5ec5e9cd8021d1354a6126e;hp=57e2ad2d0f5443b65e64ec73aee21545a89da639;hpb=c154b6ebab028dc512c43403864a8e4a7fc2b178;p=idzebra-moved-to-github.git

diff --git a/recctrl/alvis.c b/recctrl/alvis.c
index 57e2ad2..546fd7a 100644
--- a/recctrl/alvis.c
+++ b/recctrl/alvis.c
@@ -1,4 +1,4 @@
-/* $Id: alvis.c,v 1.4 2005-08-19 14:06:31 marc Exp $
+/* $Id: alvis.c,v 1.8 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,30 +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); */
+    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;
@@ -127,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,
@@ -140,10 +145,10 @@ static void *filter_init_xslt(Res res, RecType recType)
 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;
@@ -176,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));
@@ -207,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)
@@ -284,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);
     }
 }
@@ -297,9 +302,9 @@ 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"))
 	{
 	    const char *name_str = 0;
 	    const char *type_str = 0;
@@ -330,8 +335,8 @@ static void index_record(struct filter_info *tinfo,struct recExtractCtrl *ctrl,
 			 xmlNodePtr ptr, RecWord *recWord)
 {
     if (ptr && ptr->type == XML_ELEMENT_NODE && ptr->ns &&
-	!strcmp(ptr->ns->href, zebra_xslt_ns)
-	&& !strcmp(ptr->name, "record"))
+	!XML_STRCMP(ptr->ns->href, zebra_xslt_ns)
+	&& !XML_STRCMP(ptr->name, "record"))
     {
 	const char *type_str = "update";
 	const char *id_str = 0;
@@ -435,11 +440,11 @@ 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);
     }
@@ -542,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;
@@ -551,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)
+	{
+	    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)
 	{
-	    p->diagnostic = YAZ_BIB1_PRESENT_COMP_SPEC_PARAMETER_UNSUPP;
-	    return 0;
+	    esn = p->comp->u.complex->generic->elementSpec->u.elementSetName;
 	}
-	esn = p->comp->u.simple->u.generic;
     }
     schema = lookup_schema(tinfo, esn);
     if (!schema)
@@ -645,10 +655,10 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
     return 0;
 }
 
-static struct recType filter_type_alvis = {
+static struct recType filter_type = {
     0,
     "alvis",
-    filter_init_xslt,
+    filter_init,
     filter_config,
     filter_destroy,
     filter_extract,
@@ -663,6 +673,6 @@ idzebra_filter
 #endif
 
 [] = {
-    &filter_type_alvis,
+    &filter_type,
     0,
 };