X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=1282cd3c2f887a0a567a12dce5d293b91dd58def;hb=6639c716d02ad6117ae6053ca18160dbb21a404a;hp=233b557215150cfe7abb00bdf463359da68c0f2f;hpb=9267d02c3601122f74bdf3a9d21f30080a4a1a9a;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 233b557..1282cd3 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -56,6 +56,11 @@ enum conf_setting_type {
     Metadata_setting_parameter      // Expose value to normalization stylesheets
 };
 
+enum conf_metadata_mergekey {
+    Metadata_mergekey_no,
+    Metadata_mergekey_yes
+};
+
 // Describes known metadata elements and how they are to be manipulated
 // An array of these structure provides a 'map' against which
 // discovered metadata elements are matched. It also governs storage,
@@ -73,23 +78,11 @@ 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;
 };
 
 
 
-struct conf_metadata * conf_metadata_assign(NMEM nmem, 
-                                            struct conf_metadata * metadata,
-                                            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);
-
-
-
 // Controls sorting
 struct conf_sortkey
 {
@@ -97,12 +90,7 @@ struct conf_sortkey
     enum conf_sortkey_type type;
 };
 
-struct conf_sortkey * conf_sortkey_assign(NMEM nmem, 
-                                            struct conf_sortkey * sortkey,
-                                            const char *name,
-                                            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
@@ -114,37 +102,30 @@ struct conf_service
     struct conf_metadata *metadata;
     int num_sortkeys;
     struct conf_sortkey *sortkeys;
+    struct setting_dictionary *dictionary;
+    struct conf_service *next;
+    char *id;
+    char *settings;
+    NMEM nmem;
+    int session_timeout;
+    int z3950_session_timeout;
+    int z3950_operation_timeout;
 
-};
-
-struct conf_service * conf_service_create(NMEM nmem, 
-                                          int num_metadata, int num_sortkeys);
-
-
-struct conf_metadata* conf_service_add_metadata(NMEM nmem, 
-                                                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);
-
-struct conf_sortkey * conf_service_add_sortkey(NMEM nmem,
-                                               struct conf_service *service,
-                                               int field_id,
-                                               const char *name,
-                                               enum conf_sortkey_type type);
+    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;
+};
 
 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;
@@ -152,14 +133,16 @@ struct conf_server
     char *proxy_host;
     int proxy_port;
     char *myurl;
-    char *settings;
+    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
@@ -170,20 +153,25 @@ struct conf_targetprofiles
     char *src;
 };
 
-struct conf_config
-{
-    struct conf_server *servers;
-    struct conf_targetprofiles *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);
 
-#ifndef CONFIG_NOEXTERNS
+void config_start_databases(struct conf_config *config);
 
-extern struct conf_config *config;
+struct conf_service *locate_service(struct conf_server *server,
+                                    const char *service_id);
 
-#endif
+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);
 
-int read_config(const char *fname);
-xsltStylesheet *conf_load_stylesheet(const char *fname);
+void config_stop_listeners(struct conf_config *conf);
 
 #endif