X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=acaba3443949c741b46b6e4ad10916bc18e4c22f;hb=ed45a02021c7c5b380aa74acb49b01bdeb974d6e;hp=31186315d37c988d1ec7be9a323997fcf63f6a7f;hpb=de634461a0500801cd71d6a42aff032fa083a127;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 3118631..acaba34 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -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
@@ -90,6 +89,8 @@ struct conf_sortkey
     enum conf_sortkey_type type;
 };
 
+struct conf_server;
+
 // It is conceivable that there will eventually be several 'services'
 // offered from one server, with separate configuration -- possibly
 // more than one services associated with the same port. For now,
@@ -105,42 +106,25 @@ struct conf_service
     char *id;
     char *settings;
     NMEM nmem;
+    int session_timeout;
+    int z3950_session_timeout;
+    int z3950_operation_timeout;
 
+    int ref_count;
     /* duplicated from conf_server */
     pp2_charset_t relevance_pct;
     pp2_charset_t sort_pct;
     pp2_charset_t mergekey_pct;
 
-
     struct database *databases;
+    struct conf_targetprofiles *targetprofiles;
+    struct conf_server *server;
 };
 
-struct conf_service * conf_service_create(int num_metadata, int num_sortkeys,
-    const char *service_id);
-
-struct conf_metadata* conf_service_add_metadata(struct conf_service *service,
-                                                int field_id,
-                                                const char *name,
-                                                enum conf_metadata_type type,
-                                                enum conf_metadata_merge merge,
-                                                enum conf_setting_type setting,
-                                                int brief,
-                                                int termlist,
-                                                int rank,
-                                                int sortkey_offset,
-                                                enum conf_metadata_mergekey mt);
-
-struct conf_sortkey * conf_service_add_sortkey(struct conf_service *service,
-                                               int field_id,
-                                               const char *name,
-                                               enum conf_sortkey_type type);
-
-
 int conf_service_metadata_field_id(struct conf_service *service, const char * name);
 
 int conf_service_sortkey_field_id(struct conf_service *service, const char * name);
 
-
 struct conf_server
 {
     char *host;
@@ -148,14 +132,16 @@ struct conf_server
     char *proxy_host;
     int proxy_port;
     char *myurl;
+    struct sockaddr_in *proxy_addr;
+    int listener_socket;
     char *server_settings;
 
     pp2_charset_t relevance_pct;
     pp2_charset_t sort_pct;
     pp2_charset_t mergekey_pct;
-
     struct conf_service *service;
     struct conf_server *next;
+    struct conf_config *config;
 };
 
 struct conf_targetprofiles
@@ -166,22 +152,24 @@ struct conf_targetprofiles
     char *src;
 };
 
-struct conf_config
-{
-    NMEM nmem;
-    struct conf_server *servers;
-    struct conf_targetprofiles *targetprofiles;
-};
-
-struct conf_config *read_config(const char *fname);
-xsltStylesheet *conf_load_stylesheet(const char *fname);
-
-void config_read_settings(struct conf_config *config,
-                          const char *path_override);
+struct conf_config *config_create(const char *fname, int verbose);
+void config_destroy(struct conf_config *config);
+void config_start_databases(struct conf_config *config);
 
 struct conf_service *locate_service(struct conf_server *server,
                                     const char *service_id);
 
+struct conf_service *service_create(struct conf_server *server,
+                                    xmlNode *node);
+void service_incref(struct conf_service *service);
+void service_destroy(struct conf_service *service);
+
+int config_start_listeners(struct conf_config *conf,
+                           const char *listener_override);
+
+void config_stop_listeners(struct conf_config *conf);
+
+WRBUF conf_get_fname(struct conf_service *service, const char *fname);
 
 #endif