/*
- * Copyright (c) 2002-2004, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: srw.c,v 1.27 2004-10-15 00:19:00 adam Exp $
+ * $Id: srw.c,v 1.34 2005-02-04 20:27:19 adam Exp $
*/
/**
* \file srw.c
#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);
{
int i;
xmlNsPtr ns_diag =
- xmlNewNs(pptr, "info:srw/schema/1/diagnostic-v1.1", 0);
+ xmlNewNs(pptr, "http://www.loc.gov/zing/srw/diagnostic/", 0);
for (i = 0; i < *num; i++)
{
const char *std_diag = "info:srw/diagnostic/1/";
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;
}
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)
{
(*p)->which = Z_SRW_scan_request;
req = (*p)->u.scan_request = (Z_SRW_scanRequest *)
odr_malloc(o, sizeof(*req));
- req->database = 0;
- req->scanClause = 0;
- req->stylesheet = 0;
+ 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))
;
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);