From: Dennis Schafroth <dennis@indexdata.com>
Date: Wed, 8 Sep 2010 17:13:49 +0000 (+0200)
Subject: Block on zero records also for preferred block
X-Git-Tag: v1.5.0~13
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=e36bc81f39b2ab2138bb755ac3b3466e2e3d0582;p=pazpar2-moved-to-github.git

Block on zero records also for preferred block
---

diff --git a/src/http_command.c b/src/http_command.c
index 567037f..37c96fa 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -936,7 +936,7 @@ static void cmd_show(struct http_channel *c)
 
     if (block)
     {
-        if (!strcmp(block, "preferred") && !session_is_preferred_clients_ready(s->psession)) {
+        if (!strcmp(block, "preferred") && !session_is_preferred_clients_ready(s->psession) && reclist_get_num_records(s->psession->reclist) == 0) {
             // if there is already a watch/block. we do not block this one
             if (session_set_watch(s->psession, SESSION_WATCH_SHOW_PREF,
                                   show_records_ready, c, c) != 0)