Factor out record normalization

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

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 2a3dab9..1fd5d55 100644 (file)
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2008 Index Data
+   Copyright (C) 2006-2009 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_record.h"
 
 #include <yaz/nmem.h>
 #include "charsets.h"
@@ -56,6 +54,12 @@ enum conf_setting_type {
     Metadata_setting_parameter      // Expose value to normalization stylesheets
 };
 
+enum conf_metadata_mergekey {
+    Metadata_mergekey_no,
+    Metadata_mergekey_optional,
+    Metadata_mergekey_required
+};
+
 // 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 +77,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 +89,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 +101,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 +132,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,27 +152,33 @@ 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);
+void config_start_databases(struct conf_config *config);
 
-#ifndef CONFIG_NOEXTERNS
+struct conf_service *locate_service(struct conf_server *server,
+                                    const char *service_id);
 
-extern struct conf_config *config;
+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);
 
-#endif
+int config_start_listeners(struct conf_config *conf,
+                           const char *listener_override);
+
+void config_stop_listeners(struct conf_config *conf);
 
-int read_config(const char *fname);
-xsltStylesheet *conf_load_stylesheet(const char *fname);
+WRBUF conf_get_fname(struct conf_service *service, const char *fname);
 
 #endif
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+