X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=8a1ae0692d246bee058060ad38bc9f848e4b693f;hb=b94f122f7e74623aa67e1fa1d097f7627c087f5c;hp=60d7793332d0a297521c803b911ac3f71c10b14d;hpb=f13ac948b76f05aeb46350de335406f9626054ba;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 60d7793..8a1ae06 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -81,6 +81,7 @@ struct conf_metadata
     enum conf_metadata_merge merge;
     enum conf_setting_type setting; // Value is to be taken from session/db settings?
     enum conf_metadata_mergekey mergekey;
+    char *icu_chain;
 };
 
 
@@ -116,13 +117,9 @@ struct conf_service
 
     int ref_count;
     /* duplicated from conf_server */
-    pp2_charset_t relevance_pct;
-    pp2_charset_t sort_pct;
-    pp2_charset_t mergekey_pct;
-    pp2_charset_t facet_pct;
+    pp2_charset_fact_t charsets;
 
     struct database *databases;
-    struct conf_targetprofiles *targetprofiles;
     struct conf_server *server;
 };
 
@@ -140,10 +137,7 @@ struct conf_server
     char *server_settings;
     char *server_id;
 
-    pp2_charset_t relevance_pct;
-    pp2_charset_t sort_pct;
-    pp2_charset_t mergekey_pct;
-    pp2_charset_t facet_pct;
+    pp2_charset_fact_t charsets;
 
     struct conf_service *service;
     struct conf_server *next;
@@ -153,14 +147,6 @@ struct conf_server
     database_hosts_t database_hosts;
 };
 
-struct conf_targetprofiles
-{
-    enum {
-        Targetprofiles_local
-    } type;
-    char *src;
-};
-
 struct conf_config *config_create(const char *fname, int verbose);
 void config_destroy(struct conf_config *config);
 void config_process_events(struct conf_config *config);