Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/pazpar2

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

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 678e2e9..0bb9cbe 100644 (file)
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2010 Index Data
+   Copyright (C) 2006-2011 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -119,6 +119,7 @@ struct conf_service
     pp2_charset_t relevance_pct;
     pp2_charset_t sort_pct;
     pp2_charset_t mergekey_pct;
+    pp2_charset_t facet_pct;
 
     struct database *databases;
     struct conf_targetprofiles *targetprofiles;
@@ -142,6 +143,8 @@ struct conf_server
     pp2_charset_t relevance_pct;
     pp2_charset_t sort_pct;
     pp2_charset_t mergekey_pct;
+    pp2_charset_t facet_pct;
+
     struct conf_service *service;
     struct conf_server *next;
     struct conf_config *config;
@@ -161,6 +164,7 @@ struct conf_targetprofiles
 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);
+void info_services(struct conf_server *server, WRBUF w);
 
 struct conf_service *locate_service(struct conf_server *server,
                                     const char *service_id);
@@ -175,7 +179,7 @@ int config_start_listeners(struct conf_config *conf,
 
 void config_stop_listeners(struct conf_config *conf);
 
-WRBUF conf_get_fname(struct conf_service *service, const char *fname);
+WRBUF conf_get_fname(struct conf_config *config, const char *fname);
 
 #endif