X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=403ec163fab99d0dfc04024ab0f395f0f8ffaeb5;hb=275d917ce676df4f41fa9fe097154fc5528615a2;hp=3f33b5fcc194a21588fec75bf305fe91f64bebd8;hpb=6ff7cb53029747ad6ac60fde903630ea063b5218;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 3f33b5f..403ec16 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -30,7 +30,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 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
 };
@@ -47,7 +46,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
@@ -81,6 +81,7 @@ struct conf_metadata
     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;
 };
 
 
@@ -108,7 +109,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;
@@ -116,13 +116,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_t facet_pct;
+    pp2_charset_fact_t charsets;
+
+    struct service_xslt *xslt_list;
 
     struct database *databases;
-    struct conf_targetprofiles *targetprofiles;
     struct conf_server *server;
 };
 
@@ -137,13 +135,10 @@ 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_t facet_pct;
+    pp2_charset_fact_t charsets;
 
     struct conf_service *service;
     struct conf_server *next;
@@ -153,17 +148,10 @@ struct conf_server
     database_hosts_t database_hosts;
 };
 
-struct conf_targetprofiles
-{
-    enum {
-        Targetprofiles_local
-    } type;
-    char *src;
-};
-
 struct conf_config *config_create(const char *fname, int verbose);
 void config_destroy(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);
@@ -174,7 +162,8 @@ 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);