/*
- * Copyright (c) 2002-2004, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: srwutil.c,v 1.21 2005-01-09 21:50:26 adam Exp $
+ * $Id: srwutil.c,v 1.36 2006-03-01 23:24:25 adam Exp $
*/
/**
* \file srwutil.c
* \brief Implements SRW/SRU utilities.
*/
+#include <stdlib.h>
#include <yaz/srw.h>
#include <yaz/yaz-iconv.h>
return 0;
}
+void encode_uri_char(char *dst, char ch)
+{
+ if (ch == ' ')
+ strcpy(dst, "+");
+ else if ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') ||
+ (ch >= '0' && ch <= '9'))
+ {
+ dst[0] = ch;
+ dst[1] = '\0';
+ }
+ else
+ {
+ dst[0] = '%';
+ sprintf(dst+1, "%02X", (unsigned char ) ch);
+ }
+}
+
+void yaz_array_to_uri(char **path, ODR o, char **name, char **value)
+{
+ size_t i, szp = 0, sz = 0;
+ 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;
+ }
+ }
+ (*path)[szp] = '\0';
+}
+
int yaz_uri_array(const char *path, ODR o, char ***name, char ***val)
{
int no = 2;
const char *cp;
*name = 0;
- if (*path != '?')
- return no;
- path++;
+ if (*path == '?')
+ path++;
+ if (!*path)
+ return 0;
cp = path;
while ((cp = strchr(cp, '&')))
{
- cp++;
- no++;
+ cp++;
+ no++;
}
- *name = odr_malloc(o, no * sizeof(char**));
- *val = odr_malloc(o, no * sizeof(char**));
+ *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;
+ 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';
-
- if (*path)
- path++;
+ (*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';
+
+ if (*path)
+ path++;
}
(*name)[no] = 0;
(*val)[no] = 0;
*intp = odr_intdup(o, atoi(v));
}
-void yaz_mk_std_diagnostic(ODR o, Z_SRW_diagnostic *d,
- int code, const char *details)
+void yaz_mk_srw_diagnostic(ODR o, Z_SRW_diagnostic *d,
+ const char *uri, const char *message,
+ const char *details)
{
- d->uri = (char *) odr_malloc(o, 50);
- sprintf(d->uri, "info:srw/diagnostic/1/%d", code);
- d->message = 0;
+ d->uri = odr_strdup(o, uri);
+ if (message)
+ d->message = odr_strdup(o, message);
+ else
+ d->message = 0;
if (details)
- d->details = odr_strdup(o, details);
+ d->details = odr_strdup(o, details);
else
- d->details = 0;
+ d->details = 0;
}
-void yaz_add_srw_diagnostic(ODR o, Z_SRW_diagnostic **d,
- int *num, int code, const char *addinfo)
+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);
+}
+
+void yaz_add_srw_diagnostic_uri(ODR o, Z_SRW_diagnostic **d,
+ int *num, const char *uri,
+ const char *message, const char *details)
{
Z_SRW_diagnostic *d_new;
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_std_diagnostic(o, *d + *num, code, addinfo);
+ yaz_mk_srw_diagnostic(o, *d + *num, uri, message, details);
(*num)++;
}
+void yaz_add_srw_diagnostic(ODR o, Z_SRW_diagnostic **d,
+ 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);
+}
+
int yaz_srw_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
- Z_SOAP **soap_package, ODR decode, char **charset)
+ Z_SOAP **soap_package, ODR decode, char **charset)
{
if (!strcmp(hreq->method, "POST"))
{
- const char *content_type = z_HTTP_header_lookup(hreq->headers,
- "Content-Type");
- if (content_type && !yaz_strcmp_del("text/xml", content_type, "; "))
- {
- char *db = "Default";
- const char *p0 = hreq->path, *p1;
+ const char *content_type = z_HTTP_header_lookup(hreq->headers,
+ "Content-Type");
+ if (content_type &&
+ (!yaz_strcmp_del("text/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[3] = {
+
+ static Z_SOAP_Handler soap_handlers[4] = {
#if 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},
#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';
- }
+
+ 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 (charset && (charset_p = strstr(content_type, "; charset=")))
{
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;
-
- if ((*srw_pdu)->which == Z_SRW_searchRetrieve_request &&
- (*srw_pdu)->u.request->database == 0)
- (*srw_pdu)->u.request->database = db;
-
- if ((*srw_pdu)->which == Z_SRW_explain_request &&
- (*srw_pdu)->u.explain_request->database == 0)
- (*srw_pdu)->u.explain_request->database = db;
-
- if ((*srw_pdu)->which == Z_SRW_scan_request &&
- (*srw_pdu)->u.scan_request->database == 0)
- (*srw_pdu)->u.scan_request->database = db;
-
- return 0;
- }
- return 1;
- }
+ if (ret == 0 && (*soap_package)->which == Z_SOAP_generic)
+ {
+ *srw_pdu = (Z_SRW_PDU*) (*soap_package)->u.generic->p;
+
+ if ((*srw_pdu)->which == Z_SRW_searchRetrieve_request &&
+ (*srw_pdu)->u.request->database == 0)
+ (*srw_pdu)->u.request->database = db;
+
+ if ((*srw_pdu)->which == Z_SRW_explain_request &&
+ (*srw_pdu)->u.explain_request->database == 0)
+ (*srw_pdu)->u.explain_request->database = db;
+
+ if ((*srw_pdu)->which == Z_SRW_scan_request &&
+ (*srw_pdu)->u.scan_request->database == 0)
+ (*srw_pdu)->u.scan_request->database = db;
+
+ if ((*srw_pdu)->which == Z_SRW_update_request &&
+ (*srw_pdu)->u.update_request->database == 0)
+ (*srw_pdu)->u.update_request->database = db;
+
+ return 0;
+ }
+ return 1;
+ }
}
return 2;
}
+/**
+ 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)
+ Z_SOAP **soap_package, ODR decode, char **charset,
+ Z_SRW_diagnostic **diag, int *num_diag)
{
#if HAVE_XML2
static Z_SOAP_Handler soap_handlers[2] = {
- {"http://www.loc.gov/zing/srw/", 0,
- (Z_SOAP_fun) yaz_srw_codec},
- {0, 0, 0}
+ {"http://www.loc.gov/zing/srw/", 0,
+ (Z_SOAP_fun) yaz_srw_codec},
+ {0, 0, 0}
};
#endif
- if (!strcmp(hreq->method, "GET"))
+ const char *content_type = z_HTTP_header_lookup(hreq->headers,
+ "Content-Type");
+ /*
+ SRU GET: allow any content type.
+ SRU POST: we support "application/x-www-form-urlencoded";
+ not "multipart/form-data" .
+ */
+ if (!strcmp(hreq->method, "GET")
+ ||
+ (!strcmp(hreq->method, "POST")
+ && content_type &&
+ !yaz_strcmp_del("application/x-www-form-urlencoded",
+ content_type, "; ")
+ )
+ )
{
char *db = "Default";
const char *p0 = hreq->path, *p1;
- const char *operation = 0;
- char *version = 0;
- char *query = 0;
- char *pQuery = 0;
- char *sortKeys = 0;
- char *stylesheet = 0;
- char *scanClause = 0;
- char *pScanClause = 0;
- char *recordXPath = 0;
- char *recordSchema = 0;
- char *recordPacking = "xml"; /* xml packing is default for SRU */
- char *maximumRecords = 0;
- char *startRecord = 0;
- char **uri_name;
- char **uri_val;
-
- if (charset)
- *charset = 0;
+#if HAVE_XML2
+ const char *operation = 0;
+ char *version = 0;
+ char *query = 0;
+ char *pQuery = 0;
+ char *sortKeys = 0;
+ char *stylesheet = 0;
+ char *scanClause = 0;
+ char *pScanClause = 0;
+ char *recordXPath = 0;
+ char *recordSchema = 0;
+ char *recordPacking = "xml"; /* xml packing is default for SRU */
+ char *maximumRecords = 0;
+ char *startRecord = 0;
+ char *maximumTerms = 0;
+ char *responsePosition = 0;
+ char *extraRequestData = 0;
+#endif
+ char **uri_name;
+ char **uri_val;
+
+ if (charset)
+ *charset = 0;
if (*p0 == '/')
p0++;
p1 = strchr(p0, '?');
memcpy (db, p0, p1 - p0);
db[p1 - p0] = '\0';
}
- yaz_uri_array(p1, decode, &uri_name, &uri_val);
+ if (!strcmp(hreq->method, "POST"))
+ p1 = hreq->content_buf;
+ yaz_uri_array(p1, decode, &uri_name, &uri_val);
#if HAVE_XML2
- if (uri_name)
- {
- int i;
- for (i = 0; uri_name[i]; i++)
- {
- char *n = uri_name[i];
- char *v = uri_val[i];
- if (!strcmp(n, "query"))
- query = v;
- else if (!strcmp(n, "x-pquery"))
- pQuery = v;
- else if (!strcmp(n, "operation"))
- operation = v;
- else if (!strcmp(n, "stylesheet"))
- stylesheet = v;
- else if (!strcmp(n, "sortKeys"))
- sortKeys = v;
- else if (!strcmp(n, "recordXPath"))
- recordXPath = v;
- else if (!strcmp(n, "recordSchema"))
- recordSchema = v;
- else if (!strcmp(n, "recordPacking"))
- recordPacking = v;
- else if (!strcmp(n, "version"))
- version = v;
- else if (!strcmp(n, "scanClause"))
- scanClause = v;
- else if (!strcmp(n, "x-pScanClause"))
- pScanClause = v;
- else if (!strcmp(n, "maximumRecords"))
- maximumRecords = v;
- else if (!strcmp(n, "startRecord"))
- startRecord = v;
- else
- yaz_add_srw_diagnostic(decode, diag, num_diag, 8, n);
- }
- }
- if (!version)
- {
- if (uri_name)
- yaz_add_srw_diagnostic(decode, diag, num_diag, 7, "version");
- version = "1.1";
- }
- if (strcmp(version, "1.1"))
- yaz_add_srw_diagnostic(decode, diag, num_diag, 5, "1.1");
- if (!operation)
- {
- if (uri_name)
- yaz_add_srw_diagnostic(decode, diag, num_diag, 7, "operation");
- operation = "explain";
- }
+ if (uri_name)
+ {
+ int i;
+ for (i = 0; uri_name[i]; i++)
+ {
+ char *n = uri_name[i];
+ char *v = uri_val[i];
+ if (!strcmp(n, "query"))
+ query = v;
+ else if (!strcmp(n, "x-pquery"))
+ pQuery = v;
+ else if (!strcmp(n, "operation"))
+ operation = v;
+ else if (!strcmp(n, "stylesheet"))
+ stylesheet = v;
+ else if (!strcmp(n, "sortKeys"))
+ sortKeys = v;
+ else if (!strcmp(n, "recordXPath"))
+ recordXPath = v;
+ else if (!strcmp(n, "recordSchema"))
+ recordSchema = v;
+ else if (!strcmp(n, "recordPacking"))
+ recordPacking = v;
+ else if (!strcmp(n, "version"))
+ version = v;
+ else if (!strcmp(n, "scanClause"))
+ scanClause = v;
+ else if (!strcmp(n, "x-pScanClause"))
+ pScanClause = v;
+ else if (!strcmp(n, "maximumRecords"))
+ maximumRecords = v;
+ else if (!strcmp(n, "startRecord"))
+ startRecord = v;
+ else if (!strcmp(n, "maximumTerms"))
+ maximumTerms = v;
+ else if (!strcmp(n, "responsePosition"))
+ responsePosition = v;
+ else if (!strcmp(n, "extraRequestData"))
+ extraRequestData = v;
+ else
+ yaz_add_srw_diagnostic(decode, diag, num_diag, 8, n);
+ }
+ }
+ if (!version)
+ {
+ if (uri_name)
+ yaz_add_srw_diagnostic(decode, diag, num_diag, 7, "version");
+ version = "1.1";
+ }
+ if (strcmp(version, "1.1"))
+ yaz_add_srw_diagnostic(decode, diag, num_diag, 5, "1.1");
+ if (!operation)
+ {
+ if (uri_name)
+ yaz_add_srw_diagnostic(decode, diag, num_diag, 7, "operation");
+ operation = "explain";
+ }
if (!strcmp(operation, "searchRetrieve"))
{
Z_SRW_PDU *sr = yaz_srw_get(decode, Z_SRW_searchRetrieve_request);
- sr->srw_version = version;
- *srw_pdu = sr;
+ sr->srw_version = version;
+ *srw_pdu = sr;
if (query)
{
sr->u.request->query_type = Z_SRW_query_type_cql;
sr->u.request->query_type = Z_SRW_query_type_pqf;
sr->u.request->query.pqf = pQuery;
}
- else
- yaz_add_srw_diagnostic(decode, diag, num_diag, 7, "query");
+ else
+ yaz_add_srw_diagnostic(decode, diag, num_diag, 7, "query");
if (sortKeys)
{
sr->u.request->recordPacking = recordPacking;
sr->u.request->stylesheet = stylesheet;
- if (maximumRecords)
- sr->u.request->maximumRecords =
- odr_intdup(decode, atoi(maximumRecords));
- if (startRecord)
- sr->u.request->startRecord =
- odr_intdup(decode, atoi(startRecord));
+ if (maximumRecords)
+ sr->u.request->maximumRecords =
+ odr_intdup(decode, atoi(maximumRecords));
+ if (startRecord)
+ sr->u.request->startRecord =
+ odr_intdup(decode, atoi(startRecord));
sr->u.request->database = db;
- (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
- (*soap_package)->which = Z_SOAP_generic;
-
- (*soap_package)->u.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;
+ (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
+ (*soap_package)->which = Z_SOAP_generic;
+
+ (*soap_package)->u.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;
}
- else if (!strcmp(operation, "explain"))
- {
+ else if (!strcmp(operation, "explain"))
+ {
+ /* Transfer SRU explain parameters to common struct */
+ /* http://www.loc.gov/z3950/agency/zing/srw/explain.html */
Z_SRW_PDU *sr = yaz_srw_get(decode, Z_SRW_explain_request);
- sr->srw_version = version;
- *srw_pdu = sr;
+ sr->srw_version = version;
+ *srw_pdu = sr;
sr->u.explain_request->recordPacking = recordPacking;
- sr->u.explain_request->database = db;
+ sr->u.explain_request->database = db;
sr->u.explain_request->stylesheet = stylesheet;
- (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
- (*soap_package)->which = Z_SOAP_generic;
-
- (*soap_package)->u.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;
- }
- else if (!strcmp(operation, "scan"))
- {
+ (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
+ (*soap_package)->which = Z_SOAP_generic;
+
+ (*soap_package)->u.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;
+ }
+ else if (!strcmp(operation, "scan"))
+ {
+ /* Transfer SRU scan parameters to common struct */
+ /* http://www.loc.gov/z3950/agency/zing/srw/scan.html */
Z_SRW_PDU *sr = yaz_srw_get(decode, Z_SRW_scan_request);
+ sr->srw_version = version;
+ *srw_pdu = sr;
+
if (scanClause)
{
sr->u.scan_request->query_type = Z_SRW_query_type_cql;
- sr->u.scan_request->scanClause.cql = scanClause;
+ sr->u.scan_request->scanClause.cql = scanClause;
}
else if (pScanClause)
{
sr->u.scan_request->query_type = Z_SRW_query_type_pqf;
sr->u.scan_request->scanClause.pqf = pScanClause;
}
- else
- yaz_add_srw_diagnostic(decode, diag, num_diag, 7,
- "scanClause");
- sr->srw_version = version;
- *srw_pdu = sr;
- sr->u.scan_request->database = db;
+ else
+ yaz_add_srw_diagnostic(decode, diag, num_diag, 7,
+ "scanClause");
+ sr->u.scan_request->database = db;
+
+ if (maximumTerms)
+ sr->u.scan_request->maximumTerms =
+ odr_intdup(decode, atoi(maximumTerms));
+ if (responsePosition)
+ sr->u.scan_request->responsePosition =
+ odr_intdup(decode, atoi(responsePosition));
+
sr->u.scan_request->stylesheet = stylesheet;
- (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
- (*soap_package)->which = Z_SOAP_generic;
-
- (*soap_package)->u.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;
- }
- else
- {
- /* unsupported operation ... */
- /* Act as if we received a explain request and throw diagnostic. */
+ (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
+ (*soap_package)->which = Z_SOAP_generic;
+
+ (*soap_package)->u.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;
+ }
+ else
+ {
+ /* unsupported operation ... */
+ /* Act as if we received a explain request and throw diagnostic. */
Z_SRW_PDU *sr = yaz_srw_get(decode, Z_SRW_explain_request);
- sr->srw_version = version;
- *srw_pdu = sr;
+ sr->srw_version = version;
+ *srw_pdu = sr;
sr->u.explain_request->recordPacking = recordPacking;
- sr->u.explain_request->database = db;
+ sr->u.explain_request->database = db;
sr->u.explain_request->stylesheet = stylesheet;
- (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
- (*soap_package)->which = Z_SOAP_generic;
-
- (*soap_package)->u.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, 4, operation);
- return 0;
- }
+ (*soap_package) = odr_malloc(decode, sizeof(**soap_package));
+ (*soap_package)->which = Z_SOAP_generic;
+
+ (*soap_package)->u.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, 4, operation);
+ return 0;
+ }
#endif
- return 1;
+ return 1;
}
return 2;
}
+Z_SRW_extra_record *yaz_srw_get_extra_record(ODR o)
+{
+ 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;
+ return res;
+}
+
Z_SRW_PDU *yaz_srw_get(ODR o, int which)
{
Z_SRW_PDU *sr = (Z_SRW_PDU *) odr_malloc(o, sizeof(*o));
sr->u.request->recordSchema = 0;
sr->u.request->recordPacking = 0;
sr->u.request->recordXPath = 0;
- sr->u.request->database = 0;
- sr->u.request->resultSetTTL = 0;
- sr->u.request->stylesheet = 0;
+ sr->u.request->database = 0;
+ sr->u.request->resultSetTTL = 0;
+ sr->u.request->stylesheet = 0;
break;
case Z_SRW_searchRetrieve_response:
sr->u.response = (Z_SRW_searchRetrieveResponse *)
sr->u.response->diagnostics = 0;
sr->u.response->num_diagnostics = 0;
sr->u.response->nextRecordPosition = 0;
+ sr->u.response->extra_records = 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->database = 0;
- sr->u.explain_request->stylesheet = 0;
+ sr->u.explain_request->database = 0;
+ sr->u.explain_request->stylesheet = 0;
break;
case Z_SRW_explain_response:
sr->u.explain_response = (Z_SRW_explainResponse *)
odr_malloc(o, sizeof(*sr->u.explain_response));
- sr->u.explain_response->record.recordData_buf = 0;
- sr->u.explain_response->record.recordData_len = 0;
- sr->u.explain_response->record.recordSchema = 0;
- sr->u.explain_response->record.recordPosition = 0;
- sr->u.explain_response->record.recordPacking =
- Z_SRW_recordPacking_string;
- sr->u.explain_response->diagnostics = 0;
- sr->u.explain_response->num_diagnostics = 0;
- break;
+ sr->u.explain_response->record.recordData_buf = 0;
+ sr->u.explain_response->record.recordData_len = 0;
+ sr->u.explain_response->record.recordSchema = 0;
+ sr->u.explain_response->record.recordPosition = 0;
+ sr->u.explain_response->record.recordPacking =
+ Z_SRW_recordPacking_string;
+ sr->u.explain_response->diagnostics = 0;
+ sr->u.explain_response->num_diagnostics = 0;
+ sr->u.explain_response->extra_record = 0;
+ break;
case Z_SRW_scan_request:
sr->u.scan_request = (Z_SRW_scanRequest *)
odr_malloc(o, sizeof(*sr->u.scan_request));
- sr->u.scan_request->database = 0;
- 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->database = 0;
+ 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;
break;
case Z_SRW_scan_response:
sr->u.scan_response = (Z_SRW_scanResponse *)
sr->u.scan_response->num_terms = 0;
sr->u.scan_response->diagnostics = 0;
sr->u.scan_response->num_diagnostics = 0;
+ case Z_SRW_update_request:
+ sr->u.update_request = (Z_SRW_updateRequest *)
+ 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->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->extra_record = 0;
+ sr->u.update_request->extraRequestData = 0;
+ sr->u.request->database = 0;
+ break;
+ case Z_SRW_update_response:
+ sr->u.update_response = (Z_SRW_updateResponse *)
+ 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->extra_record = 0;
+ sr->u.update_response->extraResponseData = 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,
219, 1, /* bad map */
220, 1, /* bad map */
221, 1, /* bad map */
- 222, 1, /* bad map */
+ 222, 3,
223, 1, /* bad map */
224, 1, /* bad map */
225, 1, /* bad map */
return 1;
}
+static void add_val_int(ODR o, char **name, char **value, int *i,
+ char *a_name, int *val)
+{
+ if (val)
+ {
+ name[*i] = a_name;
+ value[*i] = odr_malloc(o, 30);
+ sprintf(value[*i], "%d", *val);
+ (*i)++;
+ }
+}
+
+static void add_val_str(ODR o, char **name, char **value, int *i,
+ char *a_name, char *val)
+{
+ if (val)
+ {
+ name[*i] = a_name;
+ value[*i] = val;
+ (*i)++;
+ }
+}
+
+static int yaz_get_sru_parms(const Z_SRW_PDU *srw_pdu, ODR encode,
+ char **name, char **value)
+{
+ int i = 0;
+ add_val_str(encode, name, value, &i, "version", srw_pdu->srw_version);
+ name[i] = "operation";
+ switch(srw_pdu->which)
+ {
+ case Z_SRW_searchRetrieve_request:
+ value[i++] = "searchRetrieve";
+ switch(srw_pdu->u.request->query_type)
+ {
+ 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, "x-pquery",
+ srw_pdu->u.request->query.pqf);
+ break;
+ case Z_SRW_query_type_xcql:
+ add_val_str(encode, name, value, &i, "x-cql",
+ srw_pdu->u.request->query.xcql);
+ break;
+ }
+ 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);
+ 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);
+ break;
+ case Z_SRW_explain_request:
+ value[i++] = "explain";
+ add_val_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)
+ {
+ 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, "x-pScanClause",
+ srw_pdu->u.scan_request->scanClause.pqf);
+ break;
+ case Z_SRW_query_type_xcql:
+ add_val_str(encode, name, value, &i, "x-cqlScanClause",
+ srw_pdu->u.scan_request->scanClause.xcql);
+ break;
+ }
+ 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);
+ break;
+ case Z_SRW_update_request:
+ value[i++] = "update";
+ break;
+ default:
+ return -1;
+ }
+ name[i++] = 0;
+ return 0;
+}
+
+int yaz_sru_get_encode(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
+ ODR encode, char *charset)
+{
+ char *name[30], *value[30]; /* definite upper limit for SRU params */
+ char *uri_args;
+ char *path;
+
+ if (yaz_get_sru_parms(srw_pdu, encode, name, value))
+ return -1;
+ yaz_array_to_uri(&uri_args, encode, name, value);
+
+ hreq->method = "GET";
+
+ path = odr_malloc(encode, strlen(hreq->path) + strlen(uri_args) + 3);
+ sprintf(path, "%s?%s", hreq->path, uri_args);
+ hreq->path = path;
+
+ z_HTTP_header_add_content_type(encode, &hreq->headers,
+ "text/xml", charset);
+ return 0;
+}
+
+int yaz_sru_post_encode(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
+ ODR encode, char *charset)
+{
+ char *name[30], *value[30]; /* definite upper limit for SRU params */
+ char *uri_args;
+
+ if (yaz_get_sru_parms(srw_pdu, encode, name, value))
+ return -1;
+
+ yaz_array_to_uri(&uri_args, encode, name, value);
+
+ hreq->method = "POST";
+
+ hreq->content_buf = uri_args;
+ hreq->content_len = strlen(uri_args);
+
+ z_HTTP_header_add_content_type(encode, &hreq->headers,
+ "application/x-www-form-urlencoded",
+ charset);
+ return 0;
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / yaz-moved-to-github.git / blobdiff