X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsettings.h;h=5826ac6baafab531268e32d81d7f5afe2b0c25a0;hb=407df3f2f9da2bb3911bd3819b9fb966f4ea2264;hp=4d1156a48fbbd4c72f20512100509a09719f3c0e;hpb=6eae0f60b55fed625a37954651ac3cf9cc39bf53;p=pazpar2-moved-to-github.git

diff --git a/src/settings.h b/src/settings.h
index 4d1156a..5826ac6 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2011 Index Data
+   Copyright (C) 2006-2012 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
@@ -32,26 +32,29 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define PZ_ID             9
 #define PZ_NAME          10
 #define PZ_QUERYENCODING 11
-#define PZ_IP            12
-#define PZ_ZPROXY        13
-#define PZ_APDULOG       14
-#define PZ_SRU           15
-#define PZ_SRU_VERSION   16
-#define PZ_PQF_PREFIX    17
-#define PZ_SORT          18
-#define PZ_RECORDFILTER	 19
-#define PZ_PQF_STRFTIME  20
-#define PZ_NEGOTIATION_CHARSET  21
-#define PZ_MAX_CONNECTIONS      22
-#define PZ_REUSE_CONNECTIONS    23
-#define PZ_TERMLIST_TERM_FACTOR 24
+#define PZ_ZPROXY        12
+#define PZ_APDULOG       13
+#define PZ_SRU           14
+#define PZ_SRU_VERSION   15
+#define PZ_PQF_PREFIX    16
+#define PZ_SORT          17
+#define PZ_RECORDFILTER	 18
+#define PZ_PQF_STRFTIME  19
+#define PZ_NEGOTIATION_CHARSET  20
+#define PZ_MAX_CONNECTIONS      21
+#define PZ_REUSE_CONNECTIONS    22
+#define PZ_TERMLIST_TERM_FACTOR 23
+#define PZ_TERMLIST_TERM_COUNT  24
 #define PZ_PREFERRED            25
 #define PZ_EXTRA_ARGS           26
 #define PZ_QUERY_SYNTAX         27
-#define PZ_OPTION_RECORDFILTER  28
-#define PZ_FACETMAP             29
-#define PZ_LIMITMAP             30
-#define PZ_MAX_EOF              31
+#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_MAX_EOF              34
 
 struct setting
 {
@@ -62,6 +65,13 @@ struct setting
     struct setting *next;
 };
 
+struct settings
+{
+    // 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,