X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=src%2Fpazpar2_config.h;h=42e7c031ba29f1ea5451d43fa66afc107fe29f15;hb=f1200fd1cab4fa57feacd43046997ce2d23edbd5;hp=58eb0e70a3f57eeca574cb41e5906ef39d7e7c9f;hpb=95b9c285afaeea1c58bd1a4d4aeede7c5b8c2881;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 58eb0e7..42e7c03 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <yaz/nmem.h>
 #include <yaz/mutex.h>
+#include <yaz/ccl.h>
 #include "charsets.h"
 #include "http.h"
 #include "database.h"
@@ -73,9 +74,7 @@ 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;
@@ -85,7 +84,6 @@ struct conf_metadata
     char *facetrule;
 
     char *limitmap;  // Should be expanded into service-wide default e.g. pz:limitmap:<name>=value setting
-    char *facetmap;  // Should be expanded into service-wide default e.g. pz:facetmap:<name>=value setting
 };
 
 
@@ -111,13 +109,14 @@ struct conf_service
     int num_sortkeys;
     struct conf_sortkey *sortkeys;
     struct setting_dictionary *dictionary;
-    struct settings *settings;
+    struct settings_array *settings;
     struct conf_service *next;
     char *id;
     NMEM nmem;
     int session_timeout;
     int z3950_session_timeout;
     int z3950_operation_timeout;
+    int rank_cluster;
 
     int ref_count;
     /* duplicated from conf_server */
@@ -125,6 +124,7 @@ struct conf_service
 
     struct service_xslt *xslt_list;
 
+    CCL_bibset ccl_bibset;
     struct database *databases;
     struct conf_server *server;
 };