X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=cc072be7f717f0aed0406927d69267f73eddcf93;hb=646158a86d80e5ef0221ef7d7ce2cfc6ba31eacc;hp=1fd5d55653525f79a8881ca185d4a5ee69a80c83;hpb=3e47667de1ebfaf4f42d2c0b71d4da2650ce7eb8;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 1fd5d55..cc072be 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2009 Index Data
+   Copyright (C) 2006-2011 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,10 +20,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef PAZPAR2_CONFIG_H
 #define PAZPAR2_CONFIG_H
 
-#include "normalize_record.h"
+#include "normalize_cache.h"
 
 #include <yaz/nmem.h>
+#include <yaz/mutex.h>
 #include "charsets.h"
+#include "http.h"
+#include "database.h"
 
 enum conf_metadata_type {
     Metadata_type_generic,    // Generic text field
@@ -44,7 +47,8 @@ enum conf_sortkey_type {
     Metadata_sortkey_relevance,
     Metadata_sortkey_numeric,       // Standard numerical sorting
     Metadata_sortkey_skiparticle,   // Skip leading article when sorting
-    Metadata_sortkey_string         // Flat string
+    Metadata_sortkey_string,        // Flat string
+    Metadata_sortkey_position       // Position
 };
 
 // This controls the ability to insert 'static' values from settings into retrieval recs
@@ -77,7 +81,8 @@ 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;
+    enum conf_metadata_mergekey mergekey;
+    char *facetrule;
 };
 
 
@@ -97,6 +102,7 @@ struct conf_server;
 // however, only a single service is possible.
 struct conf_service
 {
+    YAZ_MUTEX mutex;
     int num_metadata;
     struct conf_metadata *metadata;
     int num_sortkeys;
@@ -104,7 +110,6 @@ struct conf_service
     struct setting_dictionary *dictionary;
     struct conf_service *next;
     char *id;
-    char *settings;
     NMEM nmem;
     int session_timeout;
     int z3950_session_timeout;
@@ -112,12 +117,9 @@ struct conf_service
 
     int ref_count;
     /* duplicated from conf_server */
-    pp2_charset_t relevance_pct;
-    pp2_charset_t sort_pct;
-    pp2_charset_t mergekey_pct;
+    pp2_charset_fact_t charsets;
 
     struct database *databases;
-    struct conf_targetprofiles *targetprofiles;
     struct conf_server *server;
 };
 
@@ -132,29 +134,23 @@ struct conf_server
     char *proxy_host;
     int proxy_port;
     char *myurl;
-    struct sockaddr_in *proxy_addr;
-    int listener_socket;
-    char *server_settings;
+    char *settings_fname;
+    char *server_id;
+
+    pp2_charset_fact_t charsets;
 
-    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
-{
-    enum {
-        Targetprofiles_local
-    } type;
-    char *src;
+    http_server_t http_server;
+    iochan_man_t iochan_man;
+    database_hosts_t database_hosts;
 };
 
 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);
+void config_process_events(struct conf_config *config);
+void info_services(struct conf_server *server, WRBUF w);
 
 struct conf_service *locate_service(struct conf_server *server,
                                     const char *service_id);
@@ -165,11 +161,12 @@ 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);
+                           const char *listener_override,
+                           const char *record_fname);
 
 void config_stop_listeners(struct conf_config *conf);
 
-WRBUF conf_get_fname(struct conf_service *service, const char *fname);
+WRBUF conf_get_fname(struct conf_config *config, const char *fname);
 
 #endif