* Copyright (c) 2002-2004, Index Data.
* See the file LICENSE for details.
*
- * $Id: srw.c,v 1.24 2004-03-01 17:33:03 adam Exp $
+ * $Id: srw.c,v 1.28 2004-10-31 19:23:22 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);
}
}
}
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].uri = 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 = (*p)->u.scan_request = (Z_SRW_scanRequest *)
+ odr_malloc(o, sizeof(*req));
req->database = 0;
req->scanClause = 0;
req->stylesheet = 0;
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;