X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsettings.h;h=cbba02c116f92848d6bf13b093e45588ef82fe35;hb=078bc8b58798e083754ab59bf1b0031aeb61da24;hp=d211cb6645dc9d2b2983c58a606890cb9b092550;hpb=f5d345051217a4f54a53dac5a7397f5672e305ad;p=pazpar2-moved-to-github.git

diff --git a/src/settings.h b/src/settings.h
index d211cb6..cbba02c 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2009 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,12 +32,26 @@ 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_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_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
 
 struct setting
 {
@@ -48,11 +62,20 @@ 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);
 int settings_num(struct conf_service *service);
-void settings_read(struct conf_service *service, const char *path);
-int settings_offset(struct conf_service *service, const char *name);
-int settings_offset_cprefix(struct conf_service *service, const char *name);
+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));
+void expand_settings_array(struct setting ***set_ar, int *num, int offset,
+                           NMEM nmem);
 
 #endif