/*
- * Copyright (c) 2002-2004, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: srw.c,v 1.20 2004-01-27 21:22:44 adam Exp $
+ * $Id: srw.c,v 1.34 2005-02-04 20:27:19 adam Exp $
+ */
+/**
+ * \file srw.c
+ * \brief Implements SRW/SRU package encoding and decoding
*/
#include <yaz/srw.h>
xmlNodePtr add_xsd_string(xmlNodePtr ptr, const char *elem, const char *val)
{
if (val)
- return xmlNewChild(ptr, 0, elem, val);
+ return xmlNewTextChild(ptr, 0, elem, val);
return 0;
}
{
char str[30];
sprintf(str, "%d", *val);
- xmlNewChild(ptr, 0, elem, str);
+ xmlNewTextChild(ptr, 0, elem, str);
}
}
#endif
ptr = ptr->children;
if (!ptr || ptr->type != XML_TEXT_NODE)
- return 0;
+ {
+ *val = "";
+ return 1;
+ }
*val = odr_strdup(o, ptr->content);
if (len)
*len = strlen(ptr->content);
if (!match_element(ptr, elem))
return 0;
ptr = ptr->children;
- while (ptr && ptr->type != XML_TEXT_NODE && ptr->type != XML_COMMENT_NODE)
+ while (ptr && (ptr->type == XML_TEXT_NODE || ptr->type == XML_COMMENT_NODE))
ptr = ptr->next;
if (!ptr)
return 0;
}
if (!*num)
return 1;
- *recs = odr_malloc(o, *num * sizeof(**recs));
+ *recs = (Z_SRW_record *) odr_malloc(o, *num * sizeof(**recs));
for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next)
{
if (ptr->type == XML_ELEMENT_NODE &&
}
if (!*num)
return 1;
- *recs = odr_malloc(o, *num * sizeof(**recs));
+ *recs = (Z_SRW_diagnostic *) odr_malloc(o, *num * sizeof(**recs));
for (i = 0; i < *num; i++)
{
- (*recs)[i].code = 0;
+ (*recs)[i].uri = 0;
(*recs)[i].details = 0;
(*recs)[i].message = 0;
}
!strcmp(ptr->name, "diagnostic"))
{
xmlNodePtr rptr;
- (*recs)[i].code = 0;
+ (*recs)[i].uri = 0;
(*recs)[i].details = 0;
(*recs)[i].message = 0;
for (rptr = ptr->children; rptr; rptr = rptr->next)
{
- if (match_xsd_string(rptr, "code", o,
- &(*recs)[i].code))
+ if (match_xsd_string(rptr, "uri", o,
+ &(*recs)[i].uri))
;
else if (match_xsd_string(rptr, "details", o,
&(*recs)[i].details))
{
int i;
xmlNsPtr ns_diag =
- xmlNewNs(pptr, "http://www.loc.gov/zing/srw/diagnostics/", "diag");
+ xmlNewNs(pptr, "http://www.loc.gov/zing/srw/diagnostic/", 0);
for (i = 0; i < *num; i++)
{
const char *std_diag = "info:srw/diagnostic/1/";
xmlNodePtr rptr = xmlNewChild(pptr, ns_diag, "diagnostic", 0);
- add_xsd_string(rptr, "code", (*recs)[i].code);
+ add_xsd_string(rptr, "uri", (*recs)[i].uri);
if ((*recs)[i].message)
add_xsd_string(rptr, "message", (*recs)[i].message);
- else if ((*recs)[i].code &&
- !strncmp((*recs)[i].code, std_diag, strlen(std_diag)))
+ else if ((*recs)[i].uri &&
+ !strncmp((*recs)[i].uri, std_diag, strlen(std_diag)))
{
- int no = atoi((*recs)[i].code + strlen(std_diag));
+ int no = atoi((*recs)[i].uri + strlen(std_diag));
const char *message = yaz_diag_srw_str(no);
if (message)
add_xsd_string(rptr, "message", message);
term->value = 0;
term->numberOfRecords = 0;
term->displayTerm = 0;
+ term->whereInList = 0;
for (ptr = pptr->children; ptr; ptr = ptr->next)
{
if (match_xsd_string(ptr, "value", o, &term->value))
else if (match_xsd_string(ptr, "displayTerm", o,
&term->displayTerm))
;
+ else if (match_xsd_string(ptr, "whereInList", o,
+ &term->whereInList))
+ ;
}
}
else if (o->direction == ODR_ENCODE)
{
xmlNodePtr ptr = pptr;
add_xsd_string(ptr, "value", term->value);
- add_xsd_integer(ptr, "value", term->numberOfRecords);
+ add_xsd_integer(ptr, "numberOfRecords", term->numberOfRecords);
add_xsd_string(ptr, "displayTerm", term->displayTerm);
+ add_xsd_string(ptr, "whereInList", term->whereInList);
}
return 0;
}
}
if (!*num)
return 1;
- *terms = odr_malloc(o, *num * sizeof(**terms));
+ *terms = (Z_SRW_scanTerm *) odr_malloc(o, *num * sizeof(**terms));
for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next, i++)
{
if (ptr->type == XML_ELEMENT_NODE &&
int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
void *client_data, const char *ns)
{
- xmlNodePtr pptr = vptr;
+ xmlNodePtr pptr = (xmlNodePtr) vptr;
if (o->direction == ODR_DECODE)
{
Z_SRW_PDU **p = handler_data;
if (method->type != XML_ELEMENT_NODE)
return -1;
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_SRW_PDU *) odr_malloc(o, sizeof(**p));
(*p)->srw_version = odr_strdup(o, "1.1");
if (!strcmp(method->name, "searchRetrieveRequest"))
Z_SRW_searchRetrieveRequest *req;
(*p)->which = Z_SRW_searchRetrieve_request;
- req = (*p)->u.request = odr_malloc(o, sizeof(*req));
+ req = (*p)->u.request = (Z_SRW_searchRetrieveRequest *)
+ odr_malloc(o, sizeof(*req));
req->query_type = Z_SRW_query_type_cql;
req->query.cql = 0;
req->sort_type = Z_SRW_sort_type_none;
Z_SRW_searchRetrieveResponse *res;
(*p)->which = Z_SRW_searchRetrieve_response;
- res = (*p)->u.response = odr_malloc(o, sizeof(*res));
+ res = (*p)->u.response = (Z_SRW_searchRetrieveResponse *)
+ odr_malloc(o, sizeof(*res));
res->numberOfRecords = 0;
res->resultSetId = 0;
xmlNodePtr ptr = method->children;
(*p)->which = Z_SRW_explain_request;
- req = (*p)->u.explain_request = odr_malloc(o, sizeof(*req));
+ req = (*p)->u.explain_request = (Z_SRW_explainRequest *)
+ odr_malloc(o, sizeof(*req));
req->recordPacking = 0;
req->database = 0;
req->stylesheet = 0;
xmlNodePtr ptr = method->children;
(*p)->which = Z_SRW_explain_response;
- res = (*p)->u.explain_response = odr_malloc(o, sizeof(*res));
+ res = (*p)->u.explain_response = (Z_SRW_explainResponse*)
+ odr_malloc(o, sizeof(*res));
res->diagnostics = 0;
res->num_diagnostics = 0;
+ res->record.recordSchema = 0;
+ res->record.recordData_buf = 0;
+ res->record.recordData_len = 0;
+ res->record.recordPosition = 0;
for (; ptr; ptr = ptr->next)
{
xmlNodePtr ptr = method->children;
(*p)->which = Z_SRW_scan_request;
- req = (*p)->u.scan_request = odr_malloc(o, sizeof(*req));
- req->database = 0;
- req->scanClause = 0;
- req->stylesheet = 0;
+ req = (*p)->u.scan_request = (Z_SRW_scanRequest *)
+ odr_malloc(o, sizeof(*req));
+ req->query_type = Z_SRW_query_type_cql;
+ req->scanClause.cql = 0;
req->responsePosition = 0;
req->maximumTerms = 0;
+ req->stylesheet = 0;
+ req->database = 0;
for (; ptr; ptr = ptr->next)
{
&(*p)->srw_version))
;
else if (match_xsd_string(ptr, "scanClause", o,
- &req->scanClause))
+ &req->scanClause.cql))
;
+ else if (match_xsd_string(ptr, "pScanClause", o,
+ &req->scanClause.pqf))
+ {
+ req->query_type = Z_SRW_query_type_pqf;
+ }
else if (match_xsd_integer(ptr, "responsePosition", o,
&req->responsePosition))
;
xmlNodePtr ptr = method->children;
(*p)->which = Z_SRW_scan_response;
- res = (*p)->u.scan_response = odr_malloc(o, sizeof(*res));
+ res = (*p)->u.scan_response = (Z_SRW_scanResponse *)
+ odr_malloc(o, sizeof(*res));
res->terms = 0;
res->num_terms = 0;
res->diagnostics = 0;
xmlSetNs(ptr, ns_srw);
add_xsd_string(ptr, "version", (*p)->srw_version);
- add_xsd_string(ptr, "scanClause", req->scanClause);
+ switch(req->query_type)
+ {
+ case Z_SRW_query_type_cql:
+ add_xsd_string(ptr, "scanClause", req->scanClause.cql);
+ break;
+ case Z_SRW_query_type_pqf:
+ add_xsd_string(ptr, "pScanClause", req->scanClause.pqf);
+ break;
+ }
add_xsd_integer(ptr, "responsePosition", req->responsePosition);
add_xsd_integer(ptr, "maximumTerms", req->maximumTerms);
add_xsd_string(ptr, "stylesheet", req->stylesheet);
projects / yaz-moved-to-github.git / blobdiff