-/*
- * Copyright (C) 1995-2006, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
* See the file LICENSE for details.
- *
- * $Id: srwutil.c,v 1.48 2006-09-06 13:15:49 adam Exp $
*/
/**
* \file srwutil.c
* \brief Implements SRW/SRU utilities.
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
+#include <assert.h>
#include <yaz/srw.h>
+#include <yaz/matchstr.h>
+#include <yaz/base64.h>
#include <yaz/yaz-iconv.h>
+#include "sru-p.h"
-static int hex_digit (int ch)
-{
- if (ch >= '0' && ch <= '9')
- return ch - '0';
- else if (ch >= 'a' && ch <= 'f')
- return ch - 'a'+10;
- else if (ch >= 'A' && ch <= 'F')
- return ch - 'A'+10;
- return 0;
-}
+#define MAX_SRU_PARAMETERS 30
-void encode_uri_char(char *dst, char ch)
+static Z_SRW_extra_arg **append_extra_arg(ODR odr, Z_SRW_extra_arg **l,
+ const char *n, const char *v)
{
- if (ch == ' ')
- strcpy(dst, "+");
- else if ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') ||
- (ch >= '0' && ch <= '9'))
+ if (n && v && *v != '\0')
{
- dst[0] = ch;
- dst[1] = '\0';
- }
- else
- {
- dst[0] = '%';
- sprintf(dst+1, "%02X", (unsigned char ) ch);
+ while (*l)
+ l = &(*l)->next;
+ *l = (Z_SRW_extra_arg *) odr_malloc(odr, sizeof(**l));
+ (*l)->name = odr_strdup(odr, n);
+ (*l)->value = odr_strdup(odr, v);
+ (*l)->next = 0;
+ l = &(*l)->next;
}
+ return l;
}
-static void yaz_array_to_uri_ex(char **path, ODR o, char **name, char **value,
- const char *extra_args)
+static Z_SRW_extra_arg **append_extra_arg_int(ODR odr, Z_SRW_extra_arg **l,
+ const char *n, Odr_int *v)
{
- size_t i, szp = 0, sz = extra_args ? 1+strlen(extra_args) : 1;
- for(i = 0; name[i]; i++)
- sz += strlen(name[i]) + 3 + strlen(value[i]) * 3;
- *path = odr_malloc(o, sz);
-
- for(i = 0; name[i]; i++)
- {
- size_t j, ilen;
- if (i)
- (*path)[szp++] = '&';
- ilen = strlen(name[i]);
- memcpy(*path+szp, name[i], ilen);
- szp += ilen;
- (*path)[szp++] = '=';
- for (j = 0; value[i][j]; j++)
- {
- size_t vlen;
- char vstr[5];
- encode_uri_char(vstr, value[i][j]);
- vlen = strlen(vstr);
- memcpy(*path+szp, vstr, vlen);
- szp += vlen;
- }
- }
- if (extra_args)
+ if (v)
{
- if (i)
- (*path)[szp++] = '&';
- memcpy(*path + szp, extra_args, strlen(extra_args));
- szp += strlen(extra_args);
+ char str[32];
+ sprintf(str, ODR_INT_PRINTF, *v);
+ l = append_extra_arg(odr, l, n, str);
}
- (*path)[szp] = '\0';
+ return l;
}
-void yaz_array_to_uri(char **path, ODR o, char **name, char **value)
+static char *yaz_decode_sru_dbpath_odr(ODR n, const char *uri, size_t len)
{
- return yaz_array_to_uri_ex(path, o, name, value, 0);
+ return odr_strdupn(n, uri, len);
}
-int yaz_uri_array(const char *path, ODR o, char ***name, char ***val)
+void yaz_encode_sru_dbpath_buf(char *dst, const char *db)
{
- int no = 2;
- const char *cp;
- *name = 0;
- if (*path == '?')
- path++;
- if (!*path)
- return 0;
- cp = path;
- while ((cp = strchr(cp, '&')))
- {
- cp++;
- no++;
- }
- *name = odr_malloc(o, no * sizeof(char*));
- *val = odr_malloc(o, no * sizeof(char*));
-
- for (no = 0; *path; no++)
- {
- const char *p1 = strchr(path, '=');
- size_t i = 0;
- char *ret;
- if (!p1)
- break;
-
- (*name)[no] = odr_malloc(o, (p1-path)+1);
- memcpy((*name)[no], path, p1-path);
- (*name)[no][p1-path] = '\0';
-
- path = p1 + 1;
- p1 = strchr(path, '&');
- if (!p1)
- p1 = strlen(path) + path;
- (*val)[no] = ret = odr_malloc(o, p1 - path + 1);
- while (*path && *path != '&')
- {
- if (*path == '+')
- {
- ret[i++] = ' ';
- path++;
- }
- else if (*path == '%' && path[1] && path[2])
- {
- ret[i++] = hex_digit (path[1])*16 + hex_digit (path[2]);
- path = path + 3;
- }
- else
- ret[i++] = *path++;
- }
- ret[i] = '\0';
+ assert(db);
+ *dst = '/';
+ strcpy(dst+1, db);
+}
- if (*path)
- path++;
- }
- (*name)[no] = 0;
- (*val)[no] = 0;
- return no;
+char *yaz_encode_sru_dbpath_odr(ODR out, const char *db)
+{
+ char *dst = odr_malloc(out, 3 * strlen(db) + 2);
+ yaz_encode_sru_dbpath_buf(dst, db);
+ return dst;
}
-char *yaz_uri_val(const char *path, const char *name, ODR o)
+#if YAZ_HAVE_XML2
+const char *yaz_element_attribute_value_get(xmlNodePtr ptr,
+ const char *node_name,
+ const char *attribute_name)
{
- size_t nlen = strlen(name);
- if (*path != '?')
+ struct _xmlAttr *attr;
+ // check if the node name matches
+ if (strcmp((const char*) ptr->name, node_name))
return 0;
- path++;
- while (path && *path)
- {
- const char *p1 = strchr(path, '=');
- if (!p1)
- break;
- if ((size_t)(p1 - path) == nlen && !memcmp(path, name, nlen))
+ // check if the attribute name and return the value
+ for (attr = ptr->properties; attr; attr = attr->next)
+ if (attr->children && attr->children->type == XML_TEXT_NODE)
{
- size_t i = 0;
- char *ret;
-
- path = p1 + 1;
- p1 = strchr(path, '&');
- if (!p1)
- p1 = strlen(path) + path;
- ret = (char *) odr_malloc(o, p1 - path + 1);
- while (*path && *path != '&')
- {
- if (*path == '+')
- {
- ret[i++] = ' ';
- path++;
- }
- else if (*path == '%' && path[1] && path[2])
- {
- ret[i++] = hex_digit (path[1])*16 + hex_digit (path[2]);
- path = path + 3;
- }
- else
- ret[i++] = *path++;
- }
- ret[i] = '\0';
- return ret;
+ if (!strcmp((const char *) attr->name, attribute_name))
+ return (const char *) attr->children->content;
}
- path = strchr(p1, '&');
- if (path)
- path++;
- }
return 0;
}
+#endif
-static int yaz_base64decode(const char *in, char *out)
+int yaz_srw_check_content_type(Z_HTTP_Response *hres)
{
- const char *map = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "abcdefghijklmnopqrstuvwxyz0123456789+/";
- int olen = 0;
- int len = strlen(in);
-
- while (len >= 4)
+ const char *content_type = z_HTTP_header_lookup(hres->headers,
+ "Content-Type");
+ if (content_type)
{
- char i0, i1, i2, i3;
- char *p;
-
- if (!(p = strchr(map, in[0])))
- return 0;
- i0 = p - map;
- len--;
- if (!(p = strchr(map, in[1])))
- return 0;
- i1 = p - map;
- len--;
- *(out++) = i0 << 2 | i1 >> 4;
- olen++;
- if (in[2] == '=')
- break;
- if (!(p = strchr(map, in[2])))
- return 0;
- i2 = p - map;
- len--;
- *(out++) = i1 << 4 | i2 >> 2;
- olen++;
- if (in[3] == '=')
- break;
- if (!(p = strchr(map, in[3])))
- return 0;
- i3 = p - map;
- len--;
- *(out++) = i2 << 6 | i3;
- olen++;
-
- in += 4;
+ if (!yaz_strcmp_del("text/xml", content_type, "; "))
+ return 1;
+ if (!yaz_strcmp_del("application/xml", content_type, "; "))
+ return 1;
+ if (!yaz_strcmp_del("application/sru+xml", content_type, "; "))
+ return 1;
}
-
- *out = '\0';
- return olen;
+ return 0;
}
/**
if (password)
sr->password = password;
- if (basic) {
- int len, olen;
+ if (basic)
+ {
+ int len;
char out[256];
char ubuf[256] = "", pbuf[256] = "", *p;
if (strncmp(basic, "Basic ", 6))
len = strlen(basic);
if (!len || len > 256)
return;
- olen = yaz_base64decode(basic, out);
+ yaz_base64decode(basic, out);
/* Format of out should be username:password at this point */
strcpy(ubuf, out);
- if ((p = strchr(ubuf, ':'))) {
+ if ((p = strchr(ubuf, ':')))
+ {
*(p++) = '\0';
if (*p)
strcpy(pbuf, p);
}
}
-void yaz_uri_val_int(const char *path, const char *name, ODR o, int **intp)
-{
- const char *v = yaz_uri_val(path, name, o);
- if (v)
- *intp = odr_intdup(o, atoi(v));
-}
-
-void yaz_mk_srw_diagnostic(ODR o, Z_SRW_diagnostic *d,
+void yaz_mk_srw_diagnostic(ODR o, Z_SRW_diagnostic *d,
const char *uri, const char *message,
const char *details)
{
d->details = 0;
}
-void yaz_mk_std_diagnostic(ODR o, Z_SRW_diagnostic *d,
+void yaz_mk_std_diagnostic(ODR o, Z_SRW_diagnostic *d,
int code, const char *details)
{
char uri[40];
-
+
sprintf(uri, "info:srw/diagnostic/1/%d", code);
yaz_mk_srw_diagnostic(o, d, uri, 0, details);
}
const char *message, const char *details)
{
Z_SRW_diagnostic *d_new;
- d_new = (Z_SRW_diagnostic *) odr_malloc (o, (*num + 1)* sizeof(**d));
+ d_new = (Z_SRW_diagnostic *) odr_malloc(o, (*num + 1)* sizeof(**d));
if (*num)
- memcpy (d_new, *d, *num *sizeof(**d));
+ memcpy(d_new, *d, *num *sizeof(**d));
*d = d_new;
yaz_mk_srw_diagnostic(o, *d + *num, uri, message, details);
int *num, int code, const char *addinfo)
{
char uri[40];
-
+
sprintf(uri, "info:srw/diagnostic/1/%d", code);
yaz_add_srw_diagnostic_uri(o, d, num, uri, 0, addinfo);
}
+
+void yaz_add_sru_update_diagnostic(ODR o, Z_SRW_diagnostic **d,
+ int *num, int code, const char *addinfo)
+{
+ char uri[40];
+
+ sprintf(uri, "info:srw/diagnostic/12/%d", code);
+ yaz_add_srw_diagnostic_uri(o, d, num, uri, 0, addinfo);
+}
+
+
+void yaz_mk_sru_surrogate(ODR o, Z_SRW_record *record, int pos,
+ int code, const char *details)
+{
+ const char *message = yaz_diag_srw_str(code);
+ int len = 200;
+ if (message)
+ len += strlen(message);
+ if (details)
+ len += strlen(details);
+
+ record->recordData_buf = (char *) odr_malloc(o, len);
+
+ sprintf(record->recordData_buf, "<diagnostic "
+ "xmlns=\"http://www.loc.gov/zing/srw/diagnostic/\">\n"
+ " <uri>info:srw/diagnostic/1/%d</uri>\n", code);
+ if (details)
+ sprintf(record->recordData_buf + strlen(record->recordData_buf),
+ " <details>%s</details>\n", details);
+ if (message)
+ sprintf(record->recordData_buf + strlen(record->recordData_buf),
+ " <message>%s</message>\n", message);
+ sprintf(record->recordData_buf + strlen(record->recordData_buf),
+ "</diagnostic>\n");
+ record->recordData_len = strlen(record->recordData_buf);
+ record->recordPosition = odr_intdup(o, pos);
+ record->recordSchema = "info:srw/schema/1/diagnostics-v1.1";
+}
+
+static void grab_charset(ODR o, const char *content_type, char **charset)
+{
+ if (charset)
+ {
+ const char *charset_p = 0;
+ if (content_type && (charset_p = strstr(content_type, "; charset=")))
+ {
+ int j = 0, i = 0;
+ int sep = 0;
+ charset_p += 10; /* skip ; charset= */
+ if (charset_p[i] == '"' || charset_p[i] == '\'')
+ sep = charset_p[i++];
+ *charset = odr_strdup(o, charset_p);
+ while (charset_p[i] && charset_p[i] != sep)
+ {
+ if (!sep && strchr("; \n\r", charset_p[i]))
+ break;
+ if (charset_p[i] == '\\' && charset_p[i+1])
+ i++;
+ (*charset)[j++] = charset_p[i++];
+ }
+ (*charset)[j] = '\0';
+ }
+ }
+}
+
int yaz_srw_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
Z_SOAP **soap_package, ODR decode, char **charset)
{
{
const char *content_type = z_HTTP_header_lookup(hreq->headers,
"Content-Type");
- if (content_type &&
+ if (content_type &&
(!yaz_strcmp_del("text/xml", content_type, "; ") ||
!yaz_strcmp_del("application/soap+xml", content_type, "; ") ||
!yaz_strcmp_del("text/plain", content_type, "; ")))
char *db = "Default";
const char *p0 = hreq->path, *p1;
int ret = -1;
- const char *charset_p = 0;
-
- static Z_SOAP_Handler soap_handlers[4] = {
+
+ static Z_SOAP_Handler soap_handlers[5] = {
#if YAZ_HAVE_XML2
- {"http://www.loc.gov/zing/srw/", 0,
- (Z_SOAP_fun) yaz_srw_codec},
- {"http://www.loc.gov/zing/srw/v1.0/", 0,
- (Z_SOAP_fun) yaz_srw_codec},
- {"http://www.loc.gov/zing/srw/update/", 0,
- (Z_SOAP_fun) yaz_ucp_codec},
+ { YAZ_XMLNS_SRU_v1_1, 0, (Z_SOAP_fun) yaz_srw_codec },
+ { YAZ_XMLNS_SRU_v1_0, 0, (Z_SOAP_fun) yaz_srw_codec },
+ { YAZ_XMLNS_UPDATE_v0_9, 0, (Z_SOAP_fun) yaz_ucp_codec },
+ { YAZ_XMLNS_SRU_v2_mask, 0, (Z_SOAP_fun) yaz_srw_codec },
#endif
{0, 0, 0}
};
-
+
if (*p0 == '/')
p0++;
p1 = strchr(p0, '?');
if (!p1)
p1 = p0 + strlen(p0);
if (p1 != p0)
- {
- db = (char*) odr_malloc(decode, p1 - p0 + 1);
- memcpy (db, p0, p1 - p0);
- db[p1 - p0] = '\0';
- }
+ db = yaz_decode_sru_dbpath_odr(decode, p0, p1 - p0);
- if (charset && (charset_p = strstr(content_type, "; charset=")))
- {
- int i = 0;
- charset_p += 10;
- while (i < 20 && charset_p[i] &&
- !strchr("; \n\r", charset_p[i]))
- i++;
- *charset = (char*) odr_malloc(decode, i+1);
- memcpy(*charset, charset_p, i);
- (*charset)[i] = '\0';
- }
- ret = z_soap_codec(decode, soap_package,
+ ret = z_soap_codec(decode, soap_package,
&hreq->content_buf, &hreq->content_len,
soap_handlers);
if (ret == 0 && (*soap_package)->which == Z_SOAP_generic)
{
*srw_pdu = (Z_SRW_PDU*) (*soap_package)->u.generic->p;
-
+ yaz_srw_decodeauth(*srw_pdu, hreq, 0, 0, decode);
+
+ /* last entry in handlers - SRU 2.0 - is turned into
+ offset 0.. due to other pieces relying on it */
+ if ((*soap_package)->u.generic->no == 3)
+ (*soap_package)->u.generic->no = 0;
if ((*srw_pdu)->which == Z_SRW_searchRetrieve_request &&
(*srw_pdu)->u.request->database == 0)
(*srw_pdu)->u.request->database = db;
return 2;
}
-static int yaz_sru_integer_decode(ODR odr, const char *pname,
- const char *valstr, int **valp,
- Z_SRW_diagnostic **diag, int *num_diag)
-
+#if YAZ_HAVE_XML2
+static int yaz_sru_decode_integer(ODR odr, const char *pname,
+ const char *valstr, Odr_int **valp,
+ Z_SRW_diagnostic **diag, int *num_diag,
+ int min_value)
{
int ival;
if (!valstr)
YAZ_SRW_UNSUPP_PARAMETER_VALUE, pname);
return 0;
}
+ if (min_value >= 0 && ival < min_value)
+ {
+ yaz_add_srw_diagnostic(odr, diag, num_diag,
+ YAZ_SRW_UNSUPP_PARAMETER_VALUE, pname);
+ return 0;
+ }
*valp = odr_intdup(odr, ival);
return 1;
}
+#endif
+
/**
- http://www.loc.gov/z3950/agency/zing/srw/service.html
-*/
+ http://www.loc.gov/z3950/agency/zing/srw/service.html
+*/
int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
Z_SOAP **soap_package, ODR decode, char **charset,
Z_SRW_diagnostic **diag, int *num_diag)
{
#if YAZ_HAVE_XML2
static Z_SOAP_Handler soap_handlers[2] = {
- {"http://www.loc.gov/zing/srw/", 0,
- (Z_SOAP_fun) yaz_srw_codec},
+ {YAZ_XMLNS_SRU_v1_1, 0, (Z_SOAP_fun) yaz_srw_codec},
{0, 0, 0}
};
#endif
const char *content_type = z_HTTP_header_lookup(hreq->headers,
"Content-Type");
+
/*
- SRU GET: allow any content type.
+ SRU GET: ignore content type.
SRU POST: we support "application/x-www-form-urlencoded";
not "multipart/form-data" .
*/
- if (!strcmp(hreq->method, "GET")
+ if (!strcmp(hreq->method, "GET")
||
- (!strcmp(hreq->method, "POST")
- && content_type &&
+ (!strcmp(hreq->method, "POST") && content_type &&
!yaz_strcmp_del("application/x-www-form-urlencoded",
- content_type, "; ")
- )
- )
+ content_type, "; ")))
{
char *db = "Default";
const char *p0 = hreq->path, *p1;
const char *operation = 0;
char *version = 0;
char *query = 0;
+ char *queryType = "cql";
char *username = 0;
char *password = 0;
char *sortKeys = 0;
char *scanClause = 0;
char *recordXPath = 0;
char *recordSchema = 0;
- char *recordPacking = "xml"; /* xml packing is default for SRU */
+ char *recordXMLEscaping = 0;
+ char *recordPacking = 0;
char *maximumRecords = 0;
char *startRecord = 0;
char *maximumTerms = 0;
char *responsePosition = 0;
- char *extraRequestData = 0;
+ const char *facetLimit = 0;
+ const char *facetStart = 0;
+ const char *facetSort = 0;
+ Z_SRW_extra_arg *extra_args = 0;
#endif
char **uri_name;
char **uri_val;
- int querytype = Z_SRW_query_type_cql;
- if (charset)
- *charset = 0;
+ grab_charset(decode, content_type, charset);
+ if (charset && *charset == 0 && !strcmp(hreq->method, "GET"))
+ *charset = "UTF-8";
+
if (*p0 == '/')
p0++;
p1 = strchr(p0, '?');
if (!p1)
p1 = p0 + strlen(p0);
if (p1 != p0)
- {
- db = (char*) odr_malloc(decode, p1 - p0 + 1);
- memcpy (db, p0, p1 - p0);
- db[p1 - p0] = '\0';
- }
- if (!strcmp(hreq->method, "POST"))
+ db = yaz_decode_sru_dbpath_odr(decode, p0, p1 - p0);
+ if (!strcmp(hreq->method, "POST") && hreq->content_buf)
p1 = hreq->content_buf;
- yaz_uri_array(p1, decode, &uri_name, &uri_val);
+ yaz_uri_to_array(p1, decode, &uri_name, &uri_val);
#if YAZ_HAVE_XML2
if (uri_name)
{
char *v = uri_val[i];
if (!strcmp(n, "query"))
query = v;
- else if (!strcmp(n, "x-pquery")) /* deprecated */
+ else if (!strcmp(n, "x-pquery"))
{
query = v;
- querytype = Z_SRW_query_type_pqf;
- }
- else if (!strcmp(n, "x-querytype"))
- {
- if (!strcmp(v, "cql"))
- querytype = Z_SRW_query_type_cql;
- else if (!strcmp(v, "pqf"))
- querytype = Z_SRW_query_type_pqf;
- else
- {
- yaz_add_srw_diagnostic(
- decode, diag, num_diag,
- YAZ_SRW_UNSUPP_PARAMETER_VALUE, v);
- }
+ queryType = "pqf";
}
+ else if (!strcmp(n, "queryType"))
+ queryType = v;
else if (!strcmp(n, "x-username"))
username = v;
else if (!strcmp(n, "x-password"))
recordSchema = v;
else if (!strcmp(n, "recordPacking"))
recordPacking = v;
+ else if (!strcmp(n, "recordXMLEscaping"))
+ recordXMLEscaping = v;
else if (!strcmp(n, "version"))
version = v;
else if (!strcmp(n, "scanClause"))
scanClause = v;
else if (!strcmp(n, "x-pScanClause"))
{
- querytype = Z_SRW_query_type_pqf;
scanClause = v;
+ queryType = "pqf";
}
else if (!strcmp(n, "maximumRecords"))
maximumRecords = v;
maximumTerms = v;
else if (!strcmp(n, "responsePosition"))
responsePosition = v;
+ else if (!strcmp(n, "facetLimit"))
+ facetLimit = v;
+ else if (!strcmp(n, "facetStart"))
+ facetStart = v;
+ else if (!strcmp(n, "facetSort"))
+ facetSort = v;
else if (!strcmp(n, "extraRequestData"))
- extraRequestData = v;
+ ; /* ignoring extraRequestData */
+ else if (n[0] == 'x' && n[1] == '-')
+ {
+ append_extra_arg(decode, &extra_args, n, v);
+ }
else
- yaz_add_srw_diagnostic(decode, diag, num_diag,
- YAZ_SRW_UNSUPP_PARAMETER, n);
+ {
+ if (*num_diag < 10)
+ yaz_add_srw_diagnostic(decode, diag, num_diag,
+ YAZ_SRW_UNSUPP_PARAMETER, n);
+ }
}
}
- if (!version)
+ if (!operation)
{
- if (uri_name)
- yaz_add_srw_diagnostic(
- decode, diag, num_diag,
- YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "version");
- version = "1.1";
+ if (query)
+ operation = "searchRetrieve";
+ else if (scanClause)
+ operation = "scan";
+ else
+ operation = "explain";
}
- if (strcmp(version, "1.1"))
+ version = yaz_negotiate_sru_version(version);
+
+ if (!version)
+ { /* negotiation failed. */
yaz_add_srw_diagnostic(decode, diag, num_diag,
- YAZ_SRW_UNSUPP_VERSION, "1.1");
+ YAZ_SRW_UNSUPP_VERSION, "2.0");
+ version = "2.0";
+ }
if (!operation)
{
if (uri_name)
yaz_add_srw_diagnostic(
- decode, diag, num_diag,
+ decode, diag, num_diag,
YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "operation");
operation = "explain";
}
+ if (strcmp(version, "2.0"))
+ {
+ if (recordXMLEscaping)
+ {
+ yaz_add_srw_diagnostic(decode, diag, num_diag,
+ YAZ_SRW_UNSUPP_PARAMETER,
+ "recordXMLEscaping");
+
+ }
+ recordXMLEscaping = recordPacking;
+ recordPacking = "packed";
+ }
+ if (!recordXMLEscaping)
+ recordXMLEscaping = "xml";
if (!strcmp(operation, "searchRetrieve"))
{
Z_SRW_PDU *sr = yaz_srw_get(decode, Z_SRW_searchRetrieve_request);
sr->srw_version = version;
+ sr->extra_args = extra_args;
*srw_pdu = sr;
yaz_srw_decodeauth(sr, hreq, username, password, decode);
- if (query)
- {
- sr->u.request->query_type = querytype;
- sr->u.request->query.cql = query;
- }
- else
+
+ sr->u.request->queryType = queryType;
+ sr->u.request->query = query;
+
+ if (!query)
yaz_add_srw_diagnostic(
- decode, diag, num_diag,
+ decode, diag, num_diag,
YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "query");
if (sortKeys)
}
sr->u.request->recordXPath = recordXPath;
sr->u.request->recordSchema = recordSchema;
- sr->u.request->recordPacking = recordPacking;
+ sr->u.request->recordPacking = recordXMLEscaping;
+ sr->u.request->packing = recordPacking;
sr->u.request->stylesheet = stylesheet;
+ yaz_sru_facet_request(decode , &sr->u.request->facetList,
+ &facetLimit, &facetStart, &facetSort);
- yaz_sru_integer_decode(decode, "maximumRecords", maximumRecords,
- &sr->u.request->maximumRecords,
- diag, num_diag);
+ yaz_sru_decode_integer(decode, "maximumRecords", maximumRecords,
+ &sr->u.request->maximumRecords,
+ diag, num_diag, 0);
- yaz_sru_integer_decode(decode, "startRecord", startRecord,
+ yaz_sru_decode_integer(decode, "startRecord", startRecord,
&sr->u.request->startRecord,
- diag, num_diag);
+ diag, num_diag, 1);
sr->u.request->database = db;
- (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
+ (*soap_package) = (Z_SOAP *)
+ odr_malloc(decode, sizeof(**soap_package));
(*soap_package)->which = Z_SOAP_generic;
-
- (*soap_package)->u.generic =
+
+ (*soap_package)->u.generic = (Z_SOAP_Generic *)
odr_malloc(decode, sizeof(*(*soap_package)->u.generic));
-
+
(*soap_package)->u.generic->p = sr;
(*soap_package)->u.generic->ns = soap_handlers[0].ns;
(*soap_package)->u.generic->no = 0;
-
+
(*soap_package)->ns = "SRU";
return 0;
Z_SRW_PDU *sr = yaz_srw_get(decode, Z_SRW_explain_request);
sr->srw_version = version;
+ sr->extra_args = extra_args;
yaz_srw_decodeauth(sr, hreq, username, password, decode);
*srw_pdu = sr;
- sr->u.explain_request->recordPacking = recordPacking;
+ sr->u.explain_request->recordPacking = recordXMLEscaping;
+ sr->u.explain_request->packing = recordPacking;
sr->u.explain_request->database = db;
sr->u.explain_request->stylesheet = stylesheet;
- (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
+ (*soap_package) = (Z_SOAP *)
+ odr_malloc(decode, sizeof(**soap_package));
(*soap_package)->which = Z_SOAP_generic;
-
- (*soap_package)->u.generic =
+
+ (*soap_package)->u.generic = (Z_SOAP_Generic *)
odr_malloc(decode, sizeof(*(*soap_package)->u.generic));
-
+
(*soap_package)->u.generic->p = sr;
(*soap_package)->u.generic->ns = soap_handlers[0].ns;
(*soap_package)->u.generic->no = 0;
-
+
(*soap_package)->ns = "SRU";
return 0;
Z_SRW_PDU *sr = yaz_srw_get(decode, Z_SRW_scan_request);
sr->srw_version = version;
+ sr->extra_args = extra_args;
*srw_pdu = sr;
yaz_srw_decodeauth(sr, hreq, username, password, decode);
- if (scanClause)
- {
- sr->u.scan_request->query_type = querytype;
- sr->u.scan_request->scanClause.cql = scanClause;
- }
- else
+ sr->u.scan_request->queryType = queryType;
+ sr->u.scan_request->scanClause = scanClause;
+
+ if (!scanClause)
yaz_add_srw_diagnostic(
- decode, diag, num_diag,
+ decode, diag, num_diag,
YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "scanClause");
sr->u.scan_request->database = db;
-
- yaz_sru_integer_decode(decode, "maximumTerms",
- maximumTerms,
+
+ yaz_sru_decode_integer(decode, "maximumTerms",
+ maximumTerms,
&sr->u.scan_request->maximumTerms,
- diag, num_diag);
+ diag, num_diag, 0);
- yaz_sru_integer_decode(decode, "responsePosition",
- responsePosition,
+ yaz_sru_decode_integer(decode, "responsePosition",
+ responsePosition,
&sr->u.scan_request->responsePosition,
- diag, num_diag);
+ diag, num_diag, 0);
sr->u.scan_request->stylesheet = stylesheet;
- (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
+ (*soap_package) = (Z_SOAP *)
+ odr_malloc(decode, sizeof(**soap_package));
(*soap_package)->which = Z_SOAP_generic;
-
- (*soap_package)->u.generic =
+
+ (*soap_package)->u.generic = (Z_SOAP_Generic *)
odr_malloc(decode, sizeof(*(*soap_package)->u.generic));
-
+
(*soap_package)->u.generic->p = sr;
(*soap_package)->u.generic->ns = soap_handlers[0].ns;
(*soap_package)->u.generic->no = 0;
-
+
(*soap_package)->ns = "SRU";
return 0;
sr->u.explain_request->stylesheet = stylesheet;
- (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
+ (*soap_package) = (Z_SOAP *)
+ odr_malloc(decode, sizeof(**soap_package));
(*soap_package)->which = Z_SOAP_generic;
-
- (*soap_package)->u.generic =
+
+ (*soap_package)->u.generic = (Z_SOAP_Generic *)
odr_malloc(decode, sizeof(*(*soap_package)->u.generic));
-
+
(*soap_package)->u.generic->p = sr;
(*soap_package)->u.generic->ns = soap_handlers[0].ns;
(*soap_package)->u.generic->no = 0;
-
+
(*soap_package)->ns = "SRU";
- yaz_add_srw_diagnostic(decode, diag, num_diag,
+ yaz_add_srw_diagnostic(decode, diag, num_diag,
YAZ_SRW_UNSUPP_OPERATION, operation);
return 0;
}
-#endif
+#else
return 1;
+#endif
}
return 2;
}
{
Z_SRW_extra_record *res = (Z_SRW_extra_record *)
odr_malloc(o, sizeof(*res));
- res->type = 1;
- res->recordReviewCode = 0;
- res->recordReviewNote = 0;
- res->recordId = 0;
- res->nonDupRecordId = 0;
- res->recordLockStatus = 0;
- res->recordOldVersion = 0;
+
+ res->extraRecordData_buf = 0;
+ res->extraRecordData_len = 0;
+ res->recordIdentifier = 0;
return res;
}
-Z_SRW_PDU *yaz_srw_get_core_v_1_1(ODR o)
+
+Z_SRW_record *yaz_srw_get_records(ODR o, int n)
+{
+ Z_SRW_record *res = (Z_SRW_record *) odr_malloc(o, n * sizeof(*res));
+ int i;
+
+ for (i = 0; i<n; i++)
+ {
+ res[i].recordSchema = 0;
+ res[i].recordPacking = Z_SRW_recordPacking_string;
+ res[i].recordData_buf = 0;
+ res[i].recordData_len = 0;
+ res[i].recordPosition = 0;
+ }
+ return res;
+}
+
+Z_SRW_record *yaz_srw_get_record(ODR o)
+{
+ return yaz_srw_get_records(o, 1);
+}
+
+static Z_SRW_PDU *yaz_srw_get_core_ver(ODR o, const char *version)
{
Z_SRW_PDU *p = (Z_SRW_PDU *) odr_malloc(o, sizeof(*p));
- p->srw_version = odr_strdup(o, "1.1");
+ p->srw_version = odr_strdup(o, version);
p->username = 0;
p->password = 0;
p->extra_args = 0;
+ p->extraResponseData_buf = 0;
+ p->extraResponseData_len = 0;
return p;
}
+Z_SRW_PDU *yaz_srw_get_core_v_2_0(ODR o)
+{
+ return yaz_srw_get_core_ver(o, "2.0");
+}
+
Z_SRW_PDU *yaz_srw_get(ODR o, int which)
{
- Z_SRW_PDU *sr = yaz_srw_get_core_v_1_1(o);
+ return yaz_srw_get_pdu(o, which, "2.0");
+}
+
+/* http://docs.oasis-open.org/search-ws/searchRetrieve/v1.0/os/schemas/sruResponse.xsd */
+Z_SRW_PDU *yaz_srw_get_pdu_e(ODR o, int which, Z_SRW_PDU *req)
+{
+ int version2 = !req->srw_version || strcmp(req->srw_version, "2.") > 0;
+ Z_SRW_PDU *res = yaz_srw_get_pdu(o, which, req->srw_version);
+ Z_SRW_extra_arg **l = &res->extra_args, *ea;
+ l = append_extra_arg(o, l, "version", req->srw_version);
+ if (req->which == Z_SRW_searchRetrieve_request &&
+ which == Z_SRW_searchRetrieve_response)
+ {
+ if (req->u.request->queryType &&
+ strcmp(req->u.request->queryType, "cql"))
+ l = append_extra_arg(o, l, "queryType", req->u.request->queryType);
+ l = append_extra_arg(o, l, "query", req->u.request->query);
+ l = append_extra_arg_int(o, l, "startRecord",
+ req->u.request->startRecord);
+ l = append_extra_arg_int(o, l, "maximumRecords",
+ req->u.request->maximumRecords);
+ if (version2)
+ {
+ l = append_extra_arg(o, l, "recordXMLEscaping",
+ req->u.request->recordPacking);
+ l = append_extra_arg(o, l, "recordPacking",
+ req->u.request->packing);
+ }
+ else
+ l = append_extra_arg(o, l, "recordPacking",
+ req->u.request->recordPacking);
+ l = append_extra_arg(o, l, "recordSchema",
+ req->u.request->recordSchema);
+ if (req->u.request->sort_type == Z_SRW_sort_type_sort)
+ l = append_extra_arg(o, l, "sortKeys",
+ req->u.request->sort.sortKeys);
+ l = append_extra_arg(o, l, "stylesheet", req->u.request->stylesheet);
+ }
+ if (req->which == Z_SRW_explain_request &&
+ which == Z_SRW_explain_response)
+ {
+ if (version2)
+ {
+ l = append_extra_arg(o, l, "recordXMLEscaping",
+ req->u.explain_request->recordPacking);
+ l = append_extra_arg(o, l, "recordPacking",
+ req->u.explain_request->packing);
+ }
+ else
+ l = append_extra_arg(o, l, "recordPacking",
+ req->u.explain_request->recordPacking);
+ l = append_extra_arg(o, l, "stylesheet",
+ req->u.explain_request->stylesheet);
+ }
+ for (ea = req->extra_args; ea; ea = ea->next)
+ l = append_extra_arg(o, l, ea->name, ea->value);
+ return res;
+}
+
+Z_SRW_PDU *yaz_srw_get_pdu(ODR o, int which, const char *version)
+{
+ Z_SRW_PDU *sr = yaz_srw_get_core_ver(o, version);
+
sr->which = which;
- switch(which)
+ switch (which)
{
case Z_SRW_searchRetrieve_request:
sr->u.request = (Z_SRW_searchRetrieveRequest *)
odr_malloc(o, sizeof(*sr->u.request));
- sr->u.request->query_type = Z_SRW_query_type_cql;
- sr->u.request->query.cql = 0;
+ sr->u.request->queryType = "cql";
+ sr->u.request->query = 0;
sr->u.request->sort_type = Z_SRW_sort_type_none;
sr->u.request->sort.none = 0;
sr->u.request->startRecord = 0;
sr->u.request->maximumRecords = 0;
sr->u.request->recordSchema = 0;
sr->u.request->recordPacking = 0;
+ sr->u.request->packing = 0;
sr->u.request->recordXPath = 0;
sr->u.request->database = 0;
sr->u.request->resultSetTTL = 0;
sr->u.request->stylesheet = 0;
+ sr->u.request->facetList = 0;
break;
case Z_SRW_searchRetrieve_response:
sr->u.response = (Z_SRW_searchRetrieveResponse *)
odr_malloc(o, sizeof(*sr->u.response));
sr->u.response->numberOfRecords = 0;
+ sr->u.response->resultCountPrecision = 0;
sr->u.response->resultSetId = 0;
sr->u.response->resultSetIdleTime = 0;
sr->u.response->records = 0;
sr->u.response->num_diagnostics = 0;
sr->u.response->nextRecordPosition = 0;
sr->u.response->extra_records = 0;
+ sr->u.response->facetList = 0;
+ sr->u.response->suggestions = 0;
break;
case Z_SRW_explain_request:
sr->u.explain_request = (Z_SRW_explainRequest *)
odr_malloc(o, sizeof(*sr->u.explain_request));
sr->u.explain_request->recordPacking = 0;
+ sr->u.explain_request->packing = 0;
sr->u.explain_request->database = 0;
sr->u.explain_request->stylesheet = 0;
break;
sr->u.scan_request->stylesheet = 0;
sr->u.scan_request->maximumTerms = 0;
sr->u.scan_request->responsePosition = 0;
- sr->u.scan_request->query_type = Z_SRW_query_type_cql;
- sr->u.scan_request->scanClause.cql = 0;
+ sr->u.scan_request->queryType = "cql";
+ sr->u.scan_request->scanClause = 0;
break;
case Z_SRW_scan_response:
sr->u.scan_response = (Z_SRW_scanResponse *)
odr_malloc(o, sizeof(*sr->u.update_request));
sr->u.update_request->database = 0;
sr->u.update_request->stylesheet = 0;
- sr->u.update_request->record.recordSchema = 0;
- sr->u.update_request->record.recordPacking = Z_SRW_recordPacking_XML;
+ sr->u.update_request->record = 0;
sr->u.update_request->recordId = 0;
- sr->u.update_request->recordVersion = 0;
- sr->u.update_request->recordOldVersion = 0;
- sr->u.update_request->record.recordData_buf = 0;
- sr->u.update_request->record.recordData_len = 0;
+ sr->u.update_request->recordVersions = 0;
+ sr->u.update_request->num_recordVersions = 0;
sr->u.update_request->extra_record = 0;
- sr->u.update_request->extraRequestData = 0;
+ sr->u.update_request->extraRequestData_buf = 0;
+ sr->u.update_request->extraRequestData_len = 0;
sr->u.request->database = 0;
break;
case Z_SRW_update_response:
odr_malloc(o, sizeof(*sr->u.update_response));
sr->u.update_response->operationStatus = 0;
sr->u.update_response->recordId = 0;
- sr->u.update_response->recordVersion = 0;
- sr->u.update_response->recordChecksum = 0;
- sr->u.update_response->record.recordData_buf = 0;
- sr->u.update_response->record.recordData_len = 0;
- sr->u.update_response->record.recordSchema = 0;
- sr->u.update_response->record.recordPacking =
- Z_SRW_recordPacking_XML;
+ sr->u.update_response->recordVersions = 0;
+ sr->u.update_response->num_recordVersions = 0;
+ sr->u.update_response->record = 0;
sr->u.update_response->extra_record = 0;
- sr->u.update_response->extraResponseData = 0;
+ sr->u.update_response->extraResponseData_buf = 0;
+ sr->u.update_response->extraResponseData_len = 0;
sr->u.update_response->diagnostics = 0;
sr->u.update_response->num_diagnostics = 0;
}
return sr;
}
-/* bib1:srw */
-static int srw_bib1_map[] = {
- 1, 1,
- 2, 2,
- 3, 11,
- 4, 35,
- 5, 12,
- 6, 38,
- 7, 30,
- 8, 32,
- 9, 29,
- 108, 10, /* Malformed query : Syntax error */
- 10, 10,
- 11, 12,
- 11, 23,
- 12, 60,
- 13, 61,
- 13, 62,
- 14, 63,
- 14, 64,
- 14, 65,
- 15, 68,
- 15, 69,
- 16, 70,
- 17, 70,
- 18, 50,
- 19, 55,
- 20, 56,
- 21, 52,
- 22, 50,
- 23, 3,
- 24, 66,
- 25, 66,
- 26, 66,
- 27, 51,
- 28, 52,
- 29, 52,
- 30, 51,
- 31, 57,
- 32, 58,
- 33, 59,
- 100, 1, /* bad map */
- 101, 3,
- 102, 3,
- 103, 3,
- 104, 3,
- 105, 3,
- 106, 66,
- 107, 11,
- 108, 13,
- 108, 14,
- 108, 25,
- 108, 26,
- 108, 27,
- 108, 45,
-
- 109, 2,
- 110, 37,
- 111, 1,
- 112, 58,
- 113, 10,
- 114, 16,
- 115, 16,
- 116, 16,
- 117, 19,
- 117, 20,
- 118, 22,
- 119, 32,
- 119, 31,
- 120, 28,
- 121, 15,
- 122, 32,
- 123, 22,
- 123, 17,
- 123, 18,
- 124, 24,
- 125, 36,
- 126, 36,
- 127, 36,
- 128, 51,
- 129, 39,
- 130, 43,
- 131, 40,
- 132, 42,
- 201, 44,
- 201, 33,
- 201, 34,
- 202, 41,
- 203, 43,
- 205, 1, /* bad map */
- 206, 1, /* bad map */
- 207, 89,
- 208, 1, /* bad map */
- 209, 80,
- 210, 80,
- 210, 81,
- 211, 84,
- 212, 85,
- 213, 92,
- 214, 90,
- 215, 91,
- 216, 92,
- 217, 63,
- 218, 1, /* bad map */
- 219, 1, /* bad map */
- 220, 1, /* bad map */
- 221, 1, /* bad map */
- 222, 3,
- 223, 1, /* bad map */
- 224, 1, /* bad map */
- 225, 1, /* bad map */
- 226, 1, /* bad map */
- 227, 66,
- 228, 1, /* bad map */
- 229, 36,
- 230, 83,
- 231, 89,
- 232, 1,
- 233, 1, /* bad map */
- 234, 1, /* bad map */
- 235, 2,
- 236, 3,
- 237, 82,
- 238, 67,
- 239, 66,
- 240, 1, /* bad map */
- 241, 1, /* bad map */
- 242, 70,
- 243, 1, /* bad map */
- 244, 66,
- 245, 10,
- 246, 10,
- 247, 10,
- 1001, 1, /* bad map */
- 1002, 1, /* bad map */
- 1003, 1, /* bad map */
- 1004, 1, /* bad map */
- 1005, 1, /* bad map */
- 1006, 1, /* bad map */
- 1007, 100,
- 1008, 1,
- 1009, 1,
- 1010, 3,
- 1011, 3,
- 1012, 3,
- 1013, 3,
- 1014, 3,
- 1015, 3,
- 1015, 3,
- 1016, 3,
- 1017, 3,
- 1018, 2,
- 1019, 2,
- 1020, 2,
- 1021, 3,
- 1022, 3,
- 1023, 3,
- 1024, 16,
- 1025, 3,
- 1026, 64,
- 1027, 1,
- 1028, 65,
- 1029, 1,
- 1040, 1,
- /* 1041-1065 */
- 1066, 66,
- 1066, 67,
- 0
-};
-
-int yaz_diag_bib1_to_srw (int code)
-{
- const int *p = srw_bib1_map;
- while (*p)
- {
- if (code == p[0])
- return p[1];
- p += 2;
- }
- return 1;
-}
-
-int yaz_diag_srw_to_bib1(int code)
-{
- const int *p = srw_bib1_map;
- while (*p)
- {
- if (code == p[1])
- return p[0];
- p += 2;
- }
- return 1;
-}
-
-static void add_val_int(ODR o, char **name, char **value, int *i,
- char *a_name, int *val)
+void yaz_add_name_value_int(ODR o, char **name, char **value, int *i,
+ char *a_name, Odr_int *val)
{
if (val)
{
name[*i] = a_name;
- value[*i] = odr_malloc(o, 30);
- sprintf(value[*i], "%d", *val);
+ value[*i] = (char *) odr_malloc(o, 40);
+ sprintf(value[*i], ODR_INT_PRINTF, *val);
(*i)++;
}
}
-static void add_val_str(ODR o, char **name, char **value, int *i,
- char *a_name, char *val)
+void yaz_add_name_value_str(ODR o, char **name, char **value, int *i,
+ char *a_name, char *val)
{
if (val)
{
}
static int yaz_get_sru_parms(const Z_SRW_PDU *srw_pdu, ODR encode,
- char **name, char **value)
+ char **name, char **value, int max_names)
{
+ int version2 = strcmp(srw_pdu->srw_version, "2.") > 0;
int i = 0;
- add_val_str(encode, name, value, &i, "version", srw_pdu->srw_version);
+ char *queryType;
+ yaz_add_name_value_str(encode, name, value, &i, "version",
+ srw_pdu->srw_version);
name[i] = "operation";
- switch(srw_pdu->which)
+ switch (srw_pdu->which)
{
case Z_SRW_searchRetrieve_request:
value[i++] = "searchRetrieve";
- switch(srw_pdu->u.request->query_type)
+ queryType = srw_pdu->u.request->queryType;
+ if (version2)
{
- case Z_SRW_query_type_cql:
- add_val_str(encode, name, value, &i, "query",
- srw_pdu->u.request->query.cql);
- break;
- case Z_SRW_query_type_pqf:
- add_val_str(encode, name, value, &i, "query",
- srw_pdu->u.request->query.pqf);
- add_val_str(encode, name, value, &i, "x-querytype", "pqf");
- break;
- case Z_SRW_query_type_xcql:
- add_val_str(encode, name, value, &i, "query",
- srw_pdu->u.request->query.xcql);
- add_val_str(encode, name, value, &i, "x-querytype", "xcql");
- break;
+ if (queryType && strcmp(queryType, "cql"))
+ yaz_add_name_value_str(encode, name, value, &i, "queryType",
+ queryType);
+ yaz_add_name_value_str(encode, name, value, &i, "query",
+ srw_pdu->u.request->query);
}
- switch(srw_pdu->u.request->sort_type)
+ else
+ {
+ if (!strcmp(queryType, "cql"))
+ {
+ yaz_add_name_value_str(encode, name, value, &i, "query",
+ srw_pdu->u.request->query);
+ }
+ else if (!strcmp(queryType, "pqf"))
+ {
+ yaz_add_name_value_str(encode, name, value, &i, "x-pquery",
+ srw_pdu->u.request->query);
+ }
+ else if (!strcmp(queryType, "xcql"))
+ {
+ yaz_add_name_value_str(encode, name, value, &i, "x-cql",
+ srw_pdu->u.request->query);
+ }
+ }
+ switch (srw_pdu->u.request->sort_type)
{
case Z_SRW_sort_type_none:
break;
- case Z_SRW_sort_type_sort:
- add_val_str(encode, name, value, &i, "sortKeys",
- srw_pdu->u.request->sort.sortKeys);
+ case Z_SRW_sort_type_sort:
+ yaz_add_name_value_str(encode, name, value, &i, "sortKeys",
+ srw_pdu->u.request->sort.sortKeys);
break;
}
- add_val_int(encode, name, value, &i, "startRecord",
- srw_pdu->u.request->startRecord);
- add_val_int(encode, name, value, &i, "maximumRecords",
- srw_pdu->u.request->maximumRecords);
- add_val_str(encode, name, value, &i, "recordSchema",
- srw_pdu->u.request->recordSchema);
- add_val_str(encode, name, value, &i, "recordPacking",
- srw_pdu->u.request->recordPacking);
- add_val_str(encode, name, value, &i, "recordXPath",
- srw_pdu->u.request->recordXPath);
- add_val_str(encode, name, value, &i, "stylesheet",
- srw_pdu->u.request->stylesheet);
- add_val_int(encode, name, value, &i, "resultSetTTL",
- srw_pdu->u.request->resultSetTTL);
+ yaz_add_name_value_int(encode, name, value, &i, "startRecord",
+ srw_pdu->u.request->startRecord);
+ yaz_add_name_value_int(encode, name, value, &i, "maximumRecords",
+ srw_pdu->u.request->maximumRecords);
+ yaz_add_name_value_str(encode, name, value, &i, "recordSchema",
+ srw_pdu->u.request->recordSchema);
+ if (version2)
+ {
+ yaz_add_name_value_str(encode, name, value, &i, "recordXMLEscaping",
+ srw_pdu->u.request->recordPacking);
+ yaz_add_name_value_str(encode, name, value, &i, "recordPacking",
+ srw_pdu->u.request->packing);
+ }
+ else
+ yaz_add_name_value_str(encode, name, value, &i, "recordPacking",
+ srw_pdu->u.request->recordPacking);
+ yaz_add_name_value_str(encode, name, value, &i, "recordXPath",
+ srw_pdu->u.request->recordXPath);
+ yaz_add_name_value_str(encode, name, value, &i, "stylesheet",
+ srw_pdu->u.request->stylesheet);
+ yaz_add_name_value_int(encode, name, value, &i, "resultSetTTL",
+ srw_pdu->u.request->resultSetTTL);
+ {
+ const char *facetLimit = 0;
+ const char *facetStart = 0;
+ const char *facetSort = 0;
+ yaz_sru_facet_request(encode, &srw_pdu->u.request->facetList,
+ &facetLimit, &facetStart, &facetSort);
+ yaz_add_name_value_str(encode, name, value, &i, "facetLimit",
+ (char *) facetLimit);
+ yaz_add_name_value_str(encode, name, value, &i, "facetStart",
+ (char *) facetStart);
+ yaz_add_name_value_str(encode, name, value, &i, "facetSort",
+ (char *) facetSort);
+ }
break;
case Z_SRW_explain_request:
value[i++] = "explain";
- add_val_str(encode, name, value, &i, "stylesheet",
- srw_pdu->u.explain_request->stylesheet);
+
+ if (version2)
+ {
+ yaz_add_name_value_str(encode, name, value, &i, "recordXMLEscaping",
+ srw_pdu->u.explain_request->recordPacking);
+ yaz_add_name_value_str(encode, name, value, &i, "recordPacking",
+ srw_pdu->u.explain_request->packing);
+ }
+ else
+ yaz_add_name_value_str(encode, name, value, &i, "recordPacking",
+ srw_pdu->u.explain_request->recordPacking);
+ yaz_add_name_value_str(encode, name, value, &i, "stylesheet",
+ srw_pdu->u.explain_request->stylesheet);
break;
case Z_SRW_scan_request:
value[i++] = "scan";
-
- switch(srw_pdu->u.scan_request->query_type)
+ queryType = srw_pdu->u.scan_request->queryType;
+ if (version2)
{
- case Z_SRW_query_type_cql:
- add_val_str(encode, name, value, &i, "scanClause",
- srw_pdu->u.scan_request->scanClause.cql);
- break;
- case Z_SRW_query_type_pqf:
- add_val_str(encode, name, value, &i, "scanClause",
- srw_pdu->u.scan_request->scanClause.pqf);
- add_val_str(encode, name, value, &i, "x-querytype", "pqf");
- break;
- case Z_SRW_query_type_xcql:
- add_val_str(encode, name, value, &i, "scanClause",
- srw_pdu->u.scan_request->scanClause.xcql);
- add_val_str(encode, name, value, &i, "x-querytype", "xcql");
- break;
+ if (queryType && strcmp(queryType, "cql"))
+ yaz_add_name_value_str(encode, name, value, &i, "queryType",
+ queryType);
+ yaz_add_name_value_str(encode, name, value, &i, "scanClause",
+ srw_pdu->u.scan_request->scanClause);
}
- add_val_int(encode, name, value, &i, "responsePosition",
- srw_pdu->u.scan_request->responsePosition);
- add_val_int(encode, name, value, &i, "maximumTerms",
- srw_pdu->u.scan_request->maximumTerms);
- add_val_str(encode, name, value, &i, "stylesheet",
- srw_pdu->u.scan_request->stylesheet);
+ else
+ {
+ if (!queryType || !strcmp(queryType, "cql"))
+ yaz_add_name_value_str(encode, name, value, &i, "scanClause",
+ srw_pdu->u.scan_request->scanClause);
+ else if (!strcmp(queryType, "pqf"))
+ yaz_add_name_value_str(encode, name, value, &i, "x-pScanClause",
+ srw_pdu->u.scan_request->scanClause);
+ else if (!strcmp(queryType, "xcql"))
+ yaz_add_name_value_str(encode, name, value, &i,
+ "x-cqlScanClause",
+ srw_pdu->u.scan_request->scanClause);
+ }
+ yaz_add_name_value_int(encode, name, value, &i, "responsePosition",
+ srw_pdu->u.scan_request->responsePosition);
+ yaz_add_name_value_int(encode, name, value, &i, "maximumTerms",
+ srw_pdu->u.scan_request->maximumTerms);
+ yaz_add_name_value_str(encode, name, value, &i, "stylesheet",
+ srw_pdu->u.scan_request->stylesheet);
break;
case Z_SRW_update_request:
value[i++] = "update";
default:
return -1;
}
+ if (srw_pdu->extra_args)
+ {
+ Z_SRW_extra_arg *ea = srw_pdu->extra_args;
+ for (; ea && i < max_names-1; ea = ea->next)
+ {
+ name[i] = ea->name;
+ value[i] = ea->value;
+ i++;
+ }
+ }
name[i++] = 0;
+
return 0;
}
int yaz_sru_get_encode(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
ODR encode, const char *charset)
{
- char *name[30], *value[30]; /* definite upper limit for SRU params */
+ char *name[MAX_SRU_PARAMETERS], *value[MAX_SRU_PARAMETERS]; /* definite upper limit for SRU params */
char *uri_args;
char *path;
+ char *cp;
- if (yaz_get_sru_parms(srw_pdu, encode, name, value))
+ z_HTTP_header_add_basic_auth(encode, &hreq->headers,
+ srw_pdu->username, srw_pdu->password);
+ if (yaz_get_sru_parms(srw_pdu, encode, name, value, MAX_SRU_PARAMETERS))
return -1;
- yaz_array_to_uri_ex(&uri_args, encode, name, value, srw_pdu->extra_args);
+ yaz_array_to_uri(&uri_args, encode, name, value);
hreq->method = "GET";
-
- path = odr_malloc(encode, strlen(hreq->path) + strlen(uri_args) + 4
- +(srw_pdu->extra_args ? strlen(srw_pdu->extra_args) : 0)
- );
- sprintf(path, "%s?%s", hreq->path, uri_args);
+
+ cp = strchr(hreq->path, '#');
+ if (cp)
+ *cp = '\0';
+
+ path = (char *)
+ odr_malloc(encode, strlen(hreq->path) + strlen(uri_args) + 4);
+
+ sprintf(path, "%s%c%s", hreq->path, strchr(hreq->path, '?') ? '&' : '?',
+ uri_args);
hreq->path = path;
z_HTTP_header_add_content_type(encode, &hreq->headers,
int yaz_sru_post_encode(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
ODR encode, const char *charset)
{
- char *name[30], *value[30]; /* definite upper limit for SRU params */
+ char *name[MAX_SRU_PARAMETERS], *value[MAX_SRU_PARAMETERS]; /* definite upper limit for SRU params */
char *uri_args;
- if (yaz_get_sru_parms(srw_pdu, encode, name, value))
+ z_HTTP_header_add_basic_auth(encode, &hreq->headers,
+ srw_pdu->username, srw_pdu->password);
+ if (yaz_get_sru_parms(srw_pdu, encode, name, value, MAX_SRU_PARAMETERS))
return -1;
- yaz_array_to_uri_ex(&uri_args, encode, name, value, srw_pdu->extra_args);
+ yaz_array_to_uri(&uri_args, encode, name, value);
hreq->method = "POST";
-
+
hreq->content_buf = uri_args;
hreq->content_len = strlen(uri_args);
int yaz_sru_soap_encode(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
ODR odr, const char *charset)
{
- Z_SOAP_Handler handlers[2] = {
+ Z_SOAP_Handler handlers[3] = {
#if YAZ_HAVE_XML2
- {"http://www.loc.gov/zing/srw/", 0, (Z_SOAP_fun) yaz_srw_codec},
+ {YAZ_XMLNS_SRU_v1_1, 0, (Z_SOAP_fun) yaz_srw_codec},
+ {YAZ_XMLNS_UPDATE_v0_9, 0, (Z_SOAP_fun) yaz_ucp_codec},
#endif
{0, 0, 0}
};
Z_SOAP *p = (Z_SOAP*) odr_malloc(odr, sizeof(*p));
+
+ z_HTTP_header_add_basic_auth(odr, &hreq->headers,
+ srw_pdu->username, srw_pdu->password);
z_HTTP_header_add_content_type(odr,
&hreq->headers,
- "text/xml", charset);
-
+ "text/xml", 0 /* no charset in MIME */);
+
z_HTTP_header_add(odr, &hreq->headers,
"SOAPAction", "\"\"");
p->which = Z_SOAP_generic;
p->u.generic->ns = 0;
p->u.generic->p = srw_pdu;
p->ns = "http://schemas.xmlsoap.org/soap/envelope/";
-
+
+#if YAZ_HAVE_XML2
+ if (srw_pdu->which == Z_SRW_update_request ||
+ srw_pdu->which == Z_SRW_update_response)
+ p->u.generic->no = 1; /* second handler */
+#endif
return z_soap_codec_enc(odr, &p,
&hreq->content_buf,
&hreq->content_len, handlers,
charset);
}
+Z_SRW_recordVersion *yaz_srw_get_record_versions(ODR odr, int num)
+{
+ Z_SRW_recordVersion *ver
+ = (Z_SRW_recordVersion *) odr_malloc(odr,num * sizeof(*ver));
+ int i;
+ for (i = 0; i < num; ++i)
+ {
+ ver[i].versionType = 0;
+ ver[i].versionValue = 0;
+ }
+ return ver;
+}
+
+const char *yaz_srw_pack_to_str(int pack)
+{
+ switch(pack)
+ {
+ case Z_SRW_recordPacking_string:
+ return "string";
+ case Z_SRW_recordPacking_XML:
+ return "xml";
+ case Z_SRW_recordPacking_URL:
+ return "url";
+ }
+ return 0;
+}
+
+int yaz_srw_str_to_pack(const char *str)
+{
+ if (!yaz_matchstr(str, "string"))
+ return Z_SRW_recordPacking_string;
+ if (!yaz_matchstr(str, "xml"))
+ return Z_SRW_recordPacking_XML;
+ if (!yaz_matchstr(str, "url"))
+ return Z_SRW_recordPacking_URL;
+ return -1;
+}
+
+void yaz_encode_sru_extra(Z_SRW_PDU *sr, ODR odr, const char *extra_args)
+{
+ if (extra_args)
+ {
+ char **name;
+ char **val;
+ Z_SRW_extra_arg **ea = &sr->extra_args;
+ yaz_uri_to_array(extra_args, odr, &name, &val);
+
+ while (*name)
+ {
+ ea = append_extra_arg(odr, ea, *name, *val);
+ val++;
+ name++;
+ }
+ }
+}
+
+
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab