Functional settings system. At this point, they control the CCL map only

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

diff --git a/src/pazpar2.h b/src/pazpar2.h
index ec9e95a..846750b 100644 (file)
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -70,10 +70,10 @@ struct database {
     char **databases;
     int errors;
     struct zr_explain *explain;
-    struct conf_queryprofile *qprofile;
     struct conf_retrievalprofile *rprofile;
     struct setting **settings;
     struct database *next;
+    CCL_bibset ccl_map;
 };
 
 struct database_criterion_value {
@@ -191,7 +191,7 @@ struct parameters {
     char proxy_override[128];
     char listener_override[128];
     char zproxy_override[128];
-    char settings_path[128];
+    char settings_path_override[128];
     struct conf_server *server;
     int dump_records;
     int timeout;               /* operations timeout, in seconds */
@@ -202,7 +202,6 @@ struct parameters {
     int session_timeout;
     int toget;
     int chunk;
-    CCL_bibset ccl_filter;
     yaz_marc_t yaz_marc;
     ODR odr_out;
     ODR odr_in;