X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.h;h=846750b48ac71a281c96036651835f816bc01487;hb=c7b8fb38d1cd3568301aabac00c5627bd6f510ca;hp=85ebd587fb529bed25c719a2085c85f4f238dbf0;hpb=8ca1269eac32c1ddc19d16dc4f74e9a1e3e0b8f9;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.h b/src/pazpar2.h
index 85ebd58..846750b 100644
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -66,13 +66,26 @@ struct host {
 struct database {
     struct host *host;
     char *url;
+    char *name;
     char **databases;
     int errors;
-    struct conf_queryprofile *qprofile;
+    struct zr_explain *explain;
     struct conf_retrievalprofile *rprofile;
+    struct setting **settings;
     struct database *next;
+    CCL_bibset ccl_map;
+};
+
+struct database_criterion_value {
+    char *value;
+    struct database_criterion_value *next;
 };
 
+struct database_criterion {
+    char *name;
+    struct database_criterion_value *values;
+    struct database_criterion *next;
+};
 
 // Represents a physical, reusable  connection to a remote Z39.50 host
 struct connection {
@@ -165,7 +178,8 @@ struct statistics {
 };
 
 struct hitsbytarget {
-    char id[256];
+    char *id;
+    char *name;
     int hits;
     int diagnostic;
     int records;
@@ -176,6 +190,8 @@ struct hitsbytarget {
 struct parameters {
     char proxy_override[128];
     char listener_override[128];
+    char zproxy_override[128];
+    char settings_path_override[128];
     struct conf_server *server;
     int dump_records;
     int timeout;		/* operations timeout, in seconds */
@@ -186,19 +202,18 @@ struct parameters {
     int session_timeout;
     int toget;
     int chunk;
-    CCL_bibset ccl_filter;
     yaz_marc_t yaz_marc;
     ODR odr_out;
     ODR odr_in;
 };
 
 struct hitsbytarget *hitsbytarget(struct session *s, int *count);
-int select_targets(struct session *se);
+int select_targets(struct session *se, struct database_criterion *crit);
 struct session *new_session();
 void destroy_session(struct session *s);
 int load_targets(struct session *s, const char *fn);
 void statistics(struct session *s, struct statistics *stat);
-char *search(struct session *s, char *query);
+char *search(struct session *s, char *query, char *filter);
 struct record_cluster **show(struct session *s, struct reclist_sortparms *sp, int start,
         int *num, int *total, int *sumhits, NMEM nmem_show);
 struct record_cluster *show_single(struct session *s, int id);