X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsettings.h;h=623a47790bc9ae026cf9e86f2fdc1750fa31c527;hb=7ab0676c686a45df10325dc96ec42e5f3210d9d7;hp=26cec98232b5ffb755b75fdd85bf08889d116638;hpb=2819110732a5e3cdc6de71333977ff39d7cf8bf3;p=pazpar2-moved-to-github.git

diff --git a/src/settings.h b/src/settings.h
index 26cec98..623a477 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -38,6 +38,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define PZ_SRU           15
 #define PZ_SRU_VERSION   16
 #define PZ_PQF_PREFIX    17
+#define PZ_SORT		 18
 
 struct setting
 {
@@ -48,18 +49,24 @@ struct setting
     struct setting *next;
 };
 
-int settings_num(void);
-void settings_read(const char *path);
-int settings_offset(const char *name);
-int settings_offset_cprefix(const char *name);
-void init_settings(void);
+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_offset(struct conf_service *service, const char *name);
+int settings_offset_cprefix(struct conf_service *service, const char *name);
+void init_settings(struct conf_service *service);
+void resolve_databases(struct conf_service *service);
 
 #endif
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+