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

diff --git a/test/test_http.cfg b/test/test_http.cfg
index 04c2154..df09619 100644
--- a/test/test_http.cfg
+++ b/test/test_http.cfg
@@ -1,31 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
-  <!-- $Id: test_http.cfg,v 1.6 2007-09-10 09:10:16 adam Exp $ -->
   <!-- Used by test_http.sh -->
   <server>
     <listen port="9763"/>
     <proxy host="localhost"/>
     
     <service>
+      <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"/>
       
       <metadata name="test-usersetting" brief="yes" setting="postproc"/>
       <metadata name="test" setting="parameter"/>
-      <metadata name="test_usersetting_2" brief="yes"/>
+      <metadata name="test-usersetting-2" brief="yes"/>
+
     </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