X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsrwutil.c;h=25f2fca55aed95d814453e3e084352c68c9d4f12;hb=5aacaac430b101d72de440cf3833b6faee0eb1bd;hp=9e698c6d5808b4be1c2131019907debff708bf7b;hpb=fc6d778b923000b5c6ad8e108b0b184178a9d33f;p=yaz-moved-to-github.git diff --git a/src/srwutil.c b/src/srwutil.c index 9e698c6..25f2fca 100644 --- a/src/srwutil.c +++ b/src/srwutil.c @@ -1,8 +1,8 @@ /* - * Copyright (C) 1995-2005, Index Data ApS + * Copyright (C) 1995-2006, Index Data ApS * See the file LICENSE for details. * - * $Id: srwutil.c,v 1.45 2006-07-06 10:17:54 adam Exp $ + * $Id: srwutil.c,v 1.51 2006-10-05 15:19:33 adam Exp $ */ /** * \file srwutil.c @@ -41,9 +41,10 @@ void encode_uri_char(char *dst, char ch) } } -void yaz_array_to_uri(char **path, ODR o, char **name, char **value) +static void yaz_array_to_uri_ex(char **path, ODR o, char **name, char **value, + const char *extra_args) { - size_t i, szp = 0, sz = 0; + 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); @@ -67,9 +68,21 @@ void yaz_array_to_uri(char **path, ODR o, char **name, char **value) szp += vlen; } } + if (extra_args) + { + if (i) + (*path)[szp++] = '&'; + memcpy(*path + szp, extra_args, strlen(extra_args)); + szp += strlen(extra_args); + } (*path)[szp] = '\0'; } +void yaz_array_to_uri(char **path, ODR o, char **name, char **value) +{ + yaz_array_to_uri_ex(path, o, name, value, 0); +} + int yaz_uri_array(const char *path, ODR o, char ***name, char ***val) { int no = 2; @@ -226,8 +239,8 @@ static int yaz_base64decode(const char *in, char *out) * Look for authentication tokens in HTTP Basic parameters or in x-username/x-password * parameters. Added by SH. */ -static void yaz_srw_decodeauth(Z_SRW_PDU *sr, Z_HTTP_Request *hreq, char *username, - char *password, ODR decode) +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"); @@ -398,10 +411,10 @@ int yaz_srw_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu, return 2; } -static int yaz_sru_integer_decode(ODR odr, const char *pname, +static int yaz_sru_decode_integer(ODR odr, const char *pname, const char *valstr, int **valp, - Z_SRW_diagnostic **diag, int *num_diag) - + Z_SRW_diagnostic **diag, int *num_diag, + int min_value) { int ival; if (!valstr) @@ -412,9 +425,16 @@ static int yaz_sru_integer_decode(ODR odr, const char *pname, 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; } + /** http://www.loc.gov/z3950/agency/zing/srw/service.html */ @@ -586,13 +606,13 @@ int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu, sr->u.request->recordPacking = recordPacking; sr->u.request->stylesheet = stylesheet; - yaz_sru_integer_decode(decode, "maximumRecords", maximumRecords, + yaz_sru_decode_integer(decode, "maximumRecords", maximumRecords, &sr->u.request->maximumRecords, - diag, num_diag); - - yaz_sru_integer_decode(decode, "startRecord", startRecord, + diag, num_diag, 0); + + yaz_sru_decode_integer(decode, "startRecord", startRecord, &sr->u.request->startRecord, - diag, num_diag); + diag, num_diag, 1); sr->u.request->database = db; @@ -664,15 +684,15 @@ int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu, YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "scanClause"); sr->u.scan_request->database = db; - yaz_sru_integer_decode(decode, "maximumTerms", + yaz_sru_decode_integer(decode, "maximumTerms", maximumTerms, &sr->u.scan_request->maximumTerms, - diag, num_diag); - - yaz_sru_integer_decode(decode, "responsePosition", + diag, num_diag, 0); + + 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; @@ -740,13 +760,19 @@ Z_SRW_extra_record *yaz_srw_get_extra_record(ODR o) return res; } -Z_SRW_PDU *yaz_srw_get(ODR o, int which) +Z_SRW_PDU *yaz_srw_get_core_v_1_1(ODR o) { - Z_SRW_PDU *sr = (Z_SRW_PDU *) odr_malloc(o, sizeof(*o)); + Z_SRW_PDU *p = (Z_SRW_PDU *) odr_malloc(o, sizeof(*p)); + p->srw_version = odr_strdup(o, "1.1"); + p->username = 0; + p->password = 0; + p->extra_args = 0; + return p; +} - sr->username = 0; - sr->password = 0; - sr->srw_version = odr_strdup(o, "1.1"); +Z_SRW_PDU *yaz_srw_get(ODR o, int which) +{ + Z_SRW_PDU *sr = yaz_srw_get_core_v_1_1(o); sr->which = which; switch(which) { @@ -1168,11 +1194,13 @@ int yaz_sru_get_encode(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu, if (yaz_get_sru_parms(srw_pdu, encode, name, value)) return -1; - yaz_array_to_uri(&uri_args, encode, name, value); + yaz_array_to_uri_ex(&uri_args, encode, name, value, srw_pdu->extra_args); hreq->method = "GET"; - path = odr_malloc(encode, strlen(hreq->path) + strlen(uri_args) + 3); + 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); hreq->path = path; @@ -1190,7 +1218,7 @@ int yaz_sru_post_encode(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu, if (yaz_get_sru_parms(srw_pdu, encode, name, value)) return -1; - yaz_array_to_uri(&uri_args, encode, name, value); + yaz_array_to_uri_ex(&uri_args, encode, name, value, srw_pdu->extra_args); hreq->method = "POST";