X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fxmlquery.c;h=966dd666b0e0fe9d829ddf8e1e1e87e1766c1c8d;hp=d0cf454ca3d1e19a0a187ebff041c9efdb253d2a;hb=503c86c1e635da2561cc4e16449257952f90ac4d;hpb=4cdc954013878a64caac253e1275a5ca80782206 diff --git a/src/xmlquery.c b/src/xmlquery.c index d0cf454..966dd66 100644 --- a/src/xmlquery.c +++ b/src/xmlquery.c @@ -1,11 +1,13 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2009 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ - /** \file xmlquery.c \brief Query / XML conversions */ +#if HAVE_CONFIG_H +#include +#endif #include #include @@ -65,7 +67,7 @@ static void yaz_query2xml_attribute_element(const Z_AttributeElement *element, char formstr[30]; const char *setname = 0; char oid_name_str[OID_STR_MAX]; - + if (element->attributeSet) { setname = yaz_oid_to_string_buf(element->attributeSet, @@ -92,17 +94,17 @@ static void yaz_query2xml_attribute_element(const Z_AttributeElement *element, for (i = 0; ivalue.complex->num_list; i++) { xmlNodePtr node = xmlNewChild(parent, 0, BAD_CAST "attr", 0); - + if (setname) xmlNewProp(node, BAD_CAST "set", BAD_CAST setname); - + sprintf(formstr, ODR_INT_PRINTF, *element->attributeType); xmlNewProp(node, BAD_CAST "type", BAD_CAST formstr); - + if (element->value.complex->list[i]->which == Z_StringOrNumeric_string) { - xmlNewProp(node, BAD_CAST "value", BAD_CAST + xmlNewProp(node, BAD_CAST "value", BAD_CAST element->value.complex->list[i]->u.string); } else if (element->value.complex->list[i]->which == @@ -133,7 +135,7 @@ static xmlNodePtr yaz_query2xml_term(const Z_Term *term, xmlNodePtr parent) case Z_Term_numeric: type = "numeric"; sprintf(formstr, ODR_INT_PRINTF, *term->u.numeric); - t = xmlNewText(BAD_CAST formstr); + t = xmlNewText(BAD_CAST formstr); break; case Z_Term_characterString: type = "string"; @@ -199,11 +201,11 @@ static void yaz_query2xml_operator(Z_Operator *op, xmlNodePtr node) return; } xmlNewProp(node, BAD_CAST "type", BAD_CAST type); - + if (op->which == Z_Operator_prox) { char formstr[30]; - + if (op->u.prox->exclusion) { if (*op->u.prox->exclusion) @@ -216,12 +218,12 @@ static void yaz_query2xml_operator(Z_Operator *op, xmlNodePtr node) if (*op->u.prox->ordered) xmlNewProp(node, BAD_CAST "ordered", BAD_CAST "true"); - else + else xmlNewProp(node, BAD_CAST "ordered", BAD_CAST "false"); - + sprintf(formstr, ODR_INT_PRINTF, *op->u.prox->relationType); xmlNewProp(node, BAD_CAST "relationType", BAD_CAST formstr); - + switch(op->u.prox->which) { case Z_ProximityOperator_known: @@ -258,7 +260,7 @@ static xmlNodePtr yaz_query2xml_rpnstructure(const Z_RPNStructure *zs, return yaz_query2xml_apt(zs->u.simple->u.attributesPlusTerm, parent); else if (zs->u.simple->which == Z_Operand_resultSetId) - return xmlNewChild(parent, /* NS */ 0, BAD_CAST "rset", + return xmlNewChild(parent, /* NS */ 0, BAD_CAST "rset", BAD_CAST zs->u.simple->u.resultSetId); } return 0; @@ -312,7 +314,7 @@ void yaz_query2xml(const Z_Query *q, xmlDocPtr *docp) switch (q->which) { - case Z_Query_type_1: + case Z_Query_type_1: case Z_Query_type_101: q_node = xmlNewChild(top_node, 0, BAD_CAST "rpn", 0); child_node = yaz_query2xml_rpn(q->u.type_1, q_node); @@ -360,8 +362,7 @@ static void yaz_xml2query_operator(const xmlNode *ptr, Z_Operator **op, ODR odr, int *error_code, const char **addinfo) { - const char *type = (const char *) - xmlGetProp((xmlNodePtr) ptr, BAD_CAST "type"); + xmlChar *type = xmlGetProp((xmlNodePtr) ptr, BAD_CAST "type"); if (!type) { *error_code = 1; @@ -369,78 +370,66 @@ static void yaz_xml2query_operator(const xmlNode *ptr, Z_Operator **op, return; } *op = (Z_Operator*) odr_malloc(odr, sizeof(Z_Operator)); - if (!strcmp(type, "and")) + if (!xmlStrcmp(type, BAD_CAST "and")) { (*op)->which = Z_Operator_and; (*op)->u.op_and = odr_nullval(); } - else if (!strcmp(type, "or")) + else if (!xmlStrcmp(type, BAD_CAST "or")) { (*op)->which = Z_Operator_or; (*op)->u.op_or = odr_nullval(); } - else if (!strcmp(type, "not")) + else if (!xmlStrcmp(type, BAD_CAST "not")) { (*op)->which = Z_Operator_and_not; (*op)->u.and_not = odr_nullval(); } - else if (!strcmp(type, "prox")) + else if (!xmlStrcmp(type, BAD_CAST "prox")) { - const char *atval; - Z_ProximityOperator *pop = (Z_ProximityOperator *) - odr_malloc(odr, sizeof(Z_ProximityOperator)); - + struct _xmlAttr *attr; + Z_ProximityOperator *pop = (Z_ProximityOperator *) + odr_malloc(odr, sizeof(*pop)); (*op)->which = Z_Operator_prox; (*op)->u.prox = pop; + /* default values */ + pop->exclusion = 0; + pop->ordered = odr_booldup(odr, 1); + pop->relationType = + odr_intdup(odr, Z_ProximityOperator_Prox_lessThanOrEqual); + pop->which = Z_ProximityOperator_known; + pop->u.known = odr_intdup(odr, Z_ProxUnit_word); + pop->distance = odr_intdup(odr, 1); - atval = (const char *) xmlGetProp((xmlNodePtr) ptr, - BAD_CAST "exclusion"); - if (atval) - pop->exclusion = boolVal(odr, atval); - else - pop->exclusion = 0; - - atval = (const char *) xmlGetProp((xmlNodePtr) ptr, - BAD_CAST "distance"); - if (atval) - pop->distance = intVal(odr, atval); - else - pop->distance = odr_intdup(odr, 1); - - atval = (const char *) xmlGetProp((xmlNodePtr) ptr, - BAD_CAST "ordered"); - if (atval) - pop->ordered = boolVal(odr, atval); - else - pop->ordered = odr_booldup(odr, 1); - - atval = (const char *) xmlGetProp((xmlNodePtr) ptr, - BAD_CAST "relationType"); - if (atval) - pop->relationType = intVal(odr, atval); - else - pop->relationType = - odr_intdup(odr, Z_ProximityOperator_Prox_lessThanOrEqual); - - atval = (const char *) xmlGetProp((xmlNodePtr) ptr, - BAD_CAST "knownProximityUnit"); - if (atval) - { - pop->which = Z_ProximityOperator_known; - pop->u.known = intVal(odr, atval); - } - else - { - pop->which = Z_ProximityOperator_known; - pop->u.known = odr_intdup(odr, Z_ProxUnit_word); - } - - atval = (const char *) xmlGetProp((xmlNodePtr) ptr, - BAD_CAST "privateProximityUnit"); - if (atval) + for (attr = ptr->properties; attr; attr = attr->next) { - pop->which = Z_ProximityOperator_private; - pop->u.zprivate = intVal(odr, atval); + const char *value = (const char *) attr->children->content; + if (!xmlStrcmp(attr->name, BAD_CAST "type")) + ; + else if (!xmlStrcmp(attr->name, BAD_CAST "exclusion")) + pop->exclusion = boolVal(odr, value); + else if (!xmlStrcmp(attr->name, BAD_CAST "distance")) + pop->distance = intVal(odr, value); + else if (!xmlStrcmp(attr->name, BAD_CAST "ordered")) + pop->ordered = boolVal(odr, value); + else if (!xmlStrcmp(attr->name, BAD_CAST "relationType")) + pop->relationType = intVal(odr, value); + else if (!xmlStrcmp(attr->name, BAD_CAST "knownProximityUnit")) + { + pop->which = Z_ProximityOperator_known; + pop->u.known = intVal(odr, value); + } + else if (!xmlStrcmp(attr->name, BAD_CAST "privateProximityUnit")) + { + pop->which = Z_ProximityOperator_private; + pop->u.known = intVal(odr, value); + } + else + { + *error_code = 1; + *addinfo = "bad proximity attribute"; + break; + } } } else @@ -448,9 +437,10 @@ static void yaz_xml2query_operator(const xmlNode *ptr, Z_Operator **op, *error_code = 1; *addinfo = "bad operator type"; } + xmlFree(type); } -static void yaz_xml2query_attribute_element(const xmlNode *ptr, +static void yaz_xml2query_attribute_element(const xmlNode *ptr, Z_AttributeElement **elem, ODR odr, int *error_code, const char **addinfo) @@ -494,7 +484,7 @@ static void yaz_xml2query_attribute_element(const xmlNode *ptr, *addinfo = "missing value attribute for att content"; return; } - + *elem = (Z_AttributeElement *) odr_malloc(odr, sizeof(**elem)); if (set) (*elem)->attributeSet = yaz_string_to_oid_odr(yaz_oid_std(), @@ -536,7 +526,7 @@ static void yaz_xml2query_attribute_element(const xmlNode *ptr, } } (*elem)->value.complex->num_semanticAction = 0; - (*elem)->value.complex->semanticAction = 0; + (*elem)->value.complex->semanticAction = 0; } else { /* good'ld numeric value */ @@ -575,7 +565,7 @@ static void yaz_xml2query_term(const xmlNode *ptr, Z_Term **term, ODR odr, { (*term)->which = Z_Term_general; (*term)->u.general = - odr_create_Odr_oct(odr, (unsigned char *)cdata, strlen(cdata)); + odr_create_Odr_oct(odr, cdata, strlen(cdata)); } else if (!xmlStrcmp(type, BAD_CAST "numeric")) { @@ -643,7 +633,7 @@ static void yaz_xml2query_apt(const xmlNode *ptr_apt, (*zapt)->attributes->attributes = (Z_AttributeElement **) odr_malloc(odr, sizeof(Z_AttributeElement*) * num_attr); - i = 0; + i = 0; ptr = ptr_apt->children; for (; ptr; ptr = ptr->next) if (ptr->type == XML_ELEMENT_NODE) @@ -664,7 +654,7 @@ static void yaz_xml2query_apt(const xmlNode *ptr_apt, if (ptr && ptr->type == XML_ELEMENT_NODE) { if (!xmlStrcmp(ptr->name, BAD_CAST "term")) - { + { /* deal with term */ yaz_xml2query_term(ptr, &(*zapt)->term, odr, error_code, addinfo); } @@ -701,7 +691,7 @@ static void yaz_xml2query_rpnstructure(const xmlNode *ptr, Z_RPNStructure **zs, { while (ptr && ptr->type != XML_ELEMENT_NODE) ptr = ptr->next; - + if (!ptr || ptr->type != XML_ELEMENT_NODE) { *error_code = 1; @@ -715,10 +705,10 @@ static void yaz_xml2query_rpnstructure(const xmlNode *ptr, Z_RPNStructure **zs, if (!xmlStrcmp(ptr->name, BAD_CAST "operator")) { Z_Complex *zc = (Z_Complex *) odr_malloc(odr, sizeof(Z_Complex)); - + (*zs)->which = Z_RPNStructure_complex; (*zs)->u.complex = zc; - + yaz_xml2query_operator(ptr, &zc->roperator, odr, error_code, addinfo); ptr = ptr->children; @@ -731,7 +721,7 @@ static void yaz_xml2query_rpnstructure(const xmlNode *ptr, Z_RPNStructure **zs, ptr = ptr->next; yaz_xml2query_rpnstructure(ptr, &zc->s2, odr, error_code, addinfo); } - else + else { Z_Operand *s = (Z_Operand *) odr_malloc(odr, sizeof(Z_Operand)); (*zs)->which = Z_RPNStructure_simple; @@ -744,7 +734,7 @@ static void yaz_xml2query_rpnstructure(const xmlNode *ptr, Z_RPNStructure **zs, } else if (!xmlStrcmp(ptr->name, BAD_CAST "rset")) { - s->which = Z_Operand_resultSetId; + s->which = Z_Operand_resultSetId; yaz_xml2query_rset(ptr, &s->u.resultSetId, odr, error_code, addinfo); } @@ -752,20 +742,23 @@ static void yaz_xml2query_rpnstructure(const xmlNode *ptr, Z_RPNStructure **zs, { *error_code = 1; *addinfo = "bad element: expected binary, apt or rset"; - } + } } } static void yaz_xml2query_rpn(const xmlNode *ptr, Z_RPNQuery **query, ODR odr, int *error_code, const char **addinfo) { - const char *set = (const char *) - xmlGetProp((xmlNodePtr) ptr, BAD_CAST "set"); + xmlChar *set = xmlGetProp((xmlNodePtr) ptr, BAD_CAST "set"); *query = (Z_RPNQuery*) odr_malloc(odr, sizeof(Z_RPNQuery)); if (set) - (*query)->attributeSetId = yaz_string_to_oid_odr(yaz_oid_std(), - CLASS_ATTSET, set, odr); + { + (*query)->attributeSetId = + yaz_string_to_oid_odr(yaz_oid_std(), + CLASS_ATTSET, (const char *) set, odr); + xmlFree(set); + } else (*query)->attributeSetId = 0; yaz_xml2query_rpnstructure(ptr->children, &(*query)->RPNStructure, @@ -777,7 +770,7 @@ static void yaz_xml2query_(const xmlNode *ptr, Z_Query **query, ODR odr, { if (check_diagnostic(ptr, odr, error_code, addinfo)) return; - if (ptr && ptr->type == XML_ELEMENT_NODE && + if (ptr && ptr->type == XML_ELEMENT_NODE && !xmlStrcmp(ptr->name, BAD_CAST "query")) { const char *type;