X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=ee195b999bd12714a95b94539103375c62851c60;hb=464f19c366e6016b3d18cf1cede3805f922417a8;hp=5eb9c5e3ff5f51c0fc5b4e2ca4f510174ff2f8dc;hpb=164c2d7f655059826a900183fa44e76bb8618303;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 5eb9c5e..ee195b9 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 {
@@ -69,7 +70,7 @@ enum conf_metadata_mergekey {
 // An array of these structure provides a 'map' against which
 // discovered metadata elements are matched. It also governs storage,
 // to minimize number of cycles needed at various tages of processing
-struct conf_metadata 
+struct conf_metadata
 {
     char *name;  // The field name. Output by normalization stylesheet
     int brief;   // Is this element to be returned in the brief format?
@@ -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;
 };
 
 
@@ -116,6 +118,12 @@ struct conf_service
     int session_timeout;
     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 */
@@ -126,6 +134,7 @@ struct conf_service
     CCL_bibset ccl_bibset;
     struct database *databases;
     struct conf_server *server;
+    char *xml_node;
 };
 
 int conf_service_metadata_field_id(struct conf_service *service, const char * name);
@@ -135,7 +144,7 @@ int conf_service_sortkey_field_id(struct conf_service *service, const char * nam
 struct conf_server
 {
     char *host;
-    int port;
+    char *port;
     char *proxy_host;
     int proxy_port;
     char *myurl;