X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsettings.h;h=b7ed827ca0a2834bcdf59bfa5a9d3453766300d5;hb=6190e1455b834dcbbd9d6577cc9773f9084c4487;hp=c2699c851b78b5603c83b0707df86befbf0f71d4;hpb=8f0d6c3aed956aa0c9c6af420a9025f1caa6e899;p=pazpar2-moved-to-github.git

diff --git a/src/settings.h b/src/settings.h
index c2699c8..b7ed827 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,7 +1,5 @@
-/* $Id: settings.h,v 1.13 2007-04-11 19:55:57 quinn Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2010 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
@@ -14,10 +12,10 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #ifndef SETTINGS_H
 #define SETTINGS_H
@@ -26,14 +24,29 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define PZ_ELEMENTS       1
 #define PZ_REQUESTSYNTAX  2
 #define PZ_CCLMAP         3
-#define PZ_ENCODING       4
-#define PZ_XSLT           5
-#define PZ_NATIVESYNTAX   6
-#define PZ_AUTHENTICATION 7
-#define PZ_ALLOW          8
-#define PZ_MAXRECS        9
-#define PZ_ID            10
-#define PZ_NAME          11
+#define PZ_XSLT           4
+#define PZ_NATIVESYNTAX   5
+#define PZ_AUTHENTICATION 6
+#define PZ_ALLOW          7
+#define PZ_MAXRECS        8
+#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_SORT   24
+#define PZ_TERMLIST_TERM_COUNT  25
+#define PZ_MAX_EOF              26
 
 struct setting
 {
@@ -44,16 +57,30 @@ struct setting
     struct setting *next;
 };
 
-int settings_num(void);
-void settings_read(const char *path);
-int settings_offset(const char *name);
+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);
+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 resolve_databases(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
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+