X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=00612a1f95385c9e2d4bba27405de133a3da801f;hb=0d45377ca625dc66907c18bb3f524f9d6c354236;hp=6469f4147344c702f7bdfdf124d2ec5fe1670e08;hpb=fb19bc317370b4f4b508088b034b4c2d19257042;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h index 6469f41..00612a1 100644 --- a/src/pazpar2_config.h +++ b/src/pazpar2_config.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2013 Index Data + Copyright (C) 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 @@ -28,7 +28,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "charsets.h" #include "http.h" #include "database.h" -#include "host.h" enum conf_metadata_type { Metadata_type_generic, // Generic text field @@ -38,6 +37,7 @@ enum conf_metadata_type { Metadata_type_skiparticle, Metadata_type_relevance, Metadata_type_position, + Metadata_type_retrieval, }; enum conf_metadata_merge { @@ -82,6 +82,7 @@ struct conf_metadata char *limitmap; // Should be expanded into service-wide default e.g. pz:limitmap:=value setting char *limitcluster; + char *icurule; }; @@ -154,10 +155,9 @@ struct conf_server struct conf_config *config; 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); +struct conf_config *config_create(const char *fname); void config_destroy(struct conf_config *config); void config_process_events(struct conf_config *config); void info_services(struct conf_server *server, WRBUF w);