Introduce Z39.50/SRU operation timeout.

[pazpar2-moved-to-github.git] / src / pazpar2_config.h

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 6c4b33e..1282cd3 100644 (file)
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -90,6 +90,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,
@@ -107,8 +109,9 @@ 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 */
     pp2_charset_t relevance_pct;
     pp2_charset_t sort_pct;
@@ -116,13 +119,9 @@ struct conf_service
 
     struct database *databases;
     struct conf_targetprofiles *targetprofiles;
-    struct conf_config *config;
+    struct conf_server *server;
 };
 
-struct conf_service * conf_service_create(struct conf_config *config,
-                                          int num_metadata, int num_sortkeys,
-                                          const char *service_id);
-
 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);
@@ -143,6 +142,7 @@ struct conf_server
     pp2_charset_t mergekey_pct;
     struct conf_service *service;
     struct conf_server *next;
+    struct conf_config *config;
 };
 
 struct conf_targetprofiles
@@ -155,7 +155,7 @@ 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_config *config,
+xsltStylesheet *conf_load_stylesheet(struct conf_service *service,
                                      const char *fname);
 
 void config_start_databases(struct conf_config *config);
@@ -163,6 +163,10 @@ 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);