X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsrw.c;h=8e3196bf275babd63c0fe274bcac93ad025eb460;hb=57714653dbb646c4831568e35d9065dc54502346;hp=dfd3aadb16616f24e29b60c5e3a59b653966ad20;hpb=47d9d5ac3241f8db09ba19a1a5c1fdd5e140e75f;p=yaz-moved-to-github.git diff --git a/src/srw.c b/src/srw.c index dfd3aad..8e3196b 100644 --- a/src/srw.c +++ b/src/srw.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) 1995-2012 Index Data * See the file LICENSE for details. */ /** @@ -133,10 +133,11 @@ static int match_xsd_string(xmlNodePtr ptr, const char *elem, ODR o, return match_xsd_string_n(ptr, elem, o, val, 0); } -static int match_xsd_XML_n(xmlNodePtr ptr, const char *elem, ODR o, - char **val, int *len) +static int match_xsd_XML_n2(xmlNodePtr ptr, const char *elem, ODR o, + char **val, int *len, int fixup_root) { xmlBufferPtr buf; + int no_root_nodes = 0; if (!match_element(ptr, elem)) return 0; @@ -158,11 +159,17 @@ static int match_xsd_XML_n(xmlNodePtr ptr, const char *elem, ODR o, xmlNodeDump(buf, tmp->doc, tmp, 0, 0); xmlFreeNode(tmp); + no_root_nodes++; } } - - *val = (char *) odr_malloc(o, buf->use+1); - memcpy (*val, buf->content, buf->use); + if (no_root_nodes != 1 && fixup_root) + { + /* does not appear to be an XML document. Make it so */ + xmlBufferAddHead(buf, (const xmlChar *) "", -1); + xmlBufferAdd(buf, (const xmlChar *) "", -1); + } + *val = (char *) odr_malloc(o, buf->use + 1); + memcpy(*val, buf->content, buf->use); (*val)[buf->use] = '\0'; if (len) @@ -172,7 +179,13 @@ static int match_xsd_XML_n(xmlNodePtr ptr, const char *elem, ODR o, return 1; } - + +static int match_xsd_XML_n(xmlNodePtr ptr, const char *elem, ODR o, + char **val, int *len) +{ + return match_xsd_XML_n2(ptr, elem, o, val, len, 0); +} + static int match_xsd_integer(xmlNodePtr ptr, const char *elem, ODR o, Odr_int **val) { @@ -211,7 +224,7 @@ char *yaz_negotiate_sru_version(char *input_ver) if (!strcmp(input_ver, "1.1")) return "1.1"; - return "1.2"; /* our latest supported version */ + return "1.2"; /* our latest supported version */ } static int yaz_srw_record(ODR o, xmlNodePtr pptr, Z_SRW_record *rec, @@ -223,9 +236,7 @@ static int yaz_srw_record(ODR o, xmlNodePtr pptr, Z_SRW_record *rec, Z_SRW_extra_record ex; char *spack = 0; - int pack = Z_SRW_recordPacking_string; xmlNodePtr ptr; - xmlNodePtr data_ptr = 0; rec->recordSchema = 0; rec->recordData_buf = 0; rec->recordData_len = 0; @@ -243,51 +254,42 @@ static int yaz_srw_record(ODR o, xmlNodePtr pptr, Z_SRW_record *rec, &rec->recordSchema)) ; else if (match_xsd_string(ptr, "recordPacking", o, &spack)) - { - if (spack) - pack = yaz_srw_str_to_pack(spack); - } + ; /* can't rely on it: in SRU 2.0 it's different semantics */ else if (match_xsd_integer(ptr, "recordPosition", o, &rec->recordPosition)) ; else if (match_element(ptr, "recordData")) { - /* save position of Data until after the loop - then we will know the packing (hopefully), and - unpacking is done once - */ - data_ptr = ptr; + /* we assume XML packing, if any element nodes exist below + recordData. Unfortunately, in SRU 2.0 recordPacking + means something different */ + xmlNode *p = ptr->children; + for (; p; p = p->next) + if (p->type == XML_ELEMENT_NODE) + break; + if (p) + { + match_xsd_XML_n2( + ptr, "recordData", o, + &rec->recordData_buf, &rec->recordData_len, 1); + rec->recordPacking = Z_SRW_recordPacking_XML; + } + else + { + match_xsd_string_n( + ptr, "recordData", o, + &rec->recordData_buf, &rec->recordData_len); + rec->recordPacking = Z_SRW_recordPacking_string; + } } else if (match_xsd_XML_n(ptr, "extraRecordData", o, &ex.extraRecordData_buf, &ex.extraRecordData_len) ) ; - else if (match_xsd_string(ptr, "recordIdentifier", o, - &ex.recordIdentifier)) - ; - - } - if (data_ptr) - { - switch(pack) - { - case Z_SRW_recordPacking_XML: - match_xsd_XML_n(data_ptr, "recordData", o, - &rec->recordData_buf, &rec->recordData_len); - break; - case Z_SRW_recordPacking_URL: - /* just store it as a string. - leave it to the backend to collect the document */ - match_xsd_string_n(data_ptr, "recordData", o, - &rec->recordData_buf, &rec->recordData_len); - break; - case Z_SRW_recordPacking_string: - match_xsd_string_n(data_ptr, "recordData", o, - &rec->recordData_buf, &rec->recordData_len); - break; - } + else + match_xsd_string(ptr, "recordIdentifier", o, + &ex.recordIdentifier); } - rec->recordPacking = pack; if (ex.extraRecordData_buf || ex.recordIdentifier) { *extra = (Z_SRW_extra_record *) @@ -304,7 +306,7 @@ static int yaz_srw_record(ODR o, xmlNodePtr pptr, Z_SRW_record *rec, add_xsd_string(ptr, "recordSchema", rec->recordSchema); if (spack) add_xsd_string(ptr, "recordPacking", spack); - switch(pack) + switch (pack) { case Z_SRW_recordPacking_string: add_xsd_string_n(ptr, "recordData", rec->recordData_buf, @@ -392,9 +394,8 @@ static int yaz_srw_version(ODR o, xmlNodePtr pptr, Z_SRW_recordVersion *rec, if (match_xsd_string(ptr, "versionType", o, &rec->versionType)) ; - else if (match_xsd_string(ptr, "versionValue", o, - &rec->versionValue)) - ; + else + match_xsd_string(ptr, "versionValue", o, &rec->versionValue); } } else if (o->direction == ODR_ENCODE) @@ -449,24 +450,25 @@ static int yaz_srw_versions(ODR o, xmlNodePtr pptr, Z_FacetTerm *yaz_sru_proxy_get_facet_term_count(ODR odr, xmlNodePtr node) { - int freq; + Odr_int freq; xmlNodePtr child; WRBUF wrbuf = wrbuf_alloc(); - const char *freq_string = yaz_element_attribute_value_get(node, "facetvalue", "est_representation"); - Z_Term *term; + Z_FacetTerm *facet_term; + const char *freq_string = yaz_element_attribute_value_get( + node, "facetvalue", "est_representation"); if (freq_string) - freq = atoi(freq_string); + freq = odr_atoi(freq_string); else freq = -1; - for (child = node->children; child ; child = child->next) { + for (child = node->children; child ; child = child->next) + { if (child->type == XML_TEXT_NODE) wrbuf_puts(wrbuf, (const char *) child->content); } - term = term_create(odr, wrbuf_cstr(wrbuf)); - yaz_log(YLOG_DEBUG, "sru-proxy facet: %s %d", wrbuf_cstr(wrbuf), freq); + facet_term = facet_term_create_cstr(odr, wrbuf_cstr(wrbuf), freq); wrbuf_destroy(wrbuf); - return facet_term_create(odr, term, freq); + return facet_term; }; static Z_FacetField *yaz_sru_proxy_decode_facet_field(ODR odr, xmlNodePtr ptr) @@ -480,7 +482,7 @@ static Z_FacetField *yaz_sru_proxy_decode_facet_field(ODR odr, xmlNodePtr ptr) const char* name = yaz_element_attribute_value_get(ptr, "facet", "code"); yaz_log(YLOG_DEBUG, "sru-proxy facet type: %s", name); - list = yaz_use_atttribute_create(odr, name); + list = yaz_use_attribute_create(odr, name); for (node = ptr->children; node; node = node->next) { if (match_element(node, "facetvalue")) num_terms++; @@ -491,7 +493,9 @@ static Z_FacetField *yaz_sru_proxy_decode_facet_field(ODR odr, xmlNodePtr ptr) { if (match_element(node, "facetvalue")) { - facet_field_term_set(odr, facet_field, yaz_sru_proxy_get_facet_term_count(odr, node), index); + facet_field_term_set(odr, facet_field, + yaz_sru_proxy_get_facet_term_count(odr, node), + index); index++; } } @@ -519,8 +523,11 @@ static int yaz_sru_proxy_decode_facets(ODR o, xmlNodePtr root, num_facets = 0; for (node = ptr->children; node; node= node->next) { - if (match_element(node, "facet")) { - facet_list_field_set(o, facet_list, yaz_sru_proxy_decode_facet_field(o, node), num_facets); + if (match_element(node, "facet")) + { + facet_list_field_set( + o, facet_list, + yaz_sru_proxy_decode_facet_field(o, node), num_facets); num_facets++; } } @@ -572,9 +579,8 @@ static int yaz_srw_decode_diagnostics(ODR o, xmlNodePtr pptr, else if (match_xsd_string(rptr, "details", o, &(*recs)[i].details)) ; - else if (match_xsd_string(rptr, "message", o, - &(*recs)[i].message)) - ; + else + match_xsd_string(rptr, "message", o, &(*recs)[i].message); } i++; } @@ -668,9 +674,8 @@ static int yaz_srw_term(ODR o, xmlNodePtr pptr, Z_SRW_scanTerm *term, else if (match_xsd_string(ptr, "displayTerm", o, &term->displayTerm)) ; - else if (match_xsd_string(ptr, "whereInList", o, - &term->whereInList)) - ; + else + match_xsd_string(ptr, "whereInList", o, &term->whereInList); } } else if (o->direction == ODR_ENCODE) @@ -799,9 +804,8 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, else if (match_xsd_string(ptr, "stylesheet", o, &req->stylesheet)) ; - else if (match_xsd_string(ptr, "database", o, - &req->database)) - ; + else + match_xsd_string(ptr, "database", o, &req->database); } if (!req->query.cql && !req->query.pqf && !req->query.xcql) { @@ -827,6 +831,7 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, res->num_diagnostics = 0; res->nextRecordPosition = 0; res->facetList = 0; + res->suggestions = 0; for (; ptr; ptr = ptr->next) { @@ -887,9 +892,8 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, else if (match_xsd_string(ptr, "recordPacking", o, &req->recordPacking)) ; - else if (match_xsd_string(ptr, "database", o, - &req->database)) - ; + else + match_xsd_string(ptr, "database", o, &req->database); } } else if (!xmlStrcmp(method->name, BAD_CAST "explainResponse")) @@ -967,9 +971,8 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, else if (match_xsd_string(ptr, "stylesheet", o, &req->stylesheet)) ; - else if (match_xsd_string(ptr, "database", o, - &req->database)) - ; + else + match_xsd_string(ptr, "database", o, &req->database); } } else if (!xmlStrcmp(method->name, BAD_CAST "scanResponse")) @@ -1028,7 +1031,7 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, if ((*p)->srw_version) add_xsd_string(ptr, "version", (*p)->srw_version); - switch(req->query_type) + switch (req->query_type) { case Z_SRW_query_type_cql: add_xsd_string(ptr, "query", req->query.cql); @@ -1046,7 +1049,7 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, add_xsd_string(ptr, "recordSchema", req->recordSchema); add_xsd_string(ptr, "recordXPath", req->recordXPath); add_xsd_integer(ptr, "resultSetTTL", req->resultSetTTL); - switch(req->sort_type) + switch (req->sort_type) { case Z_SRW_sort_type_none: break; @@ -1131,7 +1134,7 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, xmlSetNs(ptr, ns_srw); add_xsd_string(ptr, "version", (*p)->srw_version); - switch(req->query_type) + switch (req->query_type) { case Z_SRW_query_type_cql: add_xsd_string(ptr, "scanClause", req->scanClause.cql); @@ -1227,12 +1230,13 @@ int yaz_ucp_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, ; else if (match_xsd_string(ptr, "action", o, &oper)){ - if ( oper ){ - if ( !strcmp(oper, "info:srw/action/1/delete")) + if (oper) + { + if (!strcmp(oper, "info:srw/action/1/delete")) req->operation = "delete"; else if (!strcmp(oper,"info:srw/action/1/replace" )) req->operation = "replace"; - else if ( !strcmp( oper, "info:srw/action/1/create")) + else if (!strcmp(oper, "info:srw/action/1/create")) req->operation = "insert"; } } @@ -1252,9 +1256,8 @@ int yaz_ucp_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, else if (match_xsd_string(ptr, "stylesheet", o, &req->stylesheet)) ; - else if (match_xsd_string(ptr, "database", o, - &req->database)) - ; + else + match_xsd_string(ptr, "database", o, &req->database); } } else if (!xmlStrcmp(method->name, BAD_CAST "updateResponse")) @@ -1321,7 +1324,6 @@ int yaz_ucp_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, Z_SRW_PDU **p = handler_data; xmlNsPtr ns_ucp, ns_srw; - if ((*p)->which == Z_SRW_update_request) { Z_SRW_updateRequest *req = (*p)->u.update_request; @@ -1394,7 +1396,6 @@ int yaz_ucp_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data, } else return -1; - } return 0; }