YAZ_{BEGIN,END}_CDECL yaz_init_globals

[yaz-moved-to-github.git] / src / zoom-z3950.c

diff --git a/src/zoom-z3950.c b/src/zoom-z3950.c
index 6b55074..2835262 100644 (file)
--- a/src/zoom-z3950.c
+++ b/src/zoom-z3950.c
@@ -1577,10 +1577,9 @@ 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 = resultset->size - *start;
+            ZOOM_set_dset_error(c, YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, "Bib-1",
+                       0, 0);
     }
 
     if (c->error)                  /* don't continue on error */
@@ -1724,7 +1723,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);