X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-z3950.c;h=701f5a4e0dcab7d05e47b84182b409cfe421ae1a;hp=6b550748b533efea7a2dc523e753403d0b49bcdb;hb=9021ba4aa6fcdbdd177073d44edd03a86d70198f;hpb=766712116d6bb82fd0ef8ab6eff32ea31ac65608

diff --git a/src/zoom-z3950.c b/src/zoom-z3950.c
index 6b55074..701f5a4 100644
--- a/src/zoom-z3950.c
+++ b/src/zoom-z3950.c
@@ -510,7 +510,7 @@ static int encode_APDU(ZOOM_connection c, Z_APDU *a, ODR out)
         yaz_oi_set_string_oid(oi, out, yaz_oid_userinfo_cookie,
                               1, c->cookie_out);
     }
-    if (c->client_IP)
+    if (c->client_IP && a->which == Z_APDU_initRequest)
     {
         Z_OtherInformation **oi;
         yaz_oi_APDU(a, &oi);
@@ -609,7 +609,7 @@ zoom_ret ZOOM_connection_Z3950_send_init(ZOOM_connection c)
         auth->u.open = odr_strdup(c->odr_out, c->user);
         ireq->idAuthentication = auth;
     }
-    if (c->proxy)
+    if (c->proxy_mode)
     {
         yaz_oi_set_string_oid(&ireq->otherInfo, c->odr_out,
                               yaz_oid_userinfo_proxy, 1, c->host_port);
@@ -1554,7 +1554,7 @@ zoom_ret ZOOM_connection_Z3950_search(ZOOM_connection c)
     ZOOM_resultset resultset;
     int *start, *count;
 
-    if (!c->tasks)
+    if (!c->tasks || c->tasks->which == ZOOM_TASK_SORT)
         return zoom_complete;
     assert(c->tasks->which == ZOOM_TASK_SEARCH);
     resultset = c->tasks->u.search.resultset;
@@ -1578,8 +1578,8 @@ zoom_ret ZOOM_connection_Z3950_search(ZOOM_connection c)
     if (resultset->live_set)
     {
         if (*start >= resultset->size)
-            return zoom_complete;
-        if (*start + *count > resultset->size)
+            *count = 0;
+        else if (*start + *count >= resultset->size)
             *count = resultset->size - *start;
     }
 
@@ -1724,7 +1724,8 @@ void ZOOM_handle_Z3950_apdu(ZOOM_connection c, Z_APDU *apdu)
     case Z_APDU_sortResponse:
         yaz_log(c->log_api, "%p handle_Z3950_apdu Sort response", c);
         handle_Z3950_sort_response(c, apdu->u.sortResponse);
-        ZOOM_connection_remove_task(c);
+        if (ZOOM_connection_Z3950_search(c) == zoom_complete)
+            ZOOM_connection_remove_task(c);
         break;
     case Z_APDU_scanResponse:
         yaz_log(c->log_api, "%p handle_Z3950_apdu Scan response", c);