projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Option sru_version holds negotiated SRU/SRW version.
[yaz-moved-to-github.git]
/
src
/
srwutil.c
diff --git
a/src/srwutil.c
b/src/srwutil.c
index
b115ffc
..
f15e4ca
100644
(file)
--- a/
src/srwutil.c
+++ b/
src/srwutil.c
@@
-2,7
+2,7
@@
* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: srwutil.c,v 1.59 2007-05-24 10:18:36 adam Exp $
+ * $Id: srwutil.c,v 1.62 2007-08-24 13:26:03 adam Exp $
*/
/**
* \file srwutil.c
*/
/**
* \file srwutil.c
@@
-594,9
+594,16
@@
int yaz_sru_decode(Z_HTTP_Request *hreq, Z_SRW_PDU **srw_pdu,
YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "version");
version = "1.1";
}
YAZ_SRW_MANDATORY_PARAMETER_NOT_SUPPLIED, "version");
version = "1.1";
}
- if (strcmp(version, "1.1"))
+
+ version = yaz_negotiate_sru_version(version);
+
+ if (!version)
+ { /* negotiation failed. */
yaz_add_srw_diagnostic(decode, diag, num_diag,
yaz_add_srw_diagnostic(decode, diag, num_diag,
- YAZ_SRW_UNSUPP_VERSION, "1.1");
+ YAZ_SRW_UNSUPP_VERSION, "1.2");
+ version = "1.2";
+ }
+
if (!operation)
{
if (uri_name)
if (!operation)
{
if (uri_name)
@@
-814,19
+821,30
@@
Z_SRW_record *yaz_srw_get_record(ODR o)
return yaz_srw_get_records(o, 1);
}
return yaz_srw_get_records(o, 1);
}
-Z_SRW_PDU *yaz_srw_get_core_v_1_1(ODR o)
+static Z_SRW_PDU *yaz_srw_get_core_ver(ODR o, const char *version)
{
Z_SRW_PDU *p = (Z_SRW_PDU *) odr_malloc(o, sizeof(*p));
{
Z_SRW_PDU *p = (Z_SRW_PDU *) odr_malloc(o, sizeof(*p));
- p->srw_version = odr_strdup(o, "1.1");
+ p->srw_version = odr_strdup(o, version);
p->username = 0;
p->password = 0;
p->extra_args = 0;
return p;
}
p->username = 0;
p->password = 0;
p->extra_args = 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 *yaz_srw_get(ODR o, int which)
{
- Z_SRW_PDU *sr = yaz_srw_get_core_v_1_1(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->which = which;
switch(which)
{
sr->which = which;
switch(which)
{