X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=cc072be7f717f0aed0406927d69267f73eddcf93;hb=646158a86d80e5ef0221ef7d7ce2cfc6ba31eacc;hp=8a1ae0692d246bee058060ad38bc9f848e4b693f;hpb=b94f122f7e74623aa67e1fa1d097f7627c087f5c;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h index 8a1ae06..cc072be 100644 --- a/src/pazpar2_config.h +++ b/src/pazpar2_config.h @@ -47,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 @@ -81,7 +82,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 *icu_chain; + char *facetrule; }; @@ -109,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; @@ -134,7 +134,7 @@ struct conf_server char *proxy_host; int proxy_port; char *myurl; - char *server_settings; + char *settings_fname; char *server_id; pp2_charset_fact_t charsets;