projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into channel_list_mutex
[pazpar2-moved-to-github.git]
/
src
/
pazpar2_config.h
diff --git
a/src/pazpar2_config.h
b/src/pazpar2_config.h
index
5b5eee6
..
9e8f13d
100644
(file)
--- a/
src/pazpar2_config.h
+++ b/
src/pazpar2_config.h
@@
-26,6
+26,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/mutex.h>
#include "charsets.h"
#include "http.h"
#include <yaz/mutex.h>
#include "charsets.h"
#include "http.h"
+#include "database.h"
enum conf_metadata_type {
Metadata_type_generic, // Generic text field
enum conf_metadata_type {
Metadata_type_generic, // Generic text field
@@
-146,6
+147,7
@@
struct conf_server
struct conf_config *config;
http_server_t http_server;
iochan_man_t iochan_man;
struct conf_config *config;
http_server_t http_server;
iochan_man_t iochan_man;
+ database_hosts_t database_hosts;
};
struct conf_targetprofiles
};
struct conf_targetprofiles
@@
-173,7
+175,7
@@
int config_start_listeners(struct conf_config *conf,
void config_stop_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
#endif