X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=e3637f8e36b9b6632582d3d570eaba0157ebcfc0;hb=216073a7a0d2fdfc9d88c58b1a2ff83fa76d4628;hp=1e71619281da239fea36e198864ef1e85ee27d97;hpb=a6b5e633581cbae0759c3b68faa7a0cd0197f790;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 1e71619..e3637f8 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -100,14 +100,18 @@ struct conf_service
     struct conf_metadata *metadata;
     int num_sortkeys;
     struct conf_sortkey *sortkeys;
-
+    struct setting_dictionary *dictionary;
+    struct conf_service *next;
+    char *id;
+    char *settings;
+    NMEM nmem;
+    struct database *databases;
 };
 
-struct conf_service * conf_service_create(NMEM nmem, 
-                                          int num_metadata, int num_sortkeys);
+struct conf_service * conf_service_create(int num_metadata, int num_sortkeys,
+    const char *service_id);
 
-struct conf_metadata* conf_service_add_metadata(NMEM nmem, 
-                                                struct conf_service *service,
+struct conf_metadata* conf_service_add_metadata(struct conf_service *service,
                                                 int field_id,
                                                 const char *name,
                                                 enum conf_metadata_type type,
@@ -119,8 +123,7 @@ struct conf_metadata* conf_service_add_metadata(NMEM nmem,
                                                 int sortkey_offset,
                                                 enum conf_metadata_mergekey mt);
 
-struct conf_sortkey * conf_service_add_sortkey(NMEM nmem,
-                                               struct conf_service *service,
+struct conf_sortkey * conf_service_add_sortkey(struct conf_service *service,
                                                int field_id,
                                                const char *name,
                                                enum conf_sortkey_type type);
@@ -131,6 +134,10 @@ int conf_service_metadata_field_id(struct conf_service *service, const char * na
 int conf_service_sortkey_field_id(struct conf_service *service, const char * name);
 
 
+void config_read_settings(const char *path_override);
+
+struct conf_service *locate_service(const char *service_id);
+
 struct conf_server
 {
     char *host;
@@ -138,7 +145,7 @@ struct conf_server
     char *proxy_host;
     int proxy_port;
     char *myurl;
-    char *settings;
+    char *server_settings;
 
     pp2_charset_t relevance_pct;
     pp2_charset_t sort_pct;
@@ -158,6 +165,7 @@ struct conf_targetprofiles
 
 struct conf_config
 {
+    NMEM nmem;
     struct conf_server *servers;
     struct conf_targetprofiles *targetprofiles;
 };