X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fclient.c;h=662937f95d11111d5eca501cce6382f2cca13d53;hb=8d8eb33f55a2f62f00463e7402c81c0cc02bde0e;hp=c4ab916eba9ae0343de541492af43afd83cb5d90;hpb=fba6d33793b0c7f3053f3c7df3b3eb6074c47a40;p=pazpar2-moved-to-github.git

diff --git a/src/client.c b/src/client.c
index c4ab916..662937f 100644
--- a/src/client.c
+++ b/src/client.c
@@ -73,7 +73,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 static YAZ_MUTEX g_mutex = 0;
 static int no_clients = 0;
-static int no_clients_total = 0;
 
 static int client_use(int delta)
 {
@@ -82,8 +81,6 @@ static int client_use(int delta)
         yaz_mutex_create(&g_mutex);
     yaz_mutex_enter(g_mutex);
     no_clients += delta;
-    if (delta > 0)
-        no_clients_total += delta;
     clients = no_clients;
     yaz_mutex_leave(g_mutex);
     yaz_log(YLOG_DEBUG, "%s clients=%d",
@@ -96,18 +93,6 @@ int clients_count(void)
     return client_use(0);
 }
 
-int clients_count_total(void)
-{
-    int total = 0;
-    if (!g_mutex)
-        return 0;
-    yaz_mutex_enter(g_mutex);
-    total = no_clients_total;
-    yaz_mutex_leave(g_mutex);
-    return total;
-}
-
-
 /** \brief Represents client state for a connection to one search target */
 struct client {
     struct session_database *database;
@@ -777,7 +762,7 @@ int client_fetch_more(struct client *cl)
     struct session_database *sdb = client_get_database(cl);
     const char *str;
     int extend_recs = 0;
-    int number;
+    int number = cl->hits - cl->record_offset;
 
     str = session_setting_oneval(sdb, PZ_EXTENDRECS);
     if (!str || !*str)
@@ -791,10 +776,8 @@ int client_fetch_more(struct client *cl)
         return 0;
     yaz_log(YLOG_LOG, "cl=%s Trying to fetch more", client_get_id(cl));
 
-    if (extend_recs > cl->hits)
-        extend_recs = cl->hits;
-
-    number = extend_recs - cl->record_offset;
+    if (number > extend_recs)
+        number = extend_recs;
     if (number > 0)
     {
         ZOOM_resultset set = cl->resultset;
@@ -1017,6 +1000,7 @@ struct client *client_create(const char *id)
     cl->id = xstrdup(id);
     client_use(1);
 
+    yaz_log(YLOG_DEBUG, "client_create c=%p %s", cl, id);
     return cl;
 }
 
@@ -1396,7 +1380,8 @@ int client_parse_query(struct client *cl, const char *query,
     facet_limits_destroy(cl->facet_limits);
     cl->facet_limits = facet_limits_dup(facet_limits);
 
-    yaz_log(YLOG_LOG, "Client %s: CCL query: %s limit: %s", client_get_id(cl), wrbuf_cstr(w_ccl), wrbuf_cstr(w_pqf));
+    yaz_log(YLOG_LOG, "Client %s: CCL query: %s limit: %s",
+            client_get_id(cl), wrbuf_cstr(w_ccl), wrbuf_cstr(w_pqf));
     cn = ccl_find_str(ccl_map, wrbuf_cstr(w_ccl), &cerror, &cpos);
     ccl_qual_rm(&ccl_map);
     if (!cn)
@@ -1436,7 +1421,8 @@ int client_parse_query(struct client *cl, const char *query,
     if (!cl->pquery || strcmp(cl->pquery, wrbuf_cstr(w_pqf)))
     {
         if (cl->pquery)
-            session_log(se, YLOG_LOG, "Client %s: Re-search due query/limit change: %s to %s", 
+            session_log(se, YLOG_LOG, "Client %s: "
+                        "Re-search due query/limit change: %s to %s", 
                         client_get_id(cl), cl->pquery, wrbuf_cstr(w_pqf));
         xfree(cl->pquery);
         cl->pquery = xstrdup(wrbuf_cstr(w_pqf));