X-Git-Url: http://git.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=f56ea7f4394bfd2234ad50b91bd563929c3c76dd;hb=77c88af0dbe56288a1673315822c37bad9579cde;hp=6c4b33e8ff74173e28042cff4984067fd1880546;hpb=1054f543dd124d5e7d5b57eb0e80298b88ab1d7e;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 6c4b33e..f56ea7f 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -90,6 +90,8 @@ struct conf_sortkey
     enum conf_sortkey_type type;
 };
 
+struct conf_server;
+
 // It is conceivable that there will eventually be several 'services'
 // offered from one server, with separate configuration -- possibly
 // more than one services associated with the same port. For now,
@@ -116,13 +118,9 @@ struct conf_service
 
     struct database *databases;
     struct conf_targetprofiles *targetprofiles;
-    struct conf_config *config;
+    struct conf_server *server;
 };
 
-struct conf_service * conf_service_create(struct conf_config *config,
-                                          int num_metadata, int num_sortkeys,
-                                          const char *service_id);
-
 int conf_service_metadata_field_id(struct conf_service *service, const char * name);
 
 int conf_service_sortkey_field_id(struct conf_service *service, const char * name);
@@ -143,6 +141,7 @@ struct conf_server
     pp2_charset_t mergekey_pct;
     struct conf_service *service;
     struct conf_server *next;
+    struct conf_config *config;
 };
 
 struct conf_targetprofiles
@@ -155,7 +154,7 @@ struct conf_targetprofiles
 
 struct conf_config *config_create(const char *fname, int verbose);
 void config_destroy(struct conf_config *config);
-xsltStylesheet *conf_load_stylesheet(struct conf_config *config,
+xsltStylesheet *conf_load_stylesheet(struct conf_service *service,
                                      const char *fname);
 
 void config_start_databases(struct conf_config *config);