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

diff --git a/test/test_http.cfg b/test/test_http.cfg
index 2ca4acd..77c902f 100644
--- a/test/test_http.cfg
+++ b/test/test_http.cfg
@@ -6,14 +6,14 @@
     <proxy host="localhost"/>
     
     <service>
-      <settings src="z3950_indexdata_com_marc.xml"/>
+      <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="author" brief="yes" termlist="yes" merge="longest" rank="2" mergekey="optional" />
       <metadata name="subject" merge="unique" termlist="yes" rank="3"/>
       <metadata name="id"/>
       <metadata name="lccn" merge="unique"/>
@@ -24,22 +24,11 @@
       <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