X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_http.cfg;h=8cfac4e50f35ed8cbd550bf488be3dd5e713ab05;hb=0bb0ee0e00d750808e228b991c78cb4838bc989d;hp=2ca4acd38763cea2fc16817cef633a805ba0d186;hpb=08198c03e496d2936920e563e93bdf1768ffdf35;p=pazpar2-moved-to-github.git

diff --git a/test/test_http.cfg b/test/test_http.cfg
index 2ca4acd..8cfac4e 100644
--- a/test/test_http.cfg
+++ b/test/test_http.cfg
@@ -6,15 +6,22 @@
     <proxy host="localhost"/>
     
     <service>
-      <settings src="z3950_indexdata_com_marc.xml"/>
+      <ccldirective name="and" value="AND"/>
+      <ccldirective name="or" value="OR"/>
+      <ccldirective name="not" value="NOT"/>
+      <rank cluster="yes" debug="yes"/>
+
+      <include src="z3950_indexdata_com_marc.xml"/>
+
       <metadata name="url" merge="unique"/>
-      <metadata name="title" brief="yes" sortkey="skiparticle" merge="longest" rank="6"/>
+      <metadata name="title" brief="yes" sortkey="skiparticle" merge="longest" rank="6" mergekey="required" />
       <metadata name="title-remainder" brief="yes" merge="longest" rank="5"/>
       <metadata name="isbn"/>
       <metadata name="date" brief="yes" sortkey="numeric" type="year" merge="range"
 		termlist="yes"/>
-      <metadata name="author" brief="yes" termlist="yes" merge="longest" rank="2"/>
-      <metadata name="subject" merge="unique" termlist="yes" rank="3"/>
+      <metadata name="author" brief="yes" termlist="yes" merge="longest"
+                rank="2 au 3" mergekey="optional" /> <!-- rank="2 au 3" -->
+      <metadata name="subject" brief="yes" merge="unique" termlist="yes" rank="3" limitcluster="subject"/>
       <metadata name="id"/>
       <metadata name="lccn" merge="unique"/>
       <metadata name="description" brief="yes" merge="longest" rank="3"/>
@@ -22,24 +29,14 @@
       <metadata name="test-usersetting" brief="yes" setting="postproc"/>
       <metadata name="test" setting="parameter"/>
       <metadata name="test-usersetting-2" brief="yes"/>
-    </service>
 
-    <service id="gils">
-      <settings src="z3950_indexdata_com_gils.xml"/>
-      <metadata name="url" merge="unique"/>
-      <metadata name="title" brief="yes" sortkey="skiparticle" merge="longest" rank="6"/>
-      <metadata name="title-remainder" brief="yes" merge="longest" rank="5"/>
-      <metadata name="isbn"/>
-      <metadata name="date" brief="yes" sortkey="numeric" type="year" merge="range"
-		termlist="yes"/>
-      <metadata name="author" brief="yes" termlist="yes" merge="longest" rank="2"/>
-      <metadata name="subject" merge="unique" termlist="yes" rank="3"/>
-      <metadata name="id"/>
     </service>
 
+    <include src="*_service.xml"/> 
+    <include src="no_such_service.xml"/>
+
   </server>
   
-  <targetprofiles type="local" src="../zeerex/records/"/>
   
 </pazpar2>
 <!-- Keep this comment at the end of the file