static int yaz_srw_record(ODR o, xmlNodePtr pptr, Z_SRW_record *rec,
Z_SRW_extra_record **extra,
- void *client_data)
+ void *client_data, int version2)
{
if (o->direction == ODR_DECODE)
{
add_xsd_string(ptr, "recordSchema", rec->recordSchema);
if (spack)
- add_xsd_string(ptr, "recordPacking", spack);
+ {
+ if (version2)
+ add_xsd_string(ptr, "recordXMLEscaping", spack);
+ else
+ add_xsd_string(ptr, "recordPacking", spack);
+ }
switch (pack)
{
case Z_SRW_recordPacking_string:
static int yaz_srw_records(ODR o, xmlNodePtr pptr, Z_SRW_record **recs,
Z_SRW_extra_record ***extra,
- int *num, void *client_data)
+ int *num, void *client_data, int version2)
{
if (o->direction == ODR_DECODE)
{
if (ptr->type == XML_ELEMENT_NODE &&
!xmlStrcmp(ptr->name, BAD_CAST "record"))
{
- yaz_srw_record(o, ptr, *recs + i, *extra + i, client_data);
+ yaz_srw_record(o, ptr, *recs + i, *extra + i, client_data, 0);
i++;
}
}
xmlNodePtr rptr = xmlNewChild(pptr, 0, BAD_CAST "record",
0);
yaz_srw_record(o, rptr, (*recs)+i, (*extra ? *extra + i : 0),
- client_data);
+ client_data, version2);
}
}
return 0;
{
xmlNodePtr ptr = method->children;
Z_SRW_searchRetrieveRequest *req;
+ char *recordPacking = 0;
+ char *recordXMLEscaping = 0;
(*p)->which = Z_SRW_searchRetrieve_request;
req = (*p)->u.request = (Z_SRW_searchRetrieveRequest *)
&req->maximumRecords))
;
else if (match_xsd_string(ptr, "recordPacking", o,
- &req->recordPacking))
+ &recordPacking))
+ ;
+ else if (match_xsd_string(ptr, "recordXMLEscaping", o,
+ &recordXMLEscaping))
;
else if (match_xsd_string(ptr, "recordSchema", o,
&req->recordSchema))
/* should put proper diagnostic here */
return -1;
}
+ if (!strcmp((*p)->srw_version, "2.0"))
+ {
+ req->recordPacking = recordXMLEscaping;
+ req->packing = recordPacking;
+ }
+ else
+ {
+ req->recordPacking = recordPacking;
+ }
}
else if (!xmlStrcmp(method->name, BAD_CAST "searchRetrieveResponse"))
{
odr_malloc(o, sizeof(*res));
res->numberOfRecords = 0;
+ res->resultCountPrecision = 0;
res->resultSetId = 0;
res->resultSetIdleTime = 0;
res->records = 0;
else if (match_xsd_integer(ptr, "numberOfRecords", o,
&res->numberOfRecords))
;
+ else if (match_xsd_string(ptr, "resultCountPrecision", o,
+ &res->resultCountPrecision))
+ ;
else if (match_xsd_string(ptr, "resultSetId", o,
&res->resultSetId))
;
else if (match_xsd_integer(ptr, "resultSetIdleTime", o,
&res->resultSetIdleTime))
;
+ else if (match_xsd_integer(ptr, "resultSetTTL", o,
+ &res->resultSetIdleTime))
+ ;
else if (match_element(ptr, "records"))
yaz_srw_records(o, ptr, &res->records,
&res->extra_records,
- &res->num_records, client_data);
+ &res->num_records, client_data, 0);
else if (match_xsd_integer(ptr, "nextRecordPosition", o,
&res->nextRecordPosition))
;
;
else if (match_element(ptr, "record"))
yaz_srw_record(o, ptr, &res->record, &res->extra_record,
- client_data);
+ client_data, 0);
else if (match_element(ptr, "diagnostics"))
yaz_srw_diagnostics(o, ptr, &res->diagnostics,
&res->num_diagnostics,
}
add_xsd_integer(ptr, "startRecord", req->startRecord);
add_xsd_integer(ptr, "maximumRecords", req->maximumRecords);
- add_xsd_string(ptr, "recordPacking", req->recordPacking);
+ if (version2)
+ {
+ add_xsd_string(ptr, "recordXMLEscaping", req->recordPacking);
+ add_xsd_string(ptr, "recordPacking", req->packing);
+ }
+ else
+ add_xsd_string(ptr, "recordPacking", req->recordPacking);
add_xsd_string(ptr, "recordSchema", req->recordSchema);
add_xsd_string(ptr, "recordXPath", req->recordXPath);
add_xsd_integer(ptr, "resultSetTTL", req->resultSetTTL);
add_xsd_string(ptr, "version", (*p)->srw_version);
add_xsd_integer(ptr, "numberOfRecords", res->numberOfRecords);
add_xsd_string(ptr, "resultSetId", res->resultSetId);
- add_xsd_integer(ptr, "resultSetIdleTime", res->resultSetIdleTime);
+ add_xsd_integer(ptr,
+ version2 ? "resultSetTTL" : "resultSetIdleTime" ,
+ res->resultSetIdleTime);
if (res->num_records)
{
xmlNodePtr rptr = xmlNewChild(ptr, 0, BAD_CAST "records", 0);
yaz_srw_records(o, rptr, &res->records, &res->extra_records,
&res->num_records,
- client_data);
+ client_data, version2);
}
add_xsd_integer(ptr, "nextRecordPosition",
res->nextRecordPosition);
yaz_srw_diagnostics(o, rptr, &res->diagnostics,
&res->num_diagnostics, client_data, ns);
}
+ if (res->resultCountPrecision)
+ add_xsd_string(ptr, "resultCountPrecision",
+ res->resultCountPrecision);
}
else if ((*p)->which == Z_SRW_explain_request)
{
if (!version2)
add_xsd_string(ptr, "version", (*p)->srw_version);
- add_xsd_string(ptr, "recordPacking", req->recordPacking);
+ if (version2)
+ {
+ add_xsd_string(ptr, "recordXMLEscaping", req->recordPacking);
+ add_xsd_string(ptr, "recordPacking", req->packing);
+ }
+ else
+ add_xsd_string(ptr, "recordPacking", req->recordPacking);
add_xsd_string(ptr, "stylesheet", req->stylesheet);
add_xsd_string(ptr, "database", req->database);
}
{
xmlNodePtr ptr1 = xmlNewChild(ptr, 0, BAD_CAST "record", 0);
yaz_srw_record(o, ptr1, &res->record, &res->extra_record,
- client_data);
+ client_data, version2);
}
if (res->num_diagnostics)
{
if (!version2)
add_xsd_string(ptr, "version", (*p)->srw_version);
- if (strcmp((*p)->srw_version, "2.") > 0)
+ if (version2)
{
if (queryType && strcmp(queryType, "cql"))
add_xsd_string(ptr, "queryType", queryType);
{
req->record = yaz_srw_get_record(o);
yaz_srw_record(o, ptr, req->record, &req->extra_record,
- client_data);
+ client_data, 0);
}
else if (match_xsd_string(ptr, "stylesheet", o,
&req->stylesheet))
{
res->record = yaz_srw_get_record(o);
yaz_srw_record(o, ptr, res->record, &res->extra_record,
- client_data);
+ client_data, 0);
}
else if (match_element(ptr, "diagnostics"))
yaz_srw_diagnostics(o, ptr, &res->diagnostics,
xmlNodePtr rptr = xmlNewChild(ptr, 0, BAD_CAST "record", 0);
xmlSetNs(rptr, ns_srw);
yaz_srw_record(o, rptr, req->record, &req->extra_record,
- client_data);
+ client_data, 0);
}
if (req->extraRequestData_len)
{
xmlNodePtr rptr = xmlNewChild(ptr, 0, BAD_CAST "record", 0);
xmlSetNs(rptr, ns_srw);
yaz_srw_record(o, rptr, res->record, &res->extra_record,
- client_data);
+ client_data, 0);
}
if (res->num_diagnostics)
{