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
Databases per-service.
[pazpar2-moved-to-github.git]
/
src
/
pazpar2_config.h
diff --git
a/src/pazpar2_config.h
b/src/pazpar2_config.h
index
8be4972
..
e3637f8
100644
(file)
--- a/
src/pazpar2_config.h
+++ b/
src/pazpar2_config.h
@@
-101,14
+101,17
@@
struct conf_service
int num_sortkeys;
struct conf_sortkey *sortkeys;
struct setting_dictionary *dictionary;
int num_sortkeys;
struct conf_sortkey *sortkeys;
struct setting_dictionary *dictionary;
+ struct conf_service *next;
+ char *id;
+ char *settings;
NMEM nmem;
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,
int field_id,
const char *name,
enum conf_metadata_type type,
@@
-120,8
+123,7
@@
struct conf_metadata* conf_service_add_metadata(NMEM nmem,
int sortkey_offset,
enum conf_metadata_mergekey mt);
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);
int field_id,
const char *name,
enum conf_sortkey_type type);
@@
-132,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);
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;
struct conf_server
{
char *host;
@@
-139,7
+145,7
@@
struct conf_server
char *proxy_host;
int proxy_port;
char *myurl;
char *proxy_host;
int proxy_port;
char *myurl;
- char *settings;
+ char *server_settings;
pp2_charset_t relevance_pct;
pp2_charset_t sort_pct;
pp2_charset_t relevance_pct;
pp2_charset_t sort_pct;
@@
-159,6
+165,7
@@
struct conf_targetprofiles
struct conf_config
{
struct conf_config
{
+ NMEM nmem;
struct conf_server *servers;
struct conf_targetprofiles *targetprofiles;
};
struct conf_server *servers;
struct conf_targetprofiles *targetprofiles;
};