X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=test%2Ftest_http.cfg;h=df09619789e77ae867b9b618fb08123222449c66;hb=f1200fd1cab4fa57feacd43046997ce2d23edbd5;hp=cc9f1f074f2b5ae1b45fb0b10a12280eef967dd5;hpb=bb76bca1e2b4969ea08cf2f1f57d74cfa31dd026;p=pazpar2-moved-to-github.git

diff --git a/test/test_http.cfg b/test/test_http.cfg
index cc9f1f0..df09619 100644
--- a/test/test_http.cfg
+++ b/test/test_http.cfg
@@ -6,16 +6,22 @@
     <proxy host="localhost"/>
     
     <service>
-      <settings src="z3950_indexdata_com_marc.xml"/>
-      <targetprofiles type="local" src="../zeerex/records/"/>
+      <ccldirective name="and" value="AND"/>
+      <ccldirective name="or" value="OR"/>
+      <ccldirective name="not" value="NOT"/>
+      <rank cluster="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"/>
       <metadata name="id"/>
       <metadata name="lccn" merge="unique"/>
       <metadata name="description" brief="yes" merge="longest" rank="3"/>
@@ -23,21 +29,12 @@
       <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>