Timeout per-service, obsoletes -T

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

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index ee62aad..6c4b33e 100644 (file)
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -105,7 +105,10 @@ struct conf_service
     char *id;
     char *settings;
     NMEM nmem;
-
+    int session_timeout;
+    int z3950_session_timeout;
+    int z3950_connect_timeout;
+    
     /* duplicated from conf_server */
     pp2_charset_t relevance_pct;
     pp2_charset_t sort_pct;
@@ -120,24 +123,6 @@ struct conf_service * conf_service_create(struct conf_config *config,
                                           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);
@@ -151,7 +136,6 @@ struct conf_server
     char *myurl;
     struct sockaddr_in *proxy_addr;
     int listener_socket;
-
     char *server_settings;
 
     pp2_charset_t relevance_pct;
@@ -169,20 +153,19 @@ struct conf_targetprofiles
     char *src;
 };
 
-struct conf_config *read_config(const char *fname);
+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,
                                      const char *fname);
 
-void config_read_settings(struct conf_config *config,
-                          const char *path_override);
+void config_start_databases(struct conf_config *config);
 
 struct conf_service *locate_service(struct conf_server *server,
                                     const char *service_id);
 
 
 int config_start_listeners(struct conf_config *conf,
-                           const char *listener_override,
-                           const char *proxy_override);
+                           const char *listener_override);
 
 void config_stop_listeners(struct conf_config *conf);