X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=doc%2Fpazpar2_conf.xml;h=fbd39fbd40315ce3382f41b90990677fbe0605fd;hb=48b0084f1cd403282a5cae13c35e2d7eb97ff825;hp=cbad09d6575c7543cd4a529daa5f93f78e2ace7a;hpb=383965c54b667bba902d92d86b9eef4f3fa1810f;p=pazpar2-moved-to-github.git

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index cbad09d..fbd39fb 100644
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -322,6 +322,11 @@
 	     all elements), or 'no' (don't merge; this is the
 	     default);
 	    </para>
+	    <para>
+	     Pazpar 1.6.24 also offers a new value for merge, 'first', which
+	     is like 'all' but only takes all from first database that returns
+	     the particular metadata field.
+	    </para>
 	   </listitem>
 	  </varlistentry>
 	  
@@ -361,6 +366,22 @@
 	  </varlistentry>
 	  
 	  <varlistentry>
+	   <term id="limitcluster">limitcluster</term>
+	   <listitem>
+	    <para>
+	     Allow a limit on merged metadata. The value of this attribute
+	     is the name of actual metadata content to be used for matching
+	     (most often same name as metadata name).
+	    </para>
+	    <note>
+	     <para>
+	      Requires Pazpar2 1.6.23 or later.
+	     </para>
+	    </note>
+	   </listitem>
+	  </varlistentry>
+	  
+	  <varlistentry>
 	   <term id="metadata_limitmap">limitmap</term>
 	   <listitem>
 	    <para>
@@ -661,7 +682,7 @@
 	 <para>
 	  Customization of ranking algorithm was introduced with
 	  Pazpar2 1.6.18. The semantics of some of the fields changed
-	  in versions up to 1.6.21.
+	  in versions up to 1.6.22.
 	 </para>
 	</listitem>
        </varlistentry>
@@ -1474,6 +1495,12 @@
        by a field a metadata field (default is to use the name of the 
        limitmap itself).
       </para>
+      <para>
+       For Pazpar2 version 1.6.23 and later the limitmap may include multiple
+       specifications, separated by <literal>,</literal> (comma).
+       For example:
+       <literal>ccl:title,local:ltitle,rpn:@attr 1=4</literal>.
+      </para>
       <note>
        <para>
 	The limitmap facility is supported for Pazpar2 version 1.6.0.