projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
98a78d8
)
Reformat
author
Adam Dickmeiss
<adam@indexdata.dk>
Tue, 19 Jul 2011 09:12:05 +0000
(11:12 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Tue, 19 Jul 2011 09:12:05 +0000
(11:12 +0200)
src/srw.c
patch
|
blob
|
history
diff --git
a/src/srw.c
b/src/srw.c
index
69df44a
..
e23eee0
100644
(file)
--- a/
src/srw.c
+++ b/
src/srw.c
@@
-164,11
+164,12
@@
static int match_xsd_XML_n2(xmlNodePtr ptr, const char *elem, ODR o,
}
if (no_root_nodes != 1 && fixup_root)
{
}
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);
}
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 = (char *) odr_malloc(o, buf->use + 1);
+ memcpy(*val, buf->content, buf->use);
(*val)[buf->use] = '\0';
if (len)
(*val)[buf->use] = '\0';
if (len)
@@
-223,7
+224,7
@@
char *yaz_negotiate_sru_version(char *input_ver)
if (!strcmp(input_ver, "1.1"))
return "1.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,
}
static int yaz_srw_record(ODR o, xmlNodePtr pptr, Z_SRW_record *rec,
@@
-280,7
+281,7
@@
static int yaz_srw_record(ODR o, xmlNodePtr pptr, Z_SRW_record *rec,
}
if (data_ptr)
{
}
if (data_ptr)
{
- switch(pack)
+ switch (pack)
{
case Z_SRW_recordPacking_XML:
match_xsd_XML_n2(data_ptr, "recordData", o,
{
case Z_SRW_recordPacking_XML:
match_xsd_XML_n2(data_ptr, "recordData", o,
@@
-315,7
+316,7
@@
static int yaz_srw_record(ODR o, xmlNodePtr pptr, Z_SRW_record *rec,
add_xsd_string(ptr, "recordSchema", rec->recordSchema);
if (spack)
add_xsd_string(ptr, "recordPacking", spack);
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,
{
case Z_SRW_recordPacking_string:
add_xsd_string_n(ptr, "recordData", rec->recordData_buf,
@@
-532,8
+533,11
@@
static int yaz_sru_proxy_decode_facets(ODR o, xmlNodePtr root,
num_facets = 0;
for (node = ptr->children; node; node= node->next)
{
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);
+ if (match_element(node, "facet"))
+ {
+ facet_list_field_set(
+ o, facet_list,
+ yaz_sru_proxy_decode_facet_field(o, node), num_facets);
num_facets++;
}
}
num_facets++;
}
}
@@
-1036,7
+1040,7
@@
int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
if ((*p)->srw_version)
add_xsd_string(ptr, "version", (*p)->srw_version);
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);
{
case Z_SRW_query_type_cql:
add_xsd_string(ptr, "query", req->query.cql);
@@
-1054,7
+1058,7
@@
int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
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, "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;
{
case Z_SRW_sort_type_none:
break;
@@
-1139,7
+1143,7
@@
int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
xmlSetNs(ptr, ns_srw);
add_xsd_string(ptr, "version", (*p)->srw_version);
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);
{
case Z_SRW_query_type_cql:
add_xsd_string(ptr, "scanClause", req->scanClause.cql);
@@
-1235,12
+1239,13
@@
int yaz_ucp_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
;
else if (match_xsd_string(ptr, "action", o,
&oper)){
;
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";
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";
}
}
req->operation = "insert";
}
}
@@
-1328,7
+1333,6
@@
int yaz_ucp_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
Z_SRW_PDU **p = handler_data;
xmlNsPtr ns_ucp, ns_srw;
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;
if ((*p)->which == Z_SRW_update_request)
{
Z_SRW_updateRequest *req = (*p)->u.update_request;
@@
-1401,7
+1405,6
@@
int yaz_ucp_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
}
else
return -1;
}
else
return -1;
-
}
return 0;
}
}
return 0;
}