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
Follow style of previous NEWS entries
[pazpar2-moved-to-github.git]
/
src
/
pazpar2_config.h
diff --git
a/src/pazpar2_config.h
b/src/pazpar2_config.h
index
41d9431
..
0bb9cbe
100644
(file)
--- a/
src/pazpar2_config.h
+++ b/
src/pazpar2_config.h
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* 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
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
@@
-25,6
+25,8
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/nmem.h>
#include <yaz/mutex.h>
#include "charsets.h"
#include <yaz/nmem.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
@@
-117,6
+119,7
@@
struct conf_service
pp2_charset_t relevance_pct;
pp2_charset_t sort_pct;
pp2_charset_t mergekey_pct;
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;
struct database *databases;
struct conf_targetprofiles *targetprofiles;
@@
-134,17
+137,20
@@
struct conf_server
char *proxy_host;
int proxy_port;
char *myurl;
char *proxy_host;
int proxy_port;
char *myurl;
- struct sockaddr_in *proxy_addr;
- int listener_socket;
char *server_settings;
char *server_id;
pp2_charset_t relevance_pct;
pp2_charset_t sort_pct;
pp2_charset_t mergekey_pct;
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;
+
struct conf_service *service;
struct conf_server *next;
struct conf_config *config;
struct conf_service *service;
struct conf_server *next;
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
@@
-157,7
+163,8
@@
struct conf_targetprofiles
struct conf_config *config_create(const char *fname, int verbose);
void config_destroy(struct conf_config *config);
struct conf_config *config_create(const char *fname, int verbose);
void config_destroy(struct conf_config *config);
-void config_start_databases(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);
struct conf_service *locate_service(struct conf_server *server,
const char *service_id);
@@
-172,7
+179,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