X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpazpar2_config.h;h=c20bae6967b8f08157108c085fffc2d2086709b4;hb=95ee4e86170d02d0df7d11203edf56aea59d7187;hp=f3960b27bb15d44b54450886edb19410376c3860;hpb=8961ed761e348e972f00d015284ce75c16b1648c;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index f3960b2..c20bae6 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 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
@@ -41,7 +41,8 @@ enum conf_metadata_merge {
     Metadata_merge_unique,    // Include unique elements in merged block
     Metadata_merge_longest,   // Include the longest (strlen) value
     Metadata_merge_range,     // Store value as a range of lowest-highest
-    Metadata_merge_all        // Just include all elements found
+    Metadata_merge_all,       // Just include all elements found
+    Metadata_merge_first      // All from first target
 };
 
 enum conf_sortkey_type {
@@ -84,6 +85,7 @@ struct conf_metadata
     char *facetrule;
 
     char *limitmap;  // Should be expanded into service-wide default e.g. pz:limitmap:<name>=value setting
+    char *limitcluster;
 };
 
 
@@ -117,6 +119,11 @@ struct conf_service
     int z3950_session_timeout;
     int z3950_operation_timeout;
     int rank_cluster;
+    int rank_debug;
+    double rank_follow;
+    double rank_lead;
+    int rank_length;
+    char *default_sort;
 
     int ref_count;
     /* duplicated from conf_server */