Settings, bytarget + db out-of-range check

[pazpar2-moved-to-github.git] / src / pazpar2.h

diff --git a/src/pazpar2.h b/src/pazpar2.h
index e70101c..b84d11a 100644 (file)
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -64,6 +64,7 @@ struct database {
     char **databases;
     int errors;
     struct zr_explain *explain;
+    int num_settings;
     struct setting **settings;
     struct database *next;
 };
@@ -125,12 +126,12 @@ struct session {
     struct relevance *relevance;
     struct reclist *reclist;
     struct session_watchentry watchlist[SESSION_WATCH_MAX + 1];
-    int expected_maxrecs;
     int total_hits;
     int total_records;
     int total_merged;
     int number_of_warnings_unknown_elements;
     int number_of_warnings_unknown_metadata;
+    normalize_cache_t normalize_cache;
 };
 
 struct statistics {
@@ -153,6 +154,7 @@ struct hitsbytarget {
     int records;
     const char *state;
     int connected;
+    WRBUF settings_xml;
 };
 
 struct hitsbytarget *hitsbytarget(struct session *s, int *count, NMEM nmem);
@@ -162,7 +164,8 @@ void destroy_session(struct session *s);
 void session_init_databases(struct session *s);
 int load_targets(struct session *s, const char *fn);
 void statistics(struct session *s, struct statistics *stat);
-enum pazpar2_error_code search(struct session *s, const char *query, 
+enum pazpar2_error_code search(struct session *s, const char *query,
+                               const char *startrecs, const char *maxrecs,
                                const char *filter, const char **addinfo);
 struct record_cluster **show(struct session *s, struct reclist_sortparms *sp, int start,
         int *num, int *total, int *sumhits, NMEM nmem_show);