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
Rename metadata attribute icu_chain to facetrule
[pazpar2-moved-to-github.git]
/
src
/
pazpar2_config.h
diff --git
a/src/pazpar2_config.h
b/src/pazpar2_config.h
index
60d7793
..
1906b85
100644
(file)
--- a/
src/pazpar2_config.h
+++ b/
src/pazpar2_config.h
@@
-81,6
+81,7
@@
struct conf_metadata
enum conf_metadata_merge merge;
enum conf_setting_type setting; // Value is to be taken from session/db settings?
enum conf_metadata_mergekey mergekey;
enum conf_metadata_merge merge;
enum conf_setting_type setting; // Value is to be taken from session/db settings?
enum conf_metadata_mergekey mergekey;
+ char *facetrule;
};
};
@@
-116,13
+117,9
@@
struct conf_service
int ref_count;
/* duplicated from conf_server */
int ref_count;
/* duplicated from conf_server */
- pp2_charset_t relevance_pct;
- pp2_charset_t sort_pct;
- pp2_charset_t mergekey_pct;
- pp2_charset_t facet_pct;
+ pp2_charset_fact_t charsets;
struct database *databases;
struct database *databases;
- struct conf_targetprofiles *targetprofiles;
struct conf_server *server;
};
struct conf_server *server;
};
@@
-140,10
+137,7
@@
struct conf_server
char *server_settings;
char *server_id;
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;
+ pp2_charset_fact_t charsets;
struct conf_service *service;
struct conf_server *next;
struct conf_service *service;
struct conf_server *next;
@@
-153,14
+147,6
@@
struct conf_server
database_hosts_t database_hosts;
};
database_hosts_t database_hosts;
};
-struct conf_targetprofiles
-{
- enum {
- Targetprofiles_local
- } type;
- char *src;
-};
-
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);
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);