X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=doc%2Fpazpar2_conf.xml;h=6dca6102efc16dac11f792b71e2decbd42790831;hb=b2807317725db68d786503711be67ecf163115b7;hp=c2d22273e3c4764b4fedae32a89ab71e4ec1980b;hpb=73b18f5211143781fdbd9dde8582a29905c85b33;p=pazpar2-moved-to-github.git

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index c2d2227..6dca610 100644
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -265,9 +265,22 @@
 	  <varlistentry><term>mergekey</term>
 	   <listitem>
 	    <para>
-	     If set to <literal>yes</literal>, the value of this
-	     metadata element is appended to the resulting mergekey.
-	     By default metadata is not part of a mergekey.
+	     If set to '<literal>required</literal>', the value of this
+	     metadata element is appended to the resulting mergekey if
+	     the metadata is present in a record instance.
+	     If the metadata element is not present, the a unique mergekey
+	     will be generated instead.
+	    </para>
+	    <para>
+	     If set to '<literal>optional</literal>', the value of this
+	     metadata element is appended to the resulting mergekey if the
+	     the metadata is present in a record instance. If the metadata
+	     is not present, it will be empty.
+	    </para>
+	    <para>
+	     If set to '<literal>no</literal>' or the mergekey attribute is
+	     omitted, the metadata will not be used in the creation of a
+	     mergekey.
 	    </para>
 	   </listitem>
 	  </varlistentry>
@@ -393,6 +406,30 @@
 	</listitem>
        </varlistentry>
 
+       <varlistentry>
+	<term>timeout</term>
+	<listitem>
+	 <para>
+	  Specifies timeout parameters for this service.
+	  The <literal>timeout</literal>
+	  element supports the following attributes: 
+	  <literal>session</literal>, <literal>z3950_operation</literal>,
+	  <literal>z3950_session</literal> which specifies
+	  'session timeout', 'Z39.50 operation timeout',
+	  'Z39.50 session timeout' respectively. The Z39.50 operation
+	  timeout is the time Pazpar2 will wait for an active Z39.50/SRU
+	  operation before it gives up (times out). The Z39.50 session
+	  time out is the time Pazpar2 will keep the session alive for
+	  an idle session (no operation).
+	 </para>
+	 <para>
+	  The following is recommended but not required:
+	  z3950_operation (30) &lt; session (60) &lt; z3950_session (180) .
+	  The default values are given in parantheses.
+	 </para>
+	</listitem>
+       </varlistentry>
+
       </variablelist>     <!-- Data elements in service directive -->
      </listitem>
     </varlistentry>
@@ -429,6 +466,7 @@
              </icu_chain>
            </relevance>
            <settings src="mysettings"/>
+           <timeout session="60"/>
         <service>
      </server>
    </pazpar2>
@@ -809,6 +847,20 @@
        Provides the path of an XSLT stylesheet which will be used to
        map incoming records to the internal representation.
       </para>
+      <para>
+       When mapping MARC XML records, XSLT can be bypassed for increased 
+       performance with the alternate "MARC map" format.  Provide the
+       path of a file with extension ".mmap" containing on each line:
+       <programlisting>
+        &lt;field&gt; &lt;subfield&gt; &lt;metadata element&gt;</programlisting>
+       For example:
+       <programlisting>
+        245 a title
+        500 $ description
+        773 * citation</programlisting>
+       To map the field value specify a subfield of '$'.  To store a 
+       concatenation of all subfields, specify a subfield of '*'.
+      </para>
      </listitem>
     </varlistentry>
     <varlistentry>