X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=6469f4147344c702f7bdfdf124d2ec5fe1670e08;hb=fb19bc317370b4f4b508088b034b4c2d19257042;hp=65ea5cc47cf2dd6f37b94a906ae4c791fc90e00e;hpb=ba5951a80fdd0da1d28c318852b69a1178cd6bfa;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h index 65ea5cc..6469f41 100644 --- a/src/pazpar2_config.h +++ b/src/pazpar2_config.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2013 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 @@ -23,13 +23,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "normalize_cache.h" #include +#include +#include #include "charsets.h" +#include "http.h" +#include "database.h" +#include "host.h" enum conf_metadata_type { Metadata_type_generic, // Generic text field - Metadata_type_number, // A number - Metadata_type_year, // A number - Metadata_type_date // A number + Metadata_type_year, // year YYYY - YYYY + Metadata_type_date, // date YYYYMMDD - YYYYMMDD + Metadata_type_float, // float number + Metadata_type_skiparticle, + Metadata_type_relevance, + Metadata_type_position, }; enum conf_metadata_merge { @@ -37,14 +45,8 @@ enum conf_metadata_merge { Metadata_merge_unique, // Include unique elements in merged block Metadata_merge_longest, // Include the longest (strlen) value Metadata_merge_range, // Store value as a range of lowest-highest - Metadata_merge_all // Just include all elements found -}; - -enum conf_sortkey_type { - Metadata_sortkey_relevance, - Metadata_sortkey_numeric, // Standard numerical sorting - Metadata_sortkey_skiparticle, // Skip leading article when sorting - Metadata_sortkey_string // Flat string + Metadata_merge_all, // Just include all elements found + Metadata_merge_first // All from first target }; // This controls the ability to insert 'static' values from settings into retrieval recs @@ -64,20 +66,22 @@ enum conf_metadata_mergekey { // An array of these structure provides a 'map' against which // discovered metadata elements are matched. It also governs storage, // to minimize number of cycles needed at various tages of processing -struct conf_metadata +struct conf_metadata { char *name; // The field name. Output by normalization stylesheet int brief; // Is this element to be returned in the brief format? int termlist;// Is this field to be treated as a termlist for browsing? - int rank; // Rank factor. 0 means don't use this field for ranking, - // 1 is default - // values >1 give additional significance to a field + const char *rank; int sortkey_offset; // -1 if it's not a sortkey, otherwise index // into service/record_cluster->sortkey array 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; + char *facetrule; + + char *limitmap; // Should be expanded into service-wide default e.g. pz:limitmap:=value setting + char *limitcluster; }; @@ -86,7 +90,7 @@ struct conf_metadata struct conf_sortkey { char *name; - enum conf_sortkey_type type; + enum conf_metadata_type type; }; struct conf_server; @@ -97,28 +101,36 @@ struct conf_server; // 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 settings_array *settings; struct conf_service *next; char *id; - char *settings; NMEM nmem; int session_timeout; int z3950_session_timeout; int z3950_operation_timeout; + int rank_cluster; + int rank_debug; + double rank_follow; + double rank_lead; + int rank_length; + char *default_sort; int ref_count; /* duplicated from conf_server */ - pp2_charset_t relevance_pct; - pp2_charset_t sort_pct; - pp2_charset_t mergekey_pct; + pp2_charset_fact_t charsets; + + struct service_xslt *xslt_list; + CCL_bibset ccl_bibset; struct database *databases; - struct conf_targetprofiles *targetprofiles; struct conf_server *server; + char *xml_node; }; int conf_service_metadata_field_id(struct conf_service *service, const char * name); @@ -128,33 +140,27 @@ int conf_service_sortkey_field_id(struct conf_service *service, const char * nam struct conf_server { char *host; - int port; + char *port; char *proxy_host; int proxy_port; char *myurl; - struct sockaddr_in *proxy_addr; - int listener_socket; - char *server_settings; + char *settings_fname; + char *server_id; + + pp2_charset_fact_t charsets; - 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; -}; - -struct conf_targetprofiles -{ - enum { - Targetprofiles_local - } type; - char *src; + http_server_t http_server; + iochan_man_t iochan_man; + database_hosts_t database_hosts; }; 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); @@ -165,11 +171,12 @@ void service_incref(struct conf_service *service); void service_destroy(struct conf_service *service); int config_start_listeners(struct conf_config *conf, - const char *listener_override); + const char *listener_override, + const char *record_fname); 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