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
Picky SRU decode. yaz_srw_get supports scan
[yaz-moved-to-github.git]
/
src
/
zoom-c.c
diff --git
a/src/zoom-c.c
b/src/zoom-c.c
index
7cd3244
..
1d91746
100644
(file)
--- a/
src/zoom-c.c
+++ b/
src/zoom-c.c
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (c) 2000-2003, Index Data
+ * Copyright (c) 2000-2004, Index Data
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: zoom-c.c,v 1.11 2003-12-11 00:37:22 adam Exp $
+ * $Id: zoom-c.c,v 1.17 2004-01-07 21:02:42 adam Exp $
*
* ZOOM layer for C, connections, result sets, queries.
*/
*
* ZOOM layer for C, connections, result sets, queries.
*/
@@
-918,7
+918,7
@@
static zoom_ret ZOOM_connection_send_init (ZOOM_connection c)
ZOOM_options_get(c->options, "implementationName"),
odr_prepend(c->odr_out, "ZOOM-C", ireq->implementationName));
ZOOM_options_get(c->options, "implementationName"),
odr_prepend(c->odr_out, "ZOOM-C", ireq->implementationName));
- version = odr_strdup(c->odr_out, "$Revision: 1.11 $");
+ version = odr_strdup(c->odr_out, "$Revision: 1.17 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
ireq->implementationVersion = odr_prepend(c->odr_out,
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
ireq->implementationVersion = odr_prepend(c->odr_out,
@@
-1004,7
+1004,7
@@
static zoom_ret send_srw (ZOOM_connection c, Z_SRW_PDU *sr)
{
char ctype[50];
Z_SOAP_Handler h[2] = {
{
char ctype[50];
Z_SOAP_Handler h[2] = {
- {"http://www.loc.gov/zing/srw/v1.0/", 0, (Z_SOAP_fun) yaz_srw_codec},
+ {"http://www.loc.gov/zing/srw/", 0, (Z_SOAP_fun) yaz_srw_codec},
{0, 0, 0}
};
ODR o = odr_createmem(ODR_ENCODE);
{0, 0, 0}
};
ODR o = odr_createmem(ODR_ENCODE);
@@
-1570,7
+1570,6
@@
ZOOM_record_get (ZOOM_record rec, const char *type_spec, int *len)
charset);
else if (r->which == Z_External_octet)
{
charset);
else if (r->which == Z_External_octet)
{
- yaz_marc_t mt;
const char *ret_buf;
switch (ent->value)
{
const char *ret_buf;
switch (ent->value)
{
@@
-1630,7
+1629,6
@@
ZOOM_record_get (ZOOM_record rec, const char *type_spec, int *len)
else if (r->which == Z_External_octet)
{
const char *ret_buf;
else if (r->which == Z_External_octet)
{
const char *ret_buf;
- yaz_marc_t mt;
int marc_decode_type = YAZ_MARC_MARCXML;
if (!strcmp(type, "oai"))
int marc_decode_type = YAZ_MARC_MARCXML;
if (!strcmp(type, "oai"))
@@
-2953,9
+2951,9
@@
static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
if (content_type && !yaz_strcmp_del("text/xml", content_type, "; "))
{
Z_SOAP *soap_package = 0;
if (content_type && !yaz_strcmp_del("text/xml", content_type, "; "))
{
Z_SOAP *soap_package = 0;
- ODR o = odr_createmem(ODR_DECODE);
+ ODR o = c->odr_in;
Z_SOAP_Handler soap_handlers[2] = {
Z_SOAP_Handler soap_handlers[2] = {
- {"http://www.loc.gov/zing/srw/v1.0/", 0,
+ {"http://www.loc.gov/zing/srw/", 0,
(Z_SOAP_fun) yaz_srw_codec},
{0, 0, 0}
};
(Z_SOAP_fun) yaz_srw_codec},
{0, 0, 0}
};
@@
-2980,7
+2978,6
@@
static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
}
else
ret = -1;
}
else
ret = -1;
- odr_destroy(o);
}
if (ret)
{
}
if (ret)
{