Honor block=1 for show when re-searching (sort)

Note that the condition for block=1 has changed. It will block if
any client has more records to be fetched. Previously: block if
no records at all have been fetched.

diff --git a/src/http_command.c b/src/http_command.c
index a4d5106..2f893c8 100644 (file)
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -961,8 +961,6 @@ static void cmd_show(struct http_channel *c)
     if (!sort)
         sort = "relevance";
     
-    status = session_active_clients(s->psession);
-
     if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service)))
     {
         error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
@@ -971,6 +969,8 @@ static void cmd_show(struct http_channel *c)
     }
     session_sort(s->psession, sp->name, sp->increasing);
 
+    status = session_active_clients(s->psession);
+
     if (block)
     {
         if (!strcmp(block, "preferred") && !session_is_preferred_clients_ready(s->psession) && reclist_get_num_records(s->psession->reclist) == 0)
@@ -986,7 +986,7 @@ static void cmd_show(struct http_channel *c)
             return;
 
         }
-        else if (status && reclist_get_num_records(s->psession->reclist) == 0)
+        else if (status)
         {
             // if there is already a watch/block. we do not block this one
             if (session_set_watch(s->psession, SESSION_WATCH_SHOW,

diff --git a/test/test_url_7.res b/test/test_url_7.res
index 73c55be..fc344e1 100644 (file)
--- a/test/test_url_7.res
+++ b/test/test_url_7.res
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <show><status>OK</status>
 <activeclients>0</activeclients>
-<merged>3</merged>
+<merged>5</merged>
 <total>31</total>
 <start>0</start>
-<num>3</num>
+<num>5</num>
 <hit>
 
 <md-title>APPLIED GEOLOGY FILE</md-title>
@@ -16,6 +16,24 @@
 </hit>
 <hit>
 
+<md-title>AUTOMATED FLOOD WARNING NETWORK</md-title>
+<md-description>The new system will collect rainfall, temperature, soil moisture, wind speed and direction, humidity, and streamflow (above certain values)</md-description><location id="my" name="marcserver">
+<md-title>AUTOMATED FLOOD WARNING NETWORK</md-title>
+<md-description tag="520">The new system will collect rainfall, temperature, soil moisture, wind speed and direction, humidity, and streamflow (above certain values)</md-description>
+<md-description tag="513">1982-PRESENT</md-description></location>
+<recid>title automated flood warning network author medium book</recid>
+</hit>
+<hit>
+
+<md-title>BIBLIOGRAPHY OF MAINE GEOLOGY</md-title>
+<md-description>This data base is a computer based bibliography of marine geology.  It allows searching by topic and geographic location, similar to GEOREF.  It is currently under development to replace the printed Bibliography of Marine Geology</md-description><location id="my" name="marcserver">
+<md-title>BIBLIOGRAPHY OF MAINE GEOLOGY</md-title>
+<md-description tag="520">This data base is a computer based bibliography of marine geology.  It allows searching by topic and geographic location, similar to GEOREF.  It is currently under development to replace the printed Bibliography of Marine Geology</md-description>
+<md-description tag="513">1692-PRESENT</md-description></location>
+<recid>title bibliography of maine geology author medium book</recid>
+</hit>
+<hit>
+
 <md-title>UTAH EARTHQUAKE EPICENTERS</md-title>
 <md-description>Five files of epicenter data arranged by date comprise this data set.  These files are searchable by magnitude and longitude/latitude.  Hardcopy of listing and plot of requested area available.  Epicenter location and date, magnitude, and focal depth available</md-description><location id="my" name="marcserver">
 <md-title>UTAH EARTHQUAKE EPICENTERS</md-title>

diff --git a/test/test_url_9.res b/test/test_url_9.res
index 770d050..c6c0bf1 100644 (file)
--- a/test/test_url_9.res
+++ b/test/test_url_9.res
@@ -1,10 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <show><status>OK</status>
 <activeclients>0</activeclients>
-<merged>5</merged>
+<merged>7</merged>
 <total>31</total>
 <start>0</start>
-<num>5</num>
+<num>7</num>
+<hit>
+
+<md-title>WATER WELL DATA</md-title>
+<md-description>This database contains the following information on water wells in Nevada: driller&apos;s name, owner&apos;s name, location, formations encountered, lithologic descriptions, water level, and water quality</md-description><location id="my" name="marcserver">
+<md-title>WATER WELL DATA</md-title>
+<md-description tag="520">This database contains the following information on water wells in Nevada: driller&apos;s name, owner&apos;s name, location, formations encountered, lithologic descriptions, water level, and water quality</md-description>
+<md-description tag="513">1930-PRESENT</md-description></location>
+<recid>title water well data author medium book</recid>
+</hit>
+<hit>
+
+<md-title>UTAH GEOLOGIC MAP BIBLIOGRAPHY</md-title>
+<md-description>This collection consists of theses, dissertations, and other unpublished maps as well as published maps of the geology of Utah.  Some maps of the collection are xeroxed from limited collections.  Cross-sections are included in set.  Data file consists of map bibliography</md-description><location id="my" name="marcserver">
+<md-title>UTAH GEOLOGIC MAP BIBLIOGRAPHY</md-title>
+<md-description tag="520">This collection consists of theses, dissertations, and other unpublished maps as well as published maps of the geology of Utah.  Some maps of the collection are xeroxed from limited collections.  Cross-sections are included in set.  Data file consists of map bibliography</md-description>
+<md-description tag="513">-PRESENT</md-description></location>
+<recid>title utah geologic map bibliography author medium book</recid>
+</hit>
 <hit>
 
 <md-title>UTAH GEOLOGICAL AND MINERAL SURVEY PUBLICATIONS</md-title>