X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.h;h=158e2fb23072eb82563e19e8977782daf5a22d2b;hb=beda9709478c02182ceadb5f0526c32d8986c039;hp=e70101ca5b68ea5365327218962fad6fd103b097;hpb=84d4e1ca8708ecd3cf980033f82a703eb3a92da0;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.h b/src/pazpar2.h
index e70101c..158e2fb 100644
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -52,11 +52,7 @@ enum pazpar2_error_code {
     PAZPAR2_LAST_ERROR
 };
 
-enum pazpar2_database_criterion_type {
-    PAZPAR2_STRING_MATCH,
-    PAZPAR2_SUBSTRING_MATCH
-};
-
+struct host;
 // Represents a (virtual) database on a host
 struct database {
     struct host *host;
@@ -64,34 +60,23 @@ struct database {
     char **databases;
     int errors;
     struct zr_explain *explain;
+    int num_settings;
     struct setting **settings;
     struct database *next;
 };
 
-struct database_criterion_value {
-    char *value;
-    struct database_criterion_value *next;
-};
-
-struct database_criterion {
-    char *name;
-    enum pazpar2_database_criterion_type type;
-    struct database_criterion_value *values;
-    struct database_criterion *next;
-};
 
 // Represents a database as viewed from one session, possibly with settings overriden
 // for that session
 struct session_database
 {
     struct database *database;
+    int num_settings;
     struct setting **settings;
     normalize_record_t map;
     struct session_database *next;
 };
 
-
-
 #define SESSION_WATCH_SHOW      0
 #define SESSION_WATCH_RECORD    1
 #define SESSION_WATCH_MAX       1
@@ -125,12 +110,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,16 +138,17 @@ struct hitsbytarget {
     int records;
     const char *state;
     int connected;
+    WRBUF settings_xml;
 };
 
 struct hitsbytarget *hitsbytarget(struct session *s, int *count, NMEM nmem);
-int select_targets(struct session *se, struct database_criterion *crit);
 struct session *new_session(NMEM nmem, struct conf_service *service);
 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);