Refactor: show_range_start deals with extended fetch

[pazpar2-moved-to-github.git] / src / http_command.c

diff --git a/src/http_command.c b/src/http_command.c
index ecc1275..7620e92 100644 (file)
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1120,31 +1120,10 @@ static void show_records(struct http_channel *c, struct http_session *s, int act
 
     }
 
-    i = numn;
     rl = show_range_start(s->psession, sp, startn, &numn, &total,
-                          &total_hits, &approx_hits);
-    if (i > numn)
-    {
-        show_range_stop(s->psession, rl);
-        session_log(s->psession, YLOG_LOG,
-                    "Subset %d < %d retrieved for show", numn, i);
-        if (!session_fetch_more(s->psession))
-            session_log(s->psession, YLOG_LOG, "can not fetch more");
-        else
-        {
-            session_log(s->psession, YLOG_LOG, "fetching more in progress");
-            if (session_set_watch(s->psession, SESSION_WATCH_SHOW,
-                                  show_records_ready, c, c))
-                session_log(s->psession, YLOG_WARN, "Ignoring show block");
-            else
-            {
-                session_log(s->psession, YLOG_LOG, "session watch OK");
-                return;
-            }
-        }
-        rl = show_range_start(s->psession, sp, startn, &numn, &total,
-                              &total_hits, &approx_hits);
-    }
+                          &total_hits, &approx_hits, show_records_ready, c);
+    if (!rl)
+        return;
 
     response_open(c, "show");
     wrbuf_printf(c->wrbuf, "\n<activeclients>%d</activeclients>\n", active);