Metadata_setting_parameter // Expose value to normalization stylesheets
};
+enum conf_metadata_mergekey {
+ Metadata_mergekey_no,
+ Metadata_mergekey_yes
+};
+
// Describes known metadata elements and how they are to be manipulated
// An array of these structure provides a 'map' against which
// discovered metadata elements are matched. It also governs storage,
enum conf_metadata_type type;
enum conf_metadata_merge merge;
enum conf_setting_type setting; // Value is to be taken from session/db settings?
+ enum conf_metadata_type mergekey;
};
-struct conf_metadata * conf_metadata_assign(NMEM nmem,
- struct conf_metadata * metadata,
- const char *name,
- enum conf_metadata_type type,
- enum conf_metadata_merge merge,
- enum conf_setting_type setting,
- int brief,
- int termlist,
- int rank,
- int sortkey_offset);
-
-
-
// Controls sorting
struct conf_sortkey
{
enum conf_sortkey_type type;
};
-struct conf_sortkey * conf_sortkey_assign(NMEM nmem,
- struct conf_sortkey * sortkey,
- const char *name,
- enum conf_sortkey_type type);
-
-
-
// It is conceivable that there will eventually be several 'services'
// offered from one server, with separate configuration -- possibly
// more than one services associated with the same port. For now,
struct conf_metadata *metadata;
int num_sortkeys;
struct conf_sortkey *sortkeys;
-
+ struct setting_dictionary *dictionary;
+ struct conf_service *next;
+ char *id;
+ char *settings;
+ 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 brief,
int termlist,
int rank,
- int sortkey_offset);
+ 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 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;
char *proxy_host;
int proxy_port;
char *myurl;
- char *settings;
+ char *server_settings;
pp2_charset_t relevance_pct;
pp2_charset_t sort_pct;
struct conf_config
{
+ NMEM nmem;
struct conf_server *servers;
struct conf_targetprofiles *targetprofiles;
};