X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fconfig.h;h=6f529227a3da48fb37e26fc76f156354b0d7c2b3;hb=90dcde08cb73241173e22e84362c6acf9ee92276;hp=a84b7de80c582c9beaec2325ee4e72c87ed041ff;hpb=0845e34105333ff6828a01d8813f5738fbf8b9a9;p=pazpar2-moved-to-github.git diff --git a/src/config.h b/src/config.h index a84b7de..6f52922 100644 --- a/src/config.h +++ b/src/config.h @@ -1,7 +1,5 @@ -/* $Id: config.h,v 1.17 2007-04-18 15:09:51 marc Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 2006-2008 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 @@ -14,10 +12,10 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Pazpar2; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ #ifndef CONFIG_H #define CONFIG_H @@ -26,14 +24,38 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -enum conf_sortkey_type -{ +#include +#include "charsets.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 +}; + +enum conf_metadata_merge { + Metadata_merge_no, // Don't 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 }; +// This controls the ability to insert 'static' values from settings into retrieval recs +enum conf_setting_type { + Metadata_setting_no, + Metadata_setting_postproc, // Insert setting value into normalized record + Metadata_setting_parameter // Expose value to normalization stylesheets +}; + // 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, @@ -48,22 +70,26 @@ struct conf_metadata // values >1 give additional significance to a field int sortkey_offset; // -1 if it's not a sortkey, otherwise index // into service/record_cluster->sortkey array - enum - { - Metadata_type_generic, // Generic text field - Metadata_type_number, // A number - Metadata_type_year // A number - } type; - enum - { - Metadata_merge_no, // Don't 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 - } merge; + enum conf_metadata_type type; + enum conf_metadata_merge merge; + enum conf_setting_type setting; // Value is to be taken from session/db settings? }; + + +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 { @@ -71,6 +97,13 @@ 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, @@ -81,8 +114,37 @@ struct conf_service struct conf_metadata *metadata; int num_sortkeys; struct conf_sortkey *sortkeys; + }; +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 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; @@ -90,9 +152,12 @@ struct conf_server char *proxy_host; int proxy_port; char *myurl; - char *zproxy_host; - int zproxy_port; char *settings; + + pp2_charset_t relevance_pct; + pp2_charset_t sort_pct; + pp2_charset_t mergekey_pct; + struct conf_service *service; struct conf_server *next; };