X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=etc%2Fpazpar2.cfg.dist;h=81bf883fbe3149b9569a7ea3b5697b7488a84c3f;hb=e042a262dd8af2afd5a46ff6dd9c223f6c8426dc;hp=73c192631bf0b89e3f098e1d99e05e9cf2f02c6a;hpb=6074cd61a0cb2f2879453dac8b5febf7de2c8df5;p=pazpar2-moved-to-github.git

diff --git a/etc/pazpar2.cfg.dist b/etc/pazpar2.cfg.dist
index 73c1926..81bf883 100644
--- a/etc/pazpar2.cfg.dist
+++ b/etc/pazpar2.cfg.dist
@@ -4,7 +4,7 @@
   <server>
     <listen port="9004"/>
     <proxy host="localhost:80"/>
-    <settings src="../etc/settings"/>
+    <settings src="settings/edu.xml"/>
 
     <relevance>
       <icu_chain id="relevance" locale="el">
@@ -31,13 +31,16 @@
     </mergekey>
     
     <service>
+      <timeout session="60" z3950_operation="30" z3950_session="180"/>
+
       <!-- we try to keep same order as in marc21.xsl -->
       <metadata name="id" brief="yes"/>
       <metadata name="lccn" merge="unique"/>
       <metadata name="isbn"/>
       <metadata name="issn"/>
       <metadata name="tech-rep-nr"/>
-      <metadata name="author" brief="yes" termlist="yes" merge="unique" rank="2"/>
+      <metadata name="author" brief="yes" termlist="yes" merge="unique" 
+        rank="2" mergekey="optional"/>
       <metadata name="author-title"/>
       <metadata name="author-date"/>
       <metadata name="corporate-name"/>
@@ -49,13 +52,13 @@
       <metadata name="date" brief="yes" sortkey="numeric" type="year"
 		merge="range" termlist="yes"/>
       <metadata name="title" brief="yes" sortkey="skiparticle"
-		merge="longest" rank="6"/>
+		merge="longest" rank="6" mergekey="required"/>
       <metadata name="title-remainder" brief="yes" merge="longest" rank="5"/>
       <metadata name="title-responsibility" brief="yes" merge="longest"/>
       <metadata name="title-dates" brief="yes" merge="longest"/>
       <metadata name="title-medium" brief="yes" merge="longest"/>
       <metadata name="title-number-section" brief="yes" merge="longest"/>
-      <metadata name="medium" brief="yes" merge="no"/>
+      <metadata name="medium" brief="yes" merge="no" mergekey="optional"/>
       <metadata name="iii-id" brief="yes" merge="no"/>
       <metadata name="edition"/>
       <metadata name="publication-place"/>
@@ -76,11 +79,17 @@
       <metadata name="subject" termlist="yes" rank="0"/>
       <metadata name="snippet" brief="yes" merge="unique"/>
       <metadata name="electronic-url" brief="yes" merge="no"/>
+      <metadata name="electronic-format-type" />
+      <metadata name="electronic-format-instruction" />
+      <metadata name="electronic-url" brief="yes" merge="no"/>
       <metadata name="electronic-text" brief="yes" merge="no"/>
       <metadata name="electronic-note"/>
       <metadata name="citation"/>
       <metadata name="holding"/>
       <metadata name="fulltext"/>
+      <metadata name="locallocation" brief="yes"/>
+      <metadata name="callnumber" brief="yes"/>
+      <metadata name="publicnote" brief="yes"/>
 
       <!-- journals -->
       <metadata name="volume-number"/>