X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconfig.h;h=57a5a5d6610002146444ea15d19c41815facfe80;hb=8ac64e993e05a743a39e6254c0659c93258e686c;hp=a84b7de80c582c9beaec2325ee4e72c87ed041ff;hpb=0845e34105333ff6828a01d8813f5738fbf8b9a9;p=pazpar2-moved-to-github.git diff --git a/src/config.h b/src/config.h index a84b7de..57a5a5d 100644 --- a/src/config.h +++ b/src/config.h @@ -1,4 +1,4 @@ -/* $Id: config.h,v 1.17 2007-04-18 15:09:51 marc Exp $ +/* $Id: config.h,v 1.22 2007-04-26 10:19:05 marc Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -26,14 +26,31 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -enum conf_sortkey_type -{ +#include + +enum conf_metadata_type { + Metadata_type_generic, // Generic text field + Metadata_type_number, // A number + Metadata_type_year // 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 }; + + // 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 +65,24 @@ 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; }; + + +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, + int brief, + int termlist, + int rank, + int sortkey_offset); + + + // Controls sorting struct conf_sortkey { @@ -71,6 +90,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, @@ -83,6 +109,32 @@ struct conf_service 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, + 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;