pz:extendrecs number of records in extended mode

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

diff --git a/src/client.c b/src/client.c
index 5f05633..4c40d9c 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -764,17 +764,33 @@ static const char *get_strategy_plus_sort(struct client *l, const char *field)
 
 int client_fetch_more(struct client *cl)
 {
-    int extra = cl->hits - cl->record_offset;
-    if (extra > 0)
+    struct session_database *sdb = client_get_database(cl);
+    const char *str;
+    int extend_recs = 0;
+    int number;
+
+    str = session_setting_oneval(sdb, PZ_EXTENDRECS);
+    if (str && *str)
+        extend_recs = atoi(str);
+
+    if (extend_recs > cl->hits)
+        extend_recs = cl->hits;
+
+    number = extend_recs - cl->record_offset;
+    if (number > 0)
     {
         ZOOM_resultset set = cl->resultset;
-        int max_extra = 10;
+        struct connection *co = client_get_connection(cl);
 
-        if (extra > max_extra)
-            extra = max_extra;
+        str = session_setting_oneval(sdb, PZ_REQUESTSYNTAX);
+        ZOOM_resultset_option_set(set, "preferredRecordSyntax", str);
+        str = session_setting_oneval(sdb, PZ_ELEMENTS);
+        if (str && *str)
+            ZOOM_resultset_option_set(set, "elementSetName", str);
 
-        ZOOM_resultset_records(set, 0, cl->record_offset, extra);
+        ZOOM_resultset_records(set, 0, cl->record_offset, number);
         client_set_state(cl, Client_Working);
+        connection_continue(co);
         return 1;
     }
     return 0;