X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=9b57167a68ee07405a3cbf45e741ce988c633653;hb=b72c950b16346bc9c653fe9419ee7ce25a4645bd;hp=ddd987b28de6882441796def5f8e51f465811172;hpb=fdf549621a2712e2e7fafd5966bbbf9a5c891adf;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index ddd987b..9b57167 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2009 Index Data
+   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
@@ -20,9 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef PAZPAR2_CONFIG_H
 #define PAZPAR2_CONFIG_H
 
-#include <libxslt/xslt.h>
-#include <libxslt/transform.h>
-#include <libxslt/xsltutils.h>
+#include "normalize_cache.h"
 
 #include <yaz/nmem.h>
 #include "charsets.h"
@@ -58,7 +56,8 @@ enum conf_setting_type {
 
 enum conf_metadata_mergekey {
     Metadata_mergekey_no,
-    Metadata_mergekey_yes
+    Metadata_mergekey_optional,
+    Metadata_mergekey_required
 };
 
 // Describes known metadata elements and how they are to be manipulated
@@ -78,7 +77,7 @@ struct conf_metadata
     enum conf_metadata_type type;
     enum conf_metadata_merge merge;
     enum conf_setting_type setting; // Value is to be taken from session/db settings?
-    enum conf_metadata_type mergekey;
+    enum conf_metadata_mergekey mergekey;
 };
 
 
@@ -109,7 +108,7 @@ struct conf_service
     NMEM nmem;
     int session_timeout;
     int z3950_session_timeout;
-    int z3950_connect_timeout;
+    int z3950_operation_timeout;
 
     int ref_count;
     /* duplicated from conf_server */
@@ -136,6 +135,7 @@ struct conf_server
     struct sockaddr_in *proxy_addr;
     int listener_socket;
     char *server_settings;
+    char *server_id;
 
     pp2_charset_t relevance_pct;
     pp2_charset_t sort_pct;
@@ -155,9 +155,6 @@ struct conf_targetprofiles
 
 struct conf_config *config_create(const char *fname, int verbose);
 void config_destroy(struct conf_config *config);
-xsltStylesheet *conf_load_stylesheet(struct conf_service *service,
-                                     const char *fname);
-
 void config_start_databases(struct conf_config *config);
 
 struct conf_service *locate_service(struct conf_server *server,
@@ -173,6 +170,8 @@ int config_start_listeners(struct conf_config *conf,
 
 void config_stop_listeners(struct conf_config *conf);
 
+WRBUF conf_get_fname(struct conf_service *service, const char *fname);
+
 #endif
 
 /*