X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsrwutil.c;h=274619943d9ea5f69d41ee8903678b7d3bc3ea24;hp=226b43aae874ebdfdfa904b9199633d1b34b09bc;hb=9d99233343d990135fe697f47f5933b1fd74cb0b;hpb=073195289eb9b73d6793fa283e5a7dca7a24fba8 diff --git a/src/srwutil.c b/src/srwutil.c index 226b43a..2746199 100644 --- a/src/srwutil.c +++ b/src/srwutil.c @@ -1,321 +1,504 @@ -/* - * Copyright (c) 2002-2004, Index Data. +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. - * - * $Id: srwutil.c,v 1.8 2004-01-09 18:10:32 adam Exp $ + */ +/** + * \file srwutil.c + * \brief Implements SRW/SRU utilities. */ +#include +#include #include +#include #include +#include "sru-p.h" -static int hex_digit (int ch) +static char *yaz_decode_sru_dbpath_odr(ODR n, const char *uri, size_t len) { - 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; + 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 != '?') - return no; - path++; - cp = path; - while ((cp = strchr(cp, '&'))) - { - cp++; - no++; - } - *name = odr_malloc(o, no * sizeof(char**)); - *val = odr_malloc(o, no * sizeof(char**)); + assert(db); + *dst = '/'; + strcpy(dst+1, db); +} - for (no = 0; *path; 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; +} + +#if YAZ_HAVE_XML2 +static int yaz_base64decode(const char *in, char *out) +{ + const char *map = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz0123456789+/"; + int olen = 0; + int len = strlen(in); + + while (len >= 4) { - const char *p1 = strchr(path, '='); - size_t i = 0; - char *ret; - if (!p1) - break; + char i0, i1, i2, i3; + char *p; - (*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++; + 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; } - (*name)[no] = 0; - (*val)[no] = 0; - return no; + + *out = '\0'; + return olen; } +#endif -char *yaz_uri_val(const char *path, const char *name, ODR o) +int yaz_srw_check_content_type(Z_HTTP_Response *hres) { - size_t nlen = strlen(name); - if (*path != '?') - return 0; - path++; - while (path && *path) + const char *content_type = z_HTTP_header_lookup(hres->headers, + "Content-Type"); + if (content_type) { - const char *p1 = strchr(path, '='); - if (!p1) - break; - if ((size_t)(p1 - path) == nlen && !memcmp(path, name, nlen)) - { - size_t i = 0; - char *ret; - - path = p1 + 1; - p1 = strchr(path, '&'); - if (!p1) - p1 = strlen(path) + path; - 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'; - return ret; - } - path = strchr(p1, '&'); - if (path) - path++; + if (!yaz_strcmp_del("text/xml", content_type, "; ")) + return 1; + if (!yaz_strcmp_del("application/xml", content_type, "; ")) + return 1; } return 0; } -void yaz_uri_val_int(const char *path, const char *name, ODR o, int **intp) +/** + * Look for authentication tokens in HTTP Basic parameters or in x-username/x-password + * parameters. Added by SH. + */ +#if YAZ_HAVE_XML2 +static void yaz_srw_decodeauth(Z_SRW_PDU *sr, Z_HTTP_Request *hreq, + char *username, char *password, ODR decode) +{ + const char *basic = z_HTTP_header_lookup(hreq->headers, "Authorization"); + + if (username) + sr->username = username; + if (password) + sr->password = password; + + if (basic) { + int len, olen; + char out[256]; + char ubuf[256] = "", pbuf[256] = "", *p; + if (strncmp(basic, "Basic ", 6)) + return; + basic += 6; + len = strlen(basic); + if (!len || len > 256) + return; + olen = yaz_base64decode(basic, out); + /* Format of out should be username:password at this point */ + strcpy(ubuf, out); + if ((p = strchr(ubuf, ':'))) { + *(p++) = '\0'; + if (*p) + strcpy(pbuf, p); + } + if (*ubuf) + sr->username = odr_strdup(decode, ubuf); + if (*pbuf) + sr->password = odr_strdup(decode, pbuf); + } +} +#endif + +void yaz_uri_val_int(const char *path, const char *name, ODR o, Odr_int **intp) { const char *v = yaz_uri_val(path, name, o); if (v) *intp = odr_intdup(o, atoi(v)); } -void yaz_add_srw_diagnostic(ODR o, Z_SRW_diagnostic **d, - int *num, int code, const char *addinfo) +void yaz_mk_srw_diagnostic(ODR o, Z_SRW_diagnostic *d, + const char *uri, const char *message, + const char *details) +{ + 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); + else + d->details = 0; +} + +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; - (*d + *num)->code = odr_intdup(o, code); - if (addinfo) - (*d + *num)->details = odr_strdup(o, addinfo); - else - (*d + *num)->details = 0; + + 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); +} + + +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, "\n" + " info:srw/diagnostic/1/%d\n", code); + if (details) + sprintf(record->recordData_buf + strlen(record->recordData_buf), + "
%s
\n", details); + if (message) + sprintf(record->recordData_buf + strlen(record->recordData_buf), + " %s\n", message); + sprintf(record->recordData_buf + strlen(record->recordData_buf), + "\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 i = 0; + charset_p += 10; + while (i < 20 && charset_p[i] && + !strchr("; \n\r", charset_p[i])) + i++; + *charset = (char*) odr_malloc(o, i+1); + memcpy(*charset, charset_p, i); + (*charset)[i] = '\0'; + } + } +} + 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("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[3] = { -#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}, + + static Z_SOAP_Handler soap_handlers[4] = { +#if YAZ_HAVE_XML2 + { 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 }, #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 (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'; - } + + if (*p0 == '/') + p0++; + p1 = strchr(p0, '?'); + if (!p1) + p1 = p0 + strlen(p0); + if (p1 != p0) + db = yaz_decode_sru_dbpath_odr(decode, p0, p1 - p0); + grab_charset(decode, 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; } +#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) + return 0; + if (sscanf(valstr, "%d", &ival) != 1) + { + yaz_add_srw_diagnostic(odr, diag, num_diag, + 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 +*/ 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 +#if YAZ_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} + {YAZ_XMLNS_SRU_v1_1, 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: ignore 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 *recordXPath = 0; - char *recordSchema = 0; - char *recordPacking = "xml"; - char *maximumRecords = 0; - char *startRecord = 0; - char **uri_name; - char **uri_val; - - if (charset) - *charset = 0; +#if YAZ_HAVE_XML2 + const char *operation = 0; + char *version = 0; + char *query = 0; + char *pQuery = 0; + char *username = 0; + char *password = 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; + Z_SRW_extra_arg *extra_args = 0; +#endif + char **uri_name; + char **uri_val; + + 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 = yaz_decode_sru_dbpath_odr(decode, p0, p1 - p0); + if (!strcmp(hreq->method, "POST")) + p1 = hreq->content_buf; + yaz_uri_to_array(p1, decode, &uri_name, &uri_val); +#if YAZ_HAVE_XML2 + if (uri_name) { - db = (char*) odr_malloc(decode, p1 - p0 + 1); - memcpy (db, p0, p1 - p0); - db[p1 - p0] = '\0'; + 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, "x-username")) + username = v; + else if (!strcmp(n, "x-password")) + password = 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 if (n[0] == 'x' && n[1] == '-') + { + Z_SRW_extra_arg **l = &extra_args; + while (*l) + l = &(*l)->next; + *l = (Z_SRW_extra_arg *) odr_malloc(decode, sizeof(**l)); + (*l)->name = odr_strdup(decode, n); + (*l)->value = odr_strdup(decode, v); + (*l)->next = 0; + } + else + yaz_add_srw_diagnostic(decode, diag, num_diag, + YAZ_SRW_UNSUPP_PARAMETER, n); + } + } + if (!version) + { + if (uri_name) + yaz_add_srw_diagnostic( + decode, diag, num_diag, + YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "version"); + 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.2"); + version = "1.2"; + } + + if (!operation) + { + if (uri_name) + yaz_add_srw_diagnostic( + decode, diag, num_diag, + YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "operation"); + operation = "explain"; } - 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, "maximumRecords")) - maximumRecords = v; - else if (!strcmp(n, "startRecord")) - startRecord = v; - else - yaz_add_srw_diagnostic(decode, diag, num_diag, 9, n); - } - } - if (!version) - yaz_add_srw_diagnostic(decode, diag, num_diag, 7, "version"); - else if (version && strcmp(version, "1.1")) - yaz_add_srw_diagnostic(decode, diag, num_diag, 5, "1.1"); - if (!operation) - { - 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; + sr->extra_args = extra_args; + *srw_pdu = sr; + yaz_srw_decodeauth(sr, hreq, username, password, decode); if (query) { sr->u.request->query_type = Z_SRW_query_type_cql; @@ -326,8 +509,10 @@ int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu, 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, + YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "query"); if (sortKeys) { @@ -339,121 +524,211 @@ int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu, 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)); + yaz_sru_decode_integer(decode, "maximumRecords", maximumRecords, + &sr->u.request->maximumRecords, + diag, num_diag, 0); + + yaz_sru_decode_integer(decode, "startRecord", startRecord, + &sr->u.request->startRecord, + diag, num_diag, 1); 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"; + (*soap_package) = (Z_SOAP *) + odr_malloc(decode, sizeof(**soap_package)); + (*soap_package)->which = Z_SOAP_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; + 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; + 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->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"; + (*soap_package) = (Z_SOAP *) + odr_malloc(decode, sizeof(**soap_package)); + (*soap_package)->which = Z_SOAP_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; - } - else if (!strcmp(operation, "scan")) - { + 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); - if (!scanClause) - yaz_add_srw_diagnostic(decode, diag, num_diag, 7, - "scanClause"); - sr->srw_version = version; - *srw_pdu = sr; - sr->u.scan_request->scanClause = scanClause; - sr->u.scan_request->database = db; + 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 = Z_SRW_query_type_cql; + 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, + YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "scanClause"); + sr->u.scan_request->database = db; + + yaz_sru_decode_integer(decode, "maximumTerms", + maximumTerms, + &sr->u.scan_request->maximumTerms, + diag, num_diag, 0); + + yaz_sru_decode_integer(decode, "responsePosition", + responsePosition, + &sr->u.scan_request->responsePosition, + diag, num_diag, 0); + 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"; + (*soap_package) = (Z_SOAP *) + odr_malloc(decode, sizeof(**soap_package)); + (*soap_package)->which = Z_SOAP_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; - } - else - { - /* unsupported operation ... */ - /* Act as if we received a explain request and throw diagnostic. */ + 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) = (Z_SOAP *) + odr_malloc(decode, sizeof(**soap_package)); + (*soap_package)->which = Z_SOAP_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_SRW_UNSUPP_OPERATION, 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->extraRecordData_buf = 0; + res->extraRecordData_len = 0; + res->recordIdentifier = 0; + return res; +} + + +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; isrw_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_1_1(ODR o) +{ + return yaz_srw_get_core_ver(o, "1.1"); +} + Z_SRW_PDU *yaz_srw_get(ODR o, int which) { - Z_SRW_PDU *sr = odr_malloc(o, sizeof(*o)); + return yaz_srw_get_pdu(o, which, "1.1"); +} + +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->srw_version = odr_strdup(o, "1.1"); sr->which = which; switch(which) { @@ -469,9 +744,10 @@ Z_SRW_PDU *yaz_srw_get(ODR o, int which) 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; + sr->u.request->facetList = 0; break; case Z_SRW_searchRetrieve_response: sr->u.response = (Z_SRW_searchRetrieveResponse *) @@ -484,34 +760,38 @@ Z_SRW_PDU *yaz_srw_get(ODR o, int which) sr->u.response->diagnostics = 0; sr->u.response->num_diagnostics = 0; sr->u.response->nextRecordPosition = 0; + sr->u.response->extra_records = 0; + sr->u.response->facetList = 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->scanClause = 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 *) @@ -520,111 +800,40 @@ Z_SRW_PDU *yaz_srw_get(ODR o, int which) sr->u.scan_response->num_terms = 0; sr->u.scan_response->diagnostics = 0; sr->u.scan_response->num_diagnostics = 0; + break; + 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 = 0; + sr->u.update_request->recordId = 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_buf = 0; + sr->u.update_request->extraRequestData_len = 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->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_buf = 0; + sr->u.update_response->extraResponseData_len = 0; + sr->u.update_response->diagnostics = 0; + sr->u.update_response->num_diagnostics = 0; } return sr; } - -static struct { - int code; - const char *msg; -} yaz_srw_codes [] = { -{1, "Permanent system error"}, -{2, "System temporarily unavailable"}, -{3, "Authentication error"}, -/* Diagnostics Relating to CQL */ -{10, "Query syntax error"}, -{11, "Unsupported query type"}, -{12, "Too many characters in query"}, -{13, "Unbalanced or illegal use of parentheses"}, -{14, "Unbalanced or illegal use of quotes"}, -{15, "Illegal or unsupported context set"}, -{16, "Illegal or unsupported index"}, -{17, "Illegal or unsupported combination of index and context set"}, -{18, "Illegal or unsupported combination of indexes"}, -{19, "Illegal or unsupported relation"}, -{20, "Illegal or unsupported relation modifier"}, -{21, "Illegal or unsupported combination of relation modifers"}, -{22, "Illegal or unsupported combination of relation and index"}, -{23, "Too many characters in term"}, -{24, "Illegal combination of relation and term"}, -{25, "Special characters not quoted in term"}, -{26, "Non special character escaped in term"}, -{27, "Empty term unsupported"}, -{28, "Masking character not supported"}, -{29, "Masked words too short"}, -{30, "Too many masking characters in term"}, -{31, "Anchoring character not supported"}, -{32, "Anchoring character in illegal or unsupported position"}, -{33, "Combination of proximity/adjacency and masking characters not supported"}, -{34, "Combination of proximity/adjacency and anchoring characters not supported"}, -{35, "Terms only exclusion (stop) words"}, -{36, "Term in invalid format for index or relation"}, -{37, "Illegal or unsupported boolean operator"}, -{38, "Too many boolean operators in query"}, -{39, "Proximity not supported"}, -{40, "Illegal or unsupported proximity relation"}, -{41, "Illegal or unsupported proximity distance"}, -{42, "Illegal or unsupported proximity unit"}, -{43, "Illegal or unsupported proximity ordering"}, -{44, "Illegal or unsupported combination of proximity modifiers"}, -{45, "context set name (prefix) assigned to multiple identifiers"}, -/* Diagnostics Relating to Result Sets */ -{50, "Result sets not supported"}, -{51, "Result set does not exist"}, -{52, "Result set temporarily unavailable"}, -{53, "Result sets only supported for retrieval"}, -{54, "Retrieval may only occur from an existing result set"}, -{55, "Combination of result sets with search terms not supported"}, -{56, "Only combination of single result set with search terms supported"}, -{57, "Result set created but no records available"}, -{58, "Result set created with unpredictable partial results available"}, -{59, "Result set created with valid partial results available"}, -/* Diagnostics Relating to Records */ -{60, "Too many records retrieved"}, -{61, "First record position out of range"}, -{62, "Negative number of records requested"}, -{63, "System error in retrieving records"}, -{64, "Record temporarily unavailable"}, -{65, "Record does not exist"}, -{66, "Unknown schema for retrieval"}, -{67, "Record not available in this schema"}, -{68, "Not authorised to send record"}, -{69, "Not authorised to send record in this schema"}, -{70, "Record too large to send"}, -/* Diagnostics Relating to Sorting */ -{80, "Sort not supported"}, -{81, "Unsupported sort type (sortKeys vs xSortKeys)"}, -{82, "Illegal or unsupported sort sequence"}, -{83, "Too many records"}, -{84, "Too many sort keys"}, -{85, "Duplicate sort keys"}, -{86, "Incompatible record formats"}, -{87, "Unsupported schema for sort"}, -{88, "Unsupported tag path for sort"}, -{89, "Tag path illegal or unsupported for schema"}, -{90, "Illegal or unsupported direction value"}, -{91, "Illegal or unsupported case value"}, -{92, "Illegal or unsupported missing value action"}, -/* Diagnostics Relating to Explain */ -{100, "Explain not supported"}, -{101, "Explain request type not supported (SOAP vs GET)"}, -{102, "Explain record temporarily unavailable"}, -{0, 0} -}; - -const char *yaz_diag_srw_str (int code) -{ - int i; - for (i = 0; yaz_srw_codes[i].code; i++) - if (yaz_srw_codes[i].code == code) - return yaz_srw_codes[i].msg; - return 0; -} - - /* bib1:srw */ -static int srw_bib1_map[] = { +static int bib1_srw_map[] = { 1, 1, 2, 2, 3, 11, @@ -672,7 +881,6 @@ static int srw_bib1_map[] = { 105, 3, 106, 66, 107, 11, - 108, 10, 108, 13, 108, 14, 108, 25, @@ -680,7 +888,7 @@ static int srw_bib1_map[] = { 108, 27, 108, 45, - 109, 1, + 109, 2, 110, 37, 111, 1, 112, 58, @@ -689,6 +897,7 @@ static int srw_bib1_map[] = { 115, 16, 116, 16, 117, 19, + 117, 20, 118, 22, 119, 32, 119, 31, @@ -730,7 +939,7 @@ static int srw_bib1_map[] = { 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 */ @@ -793,9 +1002,21 @@ static int srw_bib1_map[] = { 0 }; +/* + * This array contains overrides for when the first occurrence of a + * particular SRW error in the array above does not correspond with + * the best back-translation of that SRW error. + */ +static int srw_bib1_map[] = { + 66, 238, + /* No doubt there are many more */ + 0 +}; + + int yaz_diag_bib1_to_srw (int code) { - const int *p = srw_bib1_map; + const int *p = bib1_srw_map; while (*p) { if (code == p[0]) @@ -807,9 +1028,19 @@ int yaz_diag_bib1_to_srw (int code) int yaz_diag_srw_to_bib1(int code) { + /* Check explicit reverse-map first */ const int *p = srw_bib1_map; while (*p) { + if (code == p[0]) + return p[1]; + p += 2; + } + + /* Fall back on reverse lookup in main map */ + p = bib1_srw_map; + while (*p) + { if (code == p[1]) return p[0]; p += 2; @@ -817,3 +1048,283 @@ int yaz_diag_srw_to_bib1(int code) return 1; } +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] = (char *) odr_malloc(o, 40); + sprintf(value[*i], ODR_INT_PRINTF, *val); + (*i)++; + } +} + +void yaz_add_name_value_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 max_names) +{ + int i = 0; + yaz_add_name_value_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: + yaz_add_name_value_str(encode, name, value, &i, "query", + srw_pdu->u.request->query.cql); + break; + case Z_SRW_query_type_pqf: + yaz_add_name_value_str(encode, name, value, &i, "x-pquery", + srw_pdu->u.request->query.pqf); + break; + case Z_SRW_query_type_xcql: + yaz_add_name_value_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: + yaz_add_name_value_str(encode, name, value, &i, "sortKeys", + srw_pdu->u.request->sort.sortKeys); + break; + } + 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); + 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); + break; + case Z_SRW_explain_request: + value[i++] = "explain"; + 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) + { + case Z_SRW_query_type_cql: + yaz_add_name_value_str(encode, name, value, &i, "scanClause", + srw_pdu->u.scan_request->scanClause.cql); + break; + case Z_SRW_query_type_pqf: + yaz_add_name_value_str(encode, name, value, &i, "x-pScanClause", + srw_pdu->u.scan_request->scanClause.pqf); + break; + case Z_SRW_query_type_xcql: + yaz_add_name_value_str(encode, name, value, &i, "x-cqlScanClause", + srw_pdu->u.scan_request->scanClause.xcql); + break; + } + 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"; + break; + 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 *uri_args; + char *path; + + 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, 30)) + return -1; + yaz_array_to_uri(&uri_args, encode, name, value); + + hreq->method = "GET"; + + path = (char *) + odr_malloc(encode, strlen(hreq->path) + strlen(uri_args) + 4); + + 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, const char *charset) +{ + char *name[30], *value[30]; /* definite upper limit for SRU params */ + char *uri_args; + + 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, 30)) + 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; +} + +int yaz_sru_soap_encode(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu, + ODR odr, const char *charset) +{ + Z_SOAP_Handler handlers[3] = { +#if YAZ_HAVE_XML2 + {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); + + z_HTTP_header_add(odr, &hreq->headers, + "SOAPAction", "\"\""); + p->which = Z_SOAP_generic; + p->u.generic = (Z_SOAP_Generic *) odr_malloc(odr, sizeof(*p->u.generic)); + p->u.generic->no = 0; + 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 = (Z_SRW_extra_arg *) odr_malloc(odr, sizeof(**ea)); + (*ea)->name = *name; + (*ea)->value = *val; + ea = &(*ea)->next; + val++; + name++; + } + *ea = 0; + } +} + + +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +