X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsettings.h;h=b0da5836f2d8f5ef6bf054f886b27b0ee503af1d;hb=6110a4dcdf8f269968c6a30792f47dacba3929b6;hp=5826ac6baafab531268e32d81d7f5afe2b0c25a0;hpb=ca27c970f17c8273c91ddb35b5bdc5059b601f5e;p=pazpar2-moved-to-github.git diff --git a/src/settings.h b/src/settings.h index 5826ac6..b0da583 100644 --- a/src/settings.h +++ b/src/settings.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2012 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 @@ -54,7 +54,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define PZ_SORTMAP 31 #define PZ_PRESENT_CHUNK 32 #define PZ_BLOCK_TIMEOUT 33 -#define PZ_MAX_EOF 34 +#define PZ_EXTENDRECS 34 +#define PZ_MAX_EOF 35 struct setting { @@ -65,25 +66,24 @@ struct setting struct setting *next; }; -struct settings +struct settings_array { // Array of pointer setting, index is looked up in setting_dictionary struct setting **settings; int num_settings; }; -void settings_read_file(struct conf_service *service, const char *path, - int pass); -void settings_read_node(struct conf_service *service, xmlNode *n, - int pass); +int settings_read_file(struct conf_service *service, const char *path, + int pass); +int settings_read_node(struct conf_service *service, xmlNode *n, int pass); int settings_num(struct conf_service *service); int settings_create_offset(struct conf_service *service, const char *name); int settings_lookup_offset(struct conf_service *service, const char *name); void init_settings(struct conf_service *service); -void settings_read_node_x(xmlNode *n, - void *client_data, - void (*fun)(void *client_data, - struct setting *set)); +int settings_read_node_x(xmlNode *n, + void *client_data, + void (*fun)(void *client_data, + struct setting *set)); void expand_settings_array(struct setting ***set_ar, int *num, int offset, NMEM nmem);