X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=9e8f13d26b5d283eb361167899e88c194a0d5457;hb=6f67e37390eee5bb4df6a456de88045ef810406d;hp=3fa68aa893de6a4fb39f13fc7f2a79ba8e1994b3;hpb=2819110732a5e3cdc6de71333977ff39d7cf8bf3;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h index 3fa68aa..9e8f13d 100644 --- a/src/pazpar2_config.h +++ b/src/pazpar2_config.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2009 Index Data + Copyright (C) 2006-2010 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 @@ -20,12 +20,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifndef PAZPAR2_CONFIG_H #define PAZPAR2_CONFIG_H -#include -#include -#include +#include "normalize_cache.h" #include +#include #include "charsets.h" +#include "http.h" +#include "database.h" enum conf_metadata_type { Metadata_type_generic, // Generic text field @@ -56,6 +57,12 @@ enum conf_setting_type { Metadata_setting_parameter // Expose value to normalization stylesheets }; +enum conf_metadata_mergekey { + Metadata_mergekey_no, + Metadata_mergekey_optional, + Metadata_mergekey_required +}; + // 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, @@ -73,23 +80,11 @@ struct conf_metadata 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_mergekey 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 { @@ -97,12 +92,7 @@ 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); - - +struct conf_server; // It is conceivable that there will eventually be several 'services' // offered from one server, with separate configuration -- possibly @@ -110,41 +100,35 @@ struct conf_sortkey * conf_sortkey_assign(NMEM nmem, // however, only a single service is possible. struct conf_service { + YAZ_MUTEX mutex; int num_metadata; 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; + int session_timeout; + int z3950_session_timeout; + int z3950_operation_timeout; -}; - -struct conf_service * conf_service_create(NMEM nmem, - int num_metadata, int num_sortkeys); - - -struct conf_metadata* conf_service_add_metadata(NMEM nmem, - struct conf_service *service, - int field_id, - 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); - -struct conf_sortkey * conf_service_add_sortkey(NMEM nmem, - struct conf_service *service, - int field_id, - const char *name, - enum conf_sortkey_type type); + int ref_count; + /* duplicated from conf_server */ + pp2_charset_t relevance_pct; + pp2_charset_t sort_pct; + pp2_charset_t mergekey_pct; + struct database *databases; + struct conf_targetprofiles *targetprofiles; + struct conf_server *server; +}; int conf_service_metadata_field_id(struct conf_service *service, const char * name); int conf_service_sortkey_field_id(struct conf_service *service, const char * name); - struct conf_server { char *host; @@ -152,14 +136,18 @@ struct conf_server char *proxy_host; int proxy_port; char *myurl; - char *settings; + char *server_settings; + char *server_id; pp2_charset_t relevance_pct; pp2_charset_t sort_pct; pp2_charset_t mergekey_pct; - 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 @@ -170,27 +158,33 @@ struct conf_targetprofiles char *src; }; -struct conf_config -{ - struct conf_server *servers; - struct conf_targetprofiles *targetprofiles; -}; +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); -#ifndef CONFIG_NOEXTERNS +struct conf_service *locate_service(struct conf_server *server, + const char *service_id); -extern struct conf_config *config; +struct conf_service *service_create(struct conf_server *server, + xmlNode *node); +void service_incref(struct conf_service *service); +void service_destroy(struct conf_service *service); -#endif +int config_start_listeners(struct conf_config *conf, + const char *listener_override); + +void config_stop_listeners(struct conf_config *conf); -int read_config(const char *fname); -xsltStylesheet *conf_load_stylesheet(const char *fname); +WRBUF conf_get_fname(struct conf_config *config, const char *fname); #endif /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +