cvs: php4 /ext/yaz php_yaz.c
| From: | Adam Dickmeiss | Date: | Mon, 19 Aug 2002 21:15:58 +0000 |
| Subject: | cvs: php4 /ext/yaz php_yaz.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13474@lists.php.net to get a copy of this message | ||
dickmeiss Mon Aug 19 17:15:58 2002 EDT
Modified files:
/php4/ext/yaz php_yaz.c
Log:
Make options piggyback and timeout work with ZOOM
Index: php4/ext/yaz/php_yaz.c
diff -u php4/ext/yaz/php_yaz.c:1.50 php4/ext/yaz/php_yaz.c:1.51
--- php4/ext/yaz/php_yaz.c:1.50 Tue Jul 30 06:50:45 2002
+++ php4/ext/yaz/php_yaz.c Mon Aug 19 17:15:57 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_yaz.c,v 1.50 2002/07/30 10:50:45 dickmeiss Exp $ */
+/* $Id: php_yaz.c,v 1.51 2002/08/19 21:15:57 dickmeiss Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -166,6 +166,7 @@
p->zoom_scan = 0;
p->zoom_package = 0;
ZOOM_connection_option_set(p->zoom_conn, "implementationName", "PHP");
+ ZOOM_connection_option_set(p->zoom_conn, "async", "1");
#else
p->host_port = 0;
p->num_databaseNames = 0;
@@ -1282,6 +1283,7 @@
option_set (as, "otherInfo1", otherInfo[1]);
option_set (as, "otherInfo2", otherInfo[2]);
option_set (as, "proxy", proxy_str);
+ option_set (as, "piggyback", piggyback ? "1" : "0");
ZOOM_connection_connect (as->zoom_conn, zurl_str, 0);
break;
}
@@ -1336,6 +1338,7 @@
option_set (as, "otherInfo1", otherInfo[1]);
option_set (as, "otherInfo2", otherInfo[2]);
option_set (as, "proxy", proxy_str);
+ option_set (as, "piggyback", piggyback ? "1" : "0");
ZOOM_connection_connect (as->zoom_conn, zurl_str, 0);
#else
@@ -1564,7 +1567,13 @@
#if USE_ZOOM
Yaz_Association p = shared_associations[i];
if (p && p->order == YAZSG(assoc_seq))
+ {
+ char str[20];
+
+ sprintf (str, "%d", timeout);
+ ZOOM_connection_option_set (p->zoom_conn, "timeout", str);
conn_ar[no++] = p->zoom_conn;
+ }
#else
Yaz_Association p = shared_associations[i];
if (!p || p->order != YAZSG(assoc_seq) || !p->action