-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
- *
- * $Id: srw.c,v 1.58 2007-09-09 05:54:45 adam Exp $
*/
/**
* \file srw.c
* \brief Implements SRW/SRU package encoding and decoding
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
#include <yaz/srw.h>
+#include <yaz/wrbuf.h>
#if YAZ_HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <assert.h>
+#include "sru-p.h"
+
static void add_XML_n(xmlNodePtr ptr, const char *elem, char *val, int len,
xmlNsPtr ns_ptr)
{
return add_xsd_string_ns(ptr, elem, val, 0);
}
-static void add_xsd_integer(xmlNodePtr ptr, const char *elem, const int *val)
+static void add_xsd_integer(xmlNodePtr ptr, const char *elem,
+ const Odr_int *val)
{
if (val)
{
- char str[30];
- sprintf(str, "%d", *val);
+ char str[40];
+ sprintf(str, ODR_INT_PRINTF, *val);
xmlNewTextChild(ptr, 0, BAD_CAST elem, BAD_CAST str);
}
}
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;
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 *) "<yaz_record>", -1);
+ xmlBufferAdd(buf, (const xmlChar *) "</yaz_record>", -1);
+ }
+ *val = (char *) odr_malloc(o, buf->use + 1);
+ memcpy(*val, buf->content, buf->use);
(*val)[buf->use] = '\0';
if (len)
return 1;
}
-
-static int match_xsd_integer(xmlNodePtr ptr, const char *elem, ODR o, int **val)
+
+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)
{
#if CHECK_TYPE
struct _xmlAttr *attr;
ptr = ptr->children;
if (!ptr || ptr->type != XML_TEXT_NODE)
return 0;
- *val = odr_intdup(o, atoi((const char *) ptr->content));
+ *val = odr_intdup(o, odr_atoi((const char *) ptr->content));
return 1;
}
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,
&ex.extraRecordData_buf,
&ex.extraRecordData_len) )
;
- else if (match_xsd_string(ptr, "recordIdentifier", o,
- &ex.recordIdentifier))
- ;
-
+ else
+ match_xsd_string(ptr, "recordIdentifier", o,
+ &ex.recordIdentifier);
}
if (data_ptr)
{
- switch(pack)
+ switch (pack)
{
case Z_SRW_recordPacking_XML:
- match_xsd_XML_n(data_ptr, "recordData", o,
- &rec->recordData_buf, &rec->recordData_len);
+ match_xsd_XML_n2(data_ptr, "recordData", o,
+ &rec->recordData_buf, &rec->recordData_len, 1);
break;
case Z_SRW_recordPacking_URL:
/* just store it as a string.
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,
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)
- {
+ {
xmlNodePtr ptr = pptr;
add_xsd_string(ptr, "versionType", rec->versionType);
add_xsd_string(ptr, "versionValue", rec->versionValue);
{
int i;
for (i = 0; i < *num; i++)
- {
+ {
xmlNodePtr rptr = xmlNewChild(pptr, 0, BAD_CAST "version",
0);
yaz_srw_version(o, rptr, (*vers)+i, client_data, ns);
return 0;
}
+Z_FacetTerm *yaz_sru_proxy_get_facet_term_count(ODR odr, xmlNodePtr node)
+{
+ Odr_int freq;
+ xmlNodePtr child;
+ WRBUF wrbuf = wrbuf_alloc();
+ Z_FacetTerm *facet_term;
+ const char *freq_string = yaz_element_attribute_value_get(
+ node, "facetvalue", "est_representation");
+ if (freq_string)
+ freq = odr_atoi(freq_string);
+ else
+ freq = -1;
+
+ for (child = node->children; child ; child = child->next)
+ {
+ if (child->type == XML_TEXT_NODE)
+ wrbuf_puts(wrbuf, (const char *) child->content);
+ }
+ facet_term = facet_term_create_cstr(odr, wrbuf_cstr(wrbuf), freq);
+ wrbuf_destroy(wrbuf);
+ return facet_term;
+};
+
+static Z_FacetField *yaz_sru_proxy_decode_facet_field(ODR odr, xmlNodePtr ptr)
+{
+ Z_AttributeList *list;
+ Z_FacetField *facet_field;
+ int num_terms = 0;
+ int index = 0;
+ xmlNodePtr node;
+ /* USE attribute */
+ const char* name = yaz_element_attribute_value_get(ptr, "facet", "code");
+ yaz_log(YLOG_DEBUG, "sru-proxy facet type: %s", name);
+
+ list = yaz_use_attribute_create(odr, name);
+ for (node = ptr->children; node; node = node->next) {
+ if (match_element(node, "facetvalue"))
+ num_terms++;
+ }
+ facet_field = facet_field_create(odr, list, num_terms);
+ index = 0;
+ for (node = ptr->children; node; node = node->next)
+ {
+ if (match_element(node, "facetvalue"))
+ {
+ facet_field_term_set(odr, facet_field,
+ yaz_sru_proxy_get_facet_term_count(odr, node),
+ index);
+ index++;
+ }
+ }
+ return facet_field;
+}
+
+static int yaz_sru_proxy_decode_facets(ODR o, xmlNodePtr root,
+ Z_FacetList **facetList)
+{
+ xmlNodePtr ptr;
+
+ for (ptr = root->children; ptr; ptr = ptr->next)
+ {
+ if (match_element(ptr, "facets"))
+ {
+ xmlNodePtr node;
+ Z_FacetList *facet_list;
+ int num_facets = 0;
+ for (node = ptr->children; node; node= node->next)
+ {
+ if (node->type == XML_ELEMENT_NODE)
+ num_facets++;
+ }
+ facet_list = facet_list_create(o, num_facets);
+ 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);
+ num_facets++;
+ }
+ }
+ *facetList = facet_list;
+ break;
+ }
+ }
+ return 0;
+}
+
+
static int yaz_srw_decode_diagnostics(ODR o, xmlNodePtr pptr,
Z_SRW_diagnostic **recs, int *num,
void *client_data, const char *ns)
-
{
int i;
xmlNodePtr ptr;
*num = 0;
for (ptr = pptr; ptr; ptr = ptr->next)
{
- if (ptr->type == XML_ELEMENT_NODE &&
- !xmlStrcmp(ptr->name, BAD_CAST "diagnostic"))
- (*num)++;
+ if (ptr->type == XML_ELEMENT_NODE &&
+ !xmlStrcmp(ptr->name, BAD_CAST "diagnostic"))
+ (*num)++;
}
if (!*num)
return 1;
*recs = (Z_SRW_diagnostic *) odr_malloc(o, *num * sizeof(**recs));
for (i = 0; i < *num; i++)
- {
- (*recs)[i].uri = 0;
- (*recs)[i].details = 0;
- (*recs)[i].message = 0;
- }
+ {
+ (*recs)[i].uri = 0;
+ (*recs)[i].details = 0;
+ (*recs)[i].message = 0;
+ }
for (i = 0, ptr = pptr; ptr; ptr = ptr->next)
{
if (ptr->type == XML_ELEMENT_NODE &&
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++;
}
if (match_xsd_string(ptr, "value", o, &term->value))
;
else if (match_xsd_integer(ptr, "numberOfRecords", o,
- &term->numberOfRecords))
+ &term->numberOfRecords))
;
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)
&(*p)->srw_version))
;
else if (match_xsd_string(ptr, "query", o,
- &req->query.cql))
+ &req->query.cql))
req->query_type = Z_SRW_query_type_cql;
else if (match_xsd_string(ptr, "pQuery", o,
- &req->query.pqf))
+ &req->query.pqf))
req->query_type = Z_SRW_query_type_pqf;
else if (match_xsd_string(ptr, "xQuery", o,
- &req->query.xcql))
+ &req->query.xcql))
req->query_type = Z_SRW_query_type_xcql;
else if (match_xsd_integer(ptr, "startRecord", o,
&req->startRecord))
&req->sort.sortKeys))
req->sort_type = Z_SRW_sort_type_sort;
else if (match_xsd_string(ptr, "stylesheet", o,
- &req->stylesheet))
- ;
- else if (match_xsd_string(ptr, "database", o,
- &req->database))
+ &req->stylesheet))
;
+ else
+ match_xsd_string(ptr, "database", o, &req->database);
}
if (!req->query.cql && !req->query.pqf && !req->query.xcql)
{
res->diagnostics = 0;
res->num_diagnostics = 0;
res->nextRecordPosition = 0;
+ res->facetList = 0;
+ res->suggestions = 0;
for (; ptr; ptr = ptr->next)
{
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
+ else if (match_xsd_XML_n(ptr, "extraResponseData", o,
+ &(*p)->extraResponseData_buf,
+ &(*p)->extraResponseData_len))
+ ;
else if (match_xsd_integer(ptr, "numberOfRecords", o,
- &res->numberOfRecords))
+ &res->numberOfRecords))
;
else if (match_xsd_string(ptr, "resultSetId", o,
&res->resultSetId))
yaz_srw_diagnostics(o, ptr, &res->diagnostics,
&res->num_diagnostics,
client_data, ns);
+ else if (match_element(ptr, "facet_analysis"))
+ yaz_sru_proxy_decode_facets(o, ptr, &res->facetList);
}
}
else if (!xmlStrcmp(method->name, BAD_CAST "explainRequest"))
for (; ptr; ptr = ptr->next)
{
if (match_xsd_string(ptr, "version", o,
- &(*p)->srw_version))
+ &(*p)->srw_version))
+ ;
+ else if (match_xsd_XML_n(ptr, "extraResponseData", o,
+ &(*p)->extraResponseData_buf,
+ &(*p)->extraResponseData_len))
;
else if (match_xsd_string(ptr, "stylesheet", o,
&req->stylesheet))
;
else if (match_xsd_string(ptr, "recordPacking", o,
- &req->recordPacking))
- ;
- else if (match_xsd_string(ptr, "database", o,
- &req->database))
+ &req->recordPacking))
;
+ else
+ match_xsd_string(ptr, "database", o, &req->database);
}
}
else if (!xmlStrcmp(method->name, BAD_CAST "explainResponse"))
for (; ptr; ptr = ptr->next)
{
if (match_xsd_string(ptr, "version", o,
- &(*p)->srw_version))
+ &(*p)->srw_version))
+ ;
+ else if (match_xsd_XML_n(ptr, "extraResponseData", o,
+ &(*p)->extraResponseData_buf,
+ &(*p)->extraResponseData_len))
;
else if (match_element(ptr, "record"))
yaz_srw_record(o, ptr, &res->record, &res->extra_record,
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
+ else if (match_xsd_XML_n(ptr, "extraResponseData", o,
+ &(*p)->extraResponseData_buf,
+ &(*p)->extraResponseData_len))
+ ;
else if (match_xsd_string(ptr, "scanClause", o,
- &req->scanClause.cql))
+ &req->scanClause.cql))
;
else if (match_xsd_string(ptr, "pScanClause", o,
&req->scanClause.pqf))
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"))
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
+ else if (match_xsd_XML_n(ptr, "extraResponseData", o,
+ &(*p)->extraResponseData_buf,
+ &(*p)->extraResponseData_len))
+ ;
else if (match_element(ptr, "terms"))
yaz_srw_terms(o, ptr, &res->terms,
&res->num_terms, client_data,
{
Z_SRW_PDU **p = handler_data;
xmlNsPtr ns_srw;
+ xmlNodePtr ptr = 0;
if ((*p)->which == Z_SRW_searchRetrieve_request)
{
Z_SRW_searchRetrieveRequest *req = (*p)->u.request;
- xmlNodePtr ptr = xmlNewChild(pptr, 0,
- BAD_CAST "searchRetrieveRequest", 0);
+ ptr = xmlNewChild(pptr, 0, BAD_CAST "searchRetrieveRequest", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
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);
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;
else if ((*p)->which == Z_SRW_searchRetrieve_response)
{
Z_SRW_searchRetrieveResponse *res = (*p)->u.response;
- xmlNodePtr ptr = xmlNewChild(pptr, 0,
- BAD_CAST "searchRetrieveResponse", 0);
+ ptr = xmlNewChild(pptr, 0, BAD_CAST "searchRetrieveResponse", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
else if ((*p)->which == Z_SRW_explain_request)
{
Z_SRW_explainRequest *req = (*p)->u.explain_request;
- xmlNodePtr ptr = xmlNewChild(pptr, 0, BAD_CAST "explainRequest",
- 0);
+ ptr = xmlNewChild(pptr, 0, BAD_CAST "explainRequest", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
else if ((*p)->which == Z_SRW_explain_response)
{
Z_SRW_explainResponse *res = (*p)->u.explain_response;
- xmlNodePtr ptr = xmlNewChild(pptr, 0, BAD_CAST "explainResponse",
- 0);
+ ptr = xmlNewChild(pptr, 0, BAD_CAST "explainResponse", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
else if ((*p)->which == Z_SRW_scan_request)
{
Z_SRW_scanRequest *req = (*p)->u.scan_request;
- xmlNodePtr ptr = xmlNewChild(pptr, 0, BAD_CAST "scanRequest", 0);
+ ptr = xmlNewChild(pptr, 0, BAD_CAST "scanRequest", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
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);
else if ((*p)->which == Z_SRW_scan_response)
{
Z_SRW_scanResponse *res = (*p)->u.scan_response;
- xmlNodePtr ptr = xmlNewChild(pptr, 0, BAD_CAST "scanResponse", 0);
+ ptr = xmlNewChild(pptr, 0, BAD_CAST "scanResponse", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
}
else
return -1;
+ if (ptr && (*p)->extraResponseData_len)
+ add_XML_n(ptr, "extraResponseData",
+ (*p)->extraResponseData_buf,
+ (*p)->extraResponseData_len, ns_srw);
+
}
return 0;
;
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";
}
}
client_data, ns_ucp_str);
}
else if (match_xsd_string(ptr, "stylesheet", o,
- &req->stylesheet))
- ;
- else if (match_xsd_string(ptr, "database", o,
- &req->database))
+ &req->stylesheet))
;
+ else
+ match_xsd_string(ptr, "database", o, &req->database);
}
}
else if (!xmlStrcmp(method->name, BAD_CAST "updateResponse"))
&(*p)->srw_version))
;
else if (match_xsd_string(ptr, "operationStatus", o,
- &res->operationStatus ))
+ &res->operationStatus ))
;
else if (match_xsd_string(ptr, "recordIdentifier", o,
&res->recordId))
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;
}
else
return -1;
-
}
return 0;
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
projects / yaz-moved-to-github.git / blobdiff