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
Move yaz_record_conv_type to XML2-only area
[yaz-moved-to-github.git]
/
src
/
zoom-c.c
diff --git
a/src/zoom-c.c
b/src/zoom-c.c
index
d2f33da
..
0bb0b3f
100644
(file)
--- a/
src/zoom-c.c
+++ b/
src/zoom-c.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-70,8
+70,9
@@
void ZOOM_set_dset_error(ZOOM_connection c, int error,
}
if (addinfo && addinfo2)
{
}
if (addinfo && addinfo2)
{
- c->addinfo = (char*) xmalloc(strlen(addinfo) + strlen(addinfo2) + 2);
+ c->addinfo = (char*) xmalloc(strlen(addinfo) + strlen(addinfo2) + 3);
strcpy(c->addinfo, addinfo);
strcpy(c->addinfo, addinfo);
+ strcat(c->addinfo, ": ");
strcat(c->addinfo, addinfo2);
}
else if (addinfo)
strcat(c->addinfo, addinfo2);
}
else if (addinfo)
@@
-235,6
+236,12
@@
void ZOOM_connection_remove_tasks(ZOOM_connection c)
ZOOM_connection_remove_task(c);
}
ZOOM_connection_remove_task(c);
}
+static void odr_wrbuf_write(ODR o, void *handle, int type,
+ const char *buf, int len)
+{
+ WRBUF w = (WRBUF) handle;
+ wrbuf_write(w, buf, len);
+}
ZOOM_API(ZOOM_connection)
ZOOM_connection_create(ZOOM_options options)
ZOOM_API(ZOOM_connection)
ZOOM_connection_create(ZOOM_options options)
@@
-266,6
+273,7
@@
ZOOM_API(ZOOM_connection)
c->host_port = 0;
c->proxy = 0;
c->host_port = 0;
c->proxy = 0;
+ c->tproxy = 0;
c->charset = c->lang = 0;
c->charset = c->lang = 0;
@@
-284,6
+292,7
@@
ZOOM_API(ZOOM_connection)
c->odr_in = odr_createmem(ODR_DECODE);
c->odr_out = odr_createmem(ODR_ENCODE);
c->odr_print = 0;
c->odr_in = odr_createmem(ODR_DECODE);
c->odr_out = odr_createmem(ODR_ENCODE);
c->odr_print = 0;
+ c->odr_save = 0;
c->async = 0;
c->support_named_resultsets = 0;
c->async = 0;
c->support_named_resultsets = 0;
@@
-297,6
+306,19
@@
ZOOM_API(ZOOM_connection)
return c;
}
return c;
}
+ZOOM_API(void) ZOOM_connection_save_apdu_wrbuf(ZOOM_connection c, WRBUF w)
+{
+ if (c->odr_save)
+ {
+ odr_destroy(c->odr_save);
+ c->odr_save = 0;
+ }
+ if (w)
+ {
+ c->odr_save = odr_createmem(ODR_PRINT);
+ odr_set_stream(c->odr_save, w, odr_wrbuf_write, 0);
+ }
+}
/* set database names. Take local databases (if set); otherwise
take databases given in ZURL (if set); otherwise use Default */
/* set database names. Take local databases (if set); otherwise
take databases given in ZURL (if set); otherwise use Default */
@@
-388,6
+410,16
@@
ZOOM_API(void)
c->proxy = xstrdup(val);
}
c->proxy = xstrdup(val);
}
+ xfree(c->tproxy);
+ c->tproxy = 0;
+ val = ZOOM_options_get(c->options, "tproxy");
+ if (val && *val)
+ {
+ yaz_log(c->log_details, "%p ZOOM_connection_connect tproxy=%s", c, val);
+ c->tproxy = xstrdup(val);
+ }
+
+
xfree(c->charset);
c->charset = 0;
val = ZOOM_options_get(c->options, "charset");
xfree(c->charset);
c->charset = 0;
val = ZOOM_options_get(c->options, "charset");
@@
-580,6
+612,8
@@
ZOOM_API(void)
xfree(c->diagset);
odr_destroy(c->odr_in);
odr_destroy(c->odr_out);
xfree(c->diagset);
odr_destroy(c->odr_in);
odr_destroy(c->odr_out);
+ if (c->odr_save)
+ odr_destroy(c->odr_save);
if (c->odr_print)
{
odr_setprint(c->odr_print, 0); /* prevent destroy from fclose'ing */
if (c->odr_print)
{
odr_setprint(c->odr_print, 0); /* prevent destroy from fclose'ing */
@@
-590,6
+624,7
@@
ZOOM_API(void)
ZOOM_connection_remove_events(c);
xfree(c->host_port);
xfree(c->proxy);
ZOOM_connection_remove_events(c);
xfree(c->host_port);
xfree(c->proxy);
+ xfree(c->tproxy);
xfree(c->charset);
xfree(c->lang);
xfree(c->cookie_out);
xfree(c->charset);
xfree(c->lang);
xfree(c->cookie_out);
@@
-1044,7
+1079,8
@@
static zoom_ret do_connect_host(ZOOM_connection c, const char *logical_url)
if (c->cs)
cs_close(c->cs);
if (c->cs)
cs_close(c->cs);
- c->cs = cs_create_host_proxy(logical_url, 0, &add, c->proxy);
+ c->cs = cs_create_host_proxy(logical_url, 0, &add,
+ c->tproxy ? c->tproxy : c->proxy);
if (c->cs && c->cs->protocol == PROTO_HTTP)
{
if (c->cs && c->cs->protocol == PROTO_HTTP)
{
@@
-1514,6
+1550,8
@@
static zoom_ret send_HTTP_redirect(ZOOM_connection c, const char *uri,
return zoom_complete;
if (c->odr_print)
z_GDU(c->odr_print, &gdu, 0, 0);
return zoom_complete;
if (c->odr_print)
z_GDU(c->odr_print, &gdu, 0, 0);
+ if (c->odr_save)
+ z_GDU(c->odr_save, &gdu, 0, 0);
c->buf_out = odr_getbuf(c->odr_out, &c->len_out, 0);
odr_reset(c->odr_out);
c->buf_out = odr_getbuf(c->odr_out, &c->len_out, 0);
odr_reset(c->odr_out);
@@
-1533,7
+1571,7
@@
static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
{
zoom_ret cret = zoom_complete;
int ret = -1;
{
zoom_ret cret = zoom_complete;
int ret = -1;
- const char *addinfo = 0;
+ char *addinfo = 0;
const char *connection_head = z_HTTP_header_lookup(hres->headers,
"Connection");
const char *location;
const char *connection_head = z_HTTP_header_lookup(hres->headers,
"Connection");
const char *location;
@@
-1563,7
+1601,7
@@
static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
}
else
{
}
else
{
- ret = ZOOM_handle_sru(c, hres, &cret);
+ ret = ZOOM_handle_sru(c, hres, &cret, &addinfo);
if (ret == 0)
{
if (c->no_redirects) /* end of redirect. change hosts again */
if (ret == 0)
{
if (c->no_redirects) /* end of redirect. change hosts again */
@@
-1576,7
+1614,11
@@
static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
if (hres->code != 200)
ZOOM_set_HTTP_error(c, hres->code, 0, 0);
else
if (hres->code != 200)
ZOOM_set_HTTP_error(c, hres->code, 0, 0);
else
+ {
+ yaz_log(YLOG_LOG, "set error... addinfo=%s", addinfo ?
+ addinfo : "NULL");
ZOOM_set_error(c, ZOOM_ERROR_DECODE, addinfo);
ZOOM_set_error(c, ZOOM_ERROR_DECODE, addinfo);
+ }
ZOOM_connection_close(c);
}
if (cret == zoom_complete)
ZOOM_connection_close(c);
}
if (cret == zoom_complete)
@@
-1608,6
+1650,8
@@
static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
c->reconnect_ok = 0;
}
}
c->reconnect_ok = 0;
}
}
+ else
+ c->reconnect_ok = 1; /* if the server closes anyway */
}
}
#endif
}
}
#endif
@@
-1666,6
+1710,8
@@
static int do_read(ZOOM_connection c)
{
if (c->odr_print)
z_GDU(c->odr_print, &gdu, 0, 0);
{
if (c->odr_print)
z_GDU(c->odr_print, &gdu, 0, 0);
+ if (c->odr_save)
+ z_GDU(c->odr_save, &gdu, 0, 0);
if (gdu->which == Z_GDU_Z3950)
ZOOM_handle_Z3950_apdu(c, gdu->u.z3950);
else if (gdu->which == Z_GDU_HTTP_Response)
if (gdu->which == Z_GDU_Z3950)
ZOOM_handle_Z3950_apdu(c, gdu->u.z3950);
else if (gdu->which == Z_GDU_HTTP_Response)
@@
-1678,7
+1724,6
@@
static int do_read(ZOOM_connection c)
#endif
}
}
#endif
}
}
- c->reconnect_ok = 0;
}
return 1;
}
}
return 1;
}