X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-z3950.c;h=9c810e80cd8c295f2cb64b2ea1f888aff38874fa;hp=8afcd01ef60273043795f4a6dda17a1082ef5a4a;hb=4d1450cc691292cef5bcfdd41cefc030e4dabbf6;hpb=480f849f7e012d2d742d2d1dffbd1b0691dcd33a

diff --git a/src/zoom-z3950.c b/src/zoom-z3950.c
index 8afcd01..9c810e8 100644
--- a/src/zoom-z3950.c
+++ b/src/zoom-z3950.c
@@ -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);
@@ -1309,7 +1309,10 @@ static void handle_Z3950_search_response(ZOOM_connection c,
 static void handle_Z3950_sort_response(ZOOM_connection c, Z_SortResponse *res)
 {
     if (res->diagnostics && res->num_diagnostics > 0)
+    {
         response_diag(c, res->diagnostics[0]);
+        ZOOM_connection_remove_tasks(c);
+    }
 }
 
 static void handle_Z3950_scan_response(ZOOM_connection c, Z_ScanResponse *res)
@@ -1356,13 +1359,17 @@ static void handle_Z3950_records(ZOOM_connection c, Z_Records *sr,
     schema =  c->tasks->u.search.schema;
 
     if (sr && sr->which == Z_Records_NSD)
+    {
         response_default_diag(c, sr->u.nonSurrogateDiagnostic);
+        ZOOM_connection_remove_tasks(c);
+    }
     else if (sr && sr->which == Z_Records_multipleNSD)
     {
         if (sr->u.multipleNonSurDiagnostics->num_diagRecs >= 1)
             response_diag(c, sr->u.multipleNonSurDiagnostics->diagRecs[0]);
         else
             ZOOM_set_error(c, ZOOM_ERROR_DECODE, 0);
+        ZOOM_connection_remove_tasks(c);
     }
     else
     {
@@ -1554,7 +1561,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;
@@ -1577,9 +1584,10 @@ zoom_ret ZOOM_connection_Z3950_search(ZOOM_connection c)
 
     if (resultset->live_set)
     {
-        if (*start + *count > resultset->size)
-            ZOOM_set_dset_error(c, YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, "Bib-1",
-                       0, 0);
+        if (*start >= resultset->size)
+            *count = 0;
+        else if (*start + *count >= resultset->size)
+            *count = resultset->size - *start;
     }
 
     if (c->error)                  /* don't continue on error */