X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsettings.h;h=3f306a0f5916100c28899c38018448ca01d4af94;hb=545611a81c7627b6380a0bda6f22cae3c6e16fe1;hp=cbba02c116f92848d6bf13b093e45588ef82fe35;hpb=c7ce18b91b4b542af4f02ad9fa3f86f12b92f3d1;p=pazpar2-moved-to-github.git

diff --git a/src/settings.h b/src/settings.h
index cbba02c..3f306a0 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) 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
@@ -44,14 +44,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define PZ_MAX_CONNECTIONS      21
 #define PZ_REUSE_CONNECTIONS    22
 #define PZ_TERMLIST_TERM_FACTOR 23
-#define PZ_PREFERRED            24
-#define PZ_EXTRA_ARGS           25
-#define PZ_QUERY_SYNTAX         26
-#define PZ_FACETMAP             27
-#define PZ_LIMITMAP             28
-#define PZ_URL                  29
-#define PZ_SORTMAP              30
-#define PZ_MAX_EOF              31
+#define PZ_TERMLIST_TERM_COUNT  24
+#define PZ_PREFERRED            25
+#define PZ_EXTRA_ARGS           26
+#define PZ_QUERY_SYNTAX         27
+#define PZ_FACETMAP             28
+#define PZ_LIMITMAP             29
+#define PZ_URL                  30
+#define PZ_SORTMAP              31
+#define PZ_PRESENT_CHUNK        32
+#define PZ_BLOCK_TIMEOUT        33
+#define PZ_EXTENDRECS           34
+#define PZ_AUTHENTICATION_MODE  35
+#define PZ_NATIVE_SCORE         36
+#define PZ_MEMCACHED            37
+#define PZ_MAX_EOF              39
 
 struct setting
 {
@@ -62,18 +69,32 @@ struct setting
     struct setting *next;
 };
 
-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);
+// Represents a database
+struct database {
+    char *id;
+    int num_settings;
+    struct setting **settings;
+    struct database *next;
+};
+
+struct settings_array
+{
+    // Array of pointer setting, index is looked up in setting_dictionary
+    struct setting **settings;
+    int num_settings;
+};
+
+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);