* Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: srwutil.c,v 1.48 2006-09-06 13:15:49 adam Exp $
+ * $Id: srwutil.c,v 1.51 2006-10-05 15:19:33 adam Exp $
*/
/**
* \file srwutil.c
void yaz_array_to_uri(char **path, ODR o, char **name, char **value)
{
- return yaz_array_to_uri_ex(path, o, name, value, 0);
+ yaz_array_to_uri_ex(path, o, name, value, 0);
}
int yaz_uri_array(const char *path, ODR o, char ***name, char ***val)
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)
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
*/
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 */
#endif
char **uri_name;
char **uri_val;
- int querytype = Z_SRW_query_type_cql;
if (charset)
*charset = 0;
char *v = uri_val[i];
if (!strcmp(n, "query"))
query = v;
- else if (!strcmp(n, "x-pquery")) /* deprecated */
- {
- 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);
- }
- }
+ else if (!strcmp(n, "x-pquery"))
+ pQuery = v;
else if (!strcmp(n, "x-username"))
username = v;
else if (!strcmp(n, "x-password"))
else if (!strcmp(n, "scanClause"))
scanClause = v;
else if (!strcmp(n, "x-pScanClause"))
- {
- querytype = Z_SRW_query_type_pqf;
- scanClause = v;
- }
+ pScanClause = v;
else if (!strcmp(n, "maximumRecords"))
maximumRecords = v;
else if (!strcmp(n, "startRecord"))
yaz_srw_decodeauth(sr, hreq, username, password, decode);
if (query)
{
- sr->u.request->query_type = querytype;
+ sr->u.request->query_type = Z_SRW_query_type_cql;
sr->u.request->query.cql = query;
}
+ else if (pQuery)
+ {
+ 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,
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;
if (scanClause)
{
- sr->u.scan_request->query_type = querytype;
+ 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_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;
srw_pdu->u.request->query.cql);
break;
case Z_SRW_query_type_pqf:
- add_val_str(encode, name, value, &i, "query",
+ add_val_str(encode, name, value, &i, "x-pquery",
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",
+ add_val_str(encode, name, value, &i, "x-cql",
srw_pdu->u.request->query.xcql);
- add_val_str(encode, name, value, &i, "x-querytype", "xcql");
break;
}
switch(srw_pdu->u.request->sort_type)
srw_pdu->u.scan_request->scanClause.cql);
break;
case Z_SRW_query_type_pqf:
- add_val_str(encode, name, value, &i, "scanClause",
+ add_val_str(encode, name, value, &i, "x-pScanClause",
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",
+ add_val_str(encode, name, value, &i, "x-cqlScanClause",
srw_pdu->u.scan_request->scanClause.xcql);
- add_val_str(encode, name, value, &i, "x-querytype", "xcql");
break;
}
add_val_int(encode, name, value, &i, "responsePosition",