X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=193adcfb15c5d033411ece699f57b420b83f17e0;hb=1a3f3cfb2f6aeb743716924d9081d6dce981b49f;hp=1ae1ee4a00924b88da2e5ec5d67cb85a2ecf8bed;hpb=284649ed257354c2fcb2f2a6c78cf5fd7cf2283d;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 1ae1ee4..193adcf 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2010 Index Data
+   Copyright (C) 2006-2012 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
@@ -26,10 +26,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/mutex.h>
 #include "charsets.h"
 #include "http.h"
+#include "database.h"
+#include "host.h"
 
 enum conf_metadata_type {
     Metadata_type_generic,    // Generic text field
-    Metadata_type_number,     // A number
     Metadata_type_year,        // A number
     Metadata_type_date        // A number
 };
@@ -46,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
@@ -71,15 +73,16 @@ struct conf_metadata
     char *name;  // The field name. Output by normalization stylesheet
     int brief;   // Is this element to be returned in the brief format?
     int termlist;// Is this field to be treated as a termlist for browsing?
-    int rank;    // Rank factor. 0 means don't use this field for ranking, 
-                 // 1 is default
-                 // values >1  give additional significance to a field
+    const char *rank;
     int sortkey_offset; // -1 if it's not a sortkey, otherwise index
                         // into service/record_cluster->sortkey array
     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_mergekey mergekey;
+    char *facetrule;
+
+    char *limitmap;  // Should be expanded into service-wide default e.g. pz:limitmap:<name>=value setting
 };
 
 
@@ -105,9 +108,9 @@ struct conf_service
     int num_sortkeys;
     struct conf_sortkey *sortkeys;
     struct setting_dictionary *dictionary;
+    struct settings_array *settings;
     struct conf_service *next;
     char *id;
-    char *settings;
     NMEM nmem;
     int session_timeout;
     int z3950_session_timeout;
@@ -115,12 +118,11 @@ 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 service_xslt *xslt_list;
 
     struct database *databases;
-    struct conf_targetprofiles *targetprofiles;
     struct conf_server *server;
 };
 
@@ -135,29 +137,23 @@ struct conf_server
     char *proxy_host;
     int proxy_port;
     char *myurl;
-    char *server_settings;
+    char *settings_fname;
     char *server_id;
 
-    pp2_charset_t relevance_pct;
-    pp2_charset_t sort_pct;
-    pp2_charset_t mergekey_pct;
+    pp2_charset_fact_t charsets;
+
     struct conf_service *service;
     struct conf_server *next;
     struct conf_config *config;
     http_server_t http_server;
-};
-
-struct conf_targetprofiles
-{
-    enum {
-        Targetprofiles_local
-    } type;
-    char *src;
+    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);
@@ -168,11 +164,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