* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: srwutil.c,v 1.41 2006-06-02 13:08:27 adam Exp $
+ * $Id: srwutil.c,v 1.44 2006-06-14 05:47:10 adam Exp $
*/
/**
* \file srwutil.c
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)
+
+{
+ 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;
+ }
+ *valp = odr_intdup(odr, ival);
+ return 1;
+}
/**
http://www.loc.gov/z3950/agency/zing/srw/service.html
*/
else if (!strcmp(n, "extraRequestData"))
extraRequestData = v;
else
- yaz_add_srw_diagnostic(decode, diag, num_diag, 8, n);
+ 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, 7, "version");
+ yaz_add_srw_diagnostic(
+ decode, diag, num_diag,
+ YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "version");
version = "1.1";
}
if (strcmp(version, "1.1"))
- yaz_add_srw_diagnostic(decode, diag, num_diag, 5, "1.1");
+ yaz_add_srw_diagnostic(decode, diag, num_diag,
+ YAZ_SRW_UNSUPP_VERSION, "1.1");
if (!operation)
{
if (uri_name)
- yaz_add_srw_diagnostic(decode, diag, num_diag, 7, "operation");
+ yaz_add_srw_diagnostic(
+ decode, diag, num_diag,
+ YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "operation");
operation = "explain";
}
if (!strcmp(operation, "searchRetrieve"))
sr->u.request->query.pqf = pQuery;
}
else
- yaz_add_srw_diagnostic(decode, diag, num_diag, 7, "query");
+ yaz_add_srw_diagnostic(
+ decode, diag, num_diag,
+ YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "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));
+ yaz_sru_integer_decode(decode, "maximumRecords", maximumRecords,
+ &sr->u.request->maximumRecords,
+ diag, num_diag);
+
+ yaz_sru_integer_decode(decode, "startRecord", startRecord,
+ &sr->u.request->startRecord,
+ diag, num_diag);
sr->u.request->database = db;
sr->u.scan_request->scanClause.pqf = pScanClause;
}
else
- yaz_add_srw_diagnostic(decode, diag, num_diag, 7,
- "scanClause");
+ 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",
+ maximumTerms,
+ &sr->u.scan_request->maximumTerms,
+ diag, num_diag);
- if (maximumTerms)
- sr->u.scan_request->maximumTerms =
- odr_intdup(decode, atoi(maximumTerms));
- if (responsePosition)
- sr->u.scan_request->responsePosition =
- odr_intdup(decode, atoi(responsePosition));
+ yaz_sru_integer_decode(decode, "responsePosition",
+ responsePosition,
+ &sr->u.scan_request->responsePosition,
+ diag, num_diag);
sr->u.scan_request->stylesheet = stylesheet;
(*soap_package)->ns = "SRU";
- yaz_add_srw_diagnostic(decode, diag, num_diag, 4, operation);
+ yaz_add_srw_diagnostic(decode, diag, num_diag,
+ YAZ_SRW_UNSUPP_OPERATION, operation);
return 0;
}
#endif
ODR odr, const char *charset)
{
Z_SOAP_Handler handlers[2] = {
+#if HAVE_XML2
{"http://www.loc.gov/zing/srw/", 0, (Z_SOAP_fun) yaz_srw_codec},
+#endif
{0, 0, 0}
};
Z_SOAP *p = (Z_SOAP*) odr_malloc(odr, sizeof(*p));