cvs: php4 /ext/yaz php_yaz.c

dickmeiss Wed May 14 18:18:11 2003 EDT Modified files: /php4/ext/yaz php_yaz.c Log: Fix yaz_wait. Async mode incorrectly determine resource Index: php4/ext/yaz/php_yaz.c diff -u php4/ext/yaz/php_yaz.c:1.70 php4/ext/yaz/php_yaz.c:1.71 --- php4/ext/yaz/php_yaz.c:1.70 Tue May 13 06:31:45 2003 +++ php4/ext/yaz/php_yaz.c Wed May 14 18:18:11 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_yaz.c,v 1.70 2003/05/13 10:31:45 dickmeiss Exp $ */ +/* $Id: php_yaz.c,v 1.71 2003/05/14 22:18:11 dickmeiss Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -509,6 +509,7 @@ int event_mode = 0; int no = 0; ZOOM_connection conn_ar[MAX_ASSOC]; + Yaz_Association conn_as[MAX_ASSOC]; int i, timeout = 15; if (ZEND_NUM_ARGS() == 1) { @@ -541,6 +542,7 @@ sprintf(str, "%d", timeout); ZOOM_connection_option_set(p->zoom_conn, "timeout", str); + conn_as[no] = p; conn_ar[no++] = p->zoom_conn; } } @@ -552,8 +554,10 @@ if (ev <= 0) { RETURN_FALSE; } else { - Yaz_Association p = shared_associations[ev-1]; + Yaz_Association p = conn_as[ev-1]; int event_code = ZOOM_connection_last_event(p->zoom_conn); + + add_assoc_long(*pval_options, "connid", ev); add_assoc_long(*pval_options, "eventcode", event_code);