Renamed settings to settings_array

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

diff --git a/src/client.c b/src/client.c
index 59fb027..9e52b0a 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -762,6 +762,7 @@ void client_start_search(struct client *cl)
     int present_chunk = 20; // Default chunk size
     if (opt_present_chunk && strcmp(opt_present_chunk,"")) {
         present_chunk = atoi(opt_present_chunk);
+        yaz_log(YLOG_DEBUG, "Present chunk set to %d", present_chunk);
     }
 
     assert(link);
@@ -803,11 +804,13 @@ void client_start_search(struct client *cl)
     /* A present_chunk less than 1 will disable chunking. */
     if (present_chunk > 0 && cl->maxrecs > present_chunk) {
         sprintf(present_chunk_str, "%d", present_chunk);
-        ZOOM_connection_option_set(link, "presentChunk", opt_present_chunk);
+        ZOOM_connection_option_set(link, "presentChunk", present_chunk_str);
+        yaz_log(YLOG_DEBUG, "Present chunk set to %s", present_chunk_str);
     }
-    else
+    else {
         ZOOM_connection_option_set(link, "presentChunk", maxrecs_str);
-
+        yaz_log(YLOG_DEBUG, "Present chunk set to %s (maxrecs)", maxrecs_str);
+    }
     sprintf(startrecs_str, "%d", cl->startrecs);
     ZOOM_connection_option_set(link, "start", startrecs_str);
 
@@ -1327,10 +1330,9 @@ Odr_int client_get_hits(struct client *cl)
 
 Odr_int client_get_approximation(struct client *cl)
 {
-    int records = cl->record_offset + cl->filtered;
-    if (records > 0) {
-        Odr_int approx = (cl->hits * cl->record_offset) / records;
-        yaz_log(YLOG_LOG, "%s: Approx: %lld * %d / %d = %lld ", client_get_id(cl), cl->hits, cl->record_offset, records, approx);
+    if (cl->record_offset > 0) {
+        Odr_int approx = ((10 * cl->hits * (cl->record_offset - cl->filtered)) / cl->record_offset + 5) /10;
+        yaz_log(YLOG_LOG, "%s: Approx: %lld * %d / %d = %lld ", client_get_id(cl), cl->hits, cl->record_offset - cl->filtered, cl->record_offset, approx);
         return approx;
     }
     return cl->hits;