From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 3 Feb 2014 14:03:34 +0000 (+0100)
Subject: Make test_url.sh test for two-level metadata structure
X-Git-Tag: v1.6.39~7
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=bc60963049582dd7f1c7433ee32d882c1cca4d60;p=pazpar2-moved-to-github.git

Make test_url.sh test for two-level metadata structure
---

diff --git a/test/test_url.cfg b/test/test_url.cfg
index 881ee65..6b36213 100644
--- a/test/test_url.cfg
+++ b/test/test_url.cfg
@@ -35,10 +35,12 @@
       <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" mergekey="optional" />
-      <metadata name="subject" merge="unique" termlist="yes" rank="3"/>
-      <metadata name="id"/>
-      <metadata name="lccn" merge="unique"/>
+      <metadata>
+         <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"/>
+      </metadata>
       <metadata name="description" brief="yes" merge="longest" rank="3"/>
     </service>
     
diff --git a/test/test_url_19.res b/test/test_url_19.res
index b4efe0d..87ef48d 100644
--- a/test/test_url_19.res
+++ b/test/test_url_19.res
@@ -28,9 +28,11 @@
       <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" mergekey="optional"/>
-      <metadata name="subject" merge="unique" termlist="yes" rank="3"/>
-      <metadata name="id"/>
-      <metadata name="lccn" merge="unique"/>
+      <metadata>
+         <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"/>
+      </metadata>
       <metadata name="description" brief="yes" merge="longest" rank="3"/>
     </service>
\ No newline at end of file