Avoid empty content in tmarc.xsl output

diff --git a/etc/tmarc.xsl b/etc/tmarc.xsl
index faaa3ab..ce1b5a0 100644 (file)
--- a/etc/tmarc.xsl
+++ b/etc/tmarc.xsl
@@ -169,34 +169,44 @@
         </pz:metadata>
       </xsl:for-each>
 
-      <pz:metadata type="oclc-number">
-        <xsl:value-of select="$oclc_number" />
-      </pz:metadata>
+      <xsl:if test="string-length($oclc_number) &gt; 0">
+       <pz:metadata type="oclc-number">
+         <xsl:value-of select="$oclc_number" />
+       </pz:metadata>
+      </xsl:if>
 
       <xsl:for-each select="tmarc:d010">
-        <pz:metadata type="lccn">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
+       <xsl:for-each select="tmarc:sa">
+         <pz:metadata type="lccn">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d020">
-        <pz:metadata type="isbn">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
+       <xsl:for-each select="tmarc:sa">
+         <pz:metadata type="isbn">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d022">
-        <pz:metadata type="issn">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
+       <xsl:for-each select="tmarc:sa">
+         <pz:metadata type="issn">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
       </xsl:for-each>
-
+      
       <xsl:for-each select="tmarc:d027">
-        <pz:metadata type="tech-rep-nr">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
+       <xsl:for-each select="tmarc:sa">
+         <pz:metadata type="tech-rep-nr">
+           <xsl:value-of select="tmarc:sa" />
+         </pz:metadata>
+       </xsl:for-each>
       </xsl:for-each>
-
+      
       <xsl:for-each select="tmarc:d035"> 
         <pz:metadata type="system-control-nr">
           <xsl:choose>
@@ -211,48 +221,68 @@
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d100">
-        <pz:metadata type="author">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="author-title">
-          <xsl:value-of select="tmarc:sc" />
-        </pz:metadata>
-        <pz:metadata type="author-date">
-          <xsl:value-of select="tmarc:sd" />
-        </pz:metadata>
+       <xsl:for-each select="tmarc:sa">
+         <pz:metadata type="author">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sc">
+         <pz:metadata type="author-title">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sd">
+         <pz:metadata type="author-date">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d110">
-        <pz:metadata type="corporate-name">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="corporate-location">
-          <xsl:value-of select="tmarc:sc" />
-        </pz:metadata>
-        <pz:metadata type="corporate-date">
-          <xsl:value-of select="tmarc:sd" />
-        </pz:metadata>
+       <xsl:for-each select="tmarc:sa">
+         <pz:metadata type="corporate-name">
+          <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sc">
+         <pz:metadata type="corporate-location">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sd">
+         <pz:metadata type="corporate-date">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
       </xsl:for-each>
-
+      
       <xsl:for-each select="tmarc:d111">
-        <pz:metadata type="meeting-name">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="meeting-location">
-          <xsl:value-of select="tmarc:sc" />
-        </pz:metadata>
-        <pz:metadata type="meeting-date">
-          <xsl:value-of select="tmarc:sd" />
-        </pz:metadata>
+       <xsl:for-each select="tmarc:sa">
+         <pz:metadata type="meeting-name">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sc">
+         <pz:metadata type="meeting-location">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sd">
+         <pz:metadata type="meeting-date">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d260">
-        <pz:metadata type="date">
-          <xsl:value-of select="translate(tmarc:sc, 'cp[].', '')" />
-        </pz:metadata>
+       <xsl:for-each select="tmarc:sc">
+         <pz:metadata type="date">
+           <xsl:value-of select="translate(., 'cp[].', '')" />
+         </pz:metadata>
+       </xsl:for-each>
       </xsl:for-each>
 
-      <xsl:if test="$date_008 and not(tmarc:d260)">
+      <xsl:if test="string-length($date_008) &gt; 0 and not(tmarc:d260)">
         <pz:metadata type="date">
           <xsl:choose>
             <xsl:when test="$date_end_008">
@@ -265,96 +295,143 @@
         </pz:metadata>
       </xsl:if>
 
-
       <xsl:for-each select="tmarc:d130">
-        <pz:metadata type="title-uniform">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="title-uniform-media">
-          <xsl:value-of select="tmarc:sm" />
-        </pz:metadata>
-        <pz:metadata type="title-uniform-parts">
-          <xsl:value-of select="tmarc:sn" />
-        </pz:metadata>
-        <pz:metadata type="title-uniform-partname">
-          <xsl:value-of select="tmarc:sp" />
-        </pz:metadata>
-        <pz:metadata type="title-uniform-key">
-          <xsl:value-of select="tmarc:sr" />
-        </pz:metadata>
+       <xsl:for-each select="tmarc:sa">
+         <pz:metadata type="title-uniform">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sm">
+         <pz:metadata type="title-uniform-media">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sn">
+         <pz:metadata type="title-uniform-parts">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sp">
+         <pz:metadata type="title-uniform-partname">
+           <xsl:value-of select="." />     
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sr">
+         <pz:metadata type="title-uniform-key">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
       </xsl:for-each>
-
+      
       <xsl:for-each select="tmarc:d245">
-        <pz:metadata type="title">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="title-remainder">
-          <xsl:value-of select="tmarc:sb" />
-        </pz:metadata>
-        <pz:metadata type="title-responsibility">
-          <xsl:value-of select="tmarc:sc" />
-        </pz:metadata>
-        <pz:metadata type="title-dates">
-          <xsl:value-of select="tmarc:sf" />
-        </pz:metadata>
-        <pz:metadata type="title-medium">
-          <xsl:value-of select="tmarc:sh" />
-        </pz:metadata>
-        <pz:metadata type="title-number-section">
-          <xsl:value-of select="tmarc:sn" />
-        </pz:metadata>
-        <pz:metadata type="title-complete">
-          <xsl:value-of select="tmarc:sa" />
-          <xsl:if test="tmarc:sb" ><xsl:value-of select="concat(' ', tmarc:sb)" /></xsl:if>
-        </pz:metadata>
+       <xsl:for-each select="tmarc:sa">
+         <pz:metadata type="title">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sb">
+         <pz:metadata type="title-remainder">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sc">
+         <pz:metadata type="title-responsibility">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sf">
+         <pz:metadata type="title-dates">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sh">
+         <pz:metadata type="title-medium">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sn">
+         <pz:metadata type="title-number-section">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:if test="tmarc:sa">
+         <pz:metadata type="title-complete">
+           <xsl:value-of select="tmarc:sa" />
+           <xsl:if test="tmarc:sb" ><xsl:value-of select="concat(' ', tmarc:sb)" /></xsl:if>
+         </pz:metadata>
+       </xsl:if>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d250">
-        <pz:metadata type="edition">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
+       <xsl:for-each select="tmarc:sa">
+         <pz:metadata type="edition">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d260">
-        <pz:metadata type="publication-place">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="publication-name">
-          <xsl:value-of select="tmarc:sb" />
-        </pz:metadata>
-        <pz:metadata type="publication-date">
-          <xsl:value-of select="tmarc:sc" />
-        </pz:metadata>
+       <xsl:for-each select="tmarc:sa">
+         <pz:metadata type="publication-place">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sb">
+         <pz:metadata type="publication-name">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sc">
+         <pz:metadata type="publication-date">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d300">
-        <pz:metadata type="physical-extent">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
-        <pz:metadata type="physical-format">
-          <xsl:value-of select="tmarc:sb" />
-        </pz:metadata>
-        <pz:metadata type="physical-dimensions">
-          <xsl:value-of select="tmarc:sc" />
-        </pz:metadata>
-        <pz:metadata type="physical-accomp">
-          <xsl:value-of select="tmarc:se" />
-        </pz:metadata>
-        <pz:metadata type="physical-unittype">
-          <xsl:value-of select="tmarc:sf" />
-        </pz:metadata>
-        <pz:metadata type="physical-unitsize">
-          <xsl:value-of select="tmarc:sg" />
-        </pz:metadata>
-        <pz:metadata type="physical-specified">
-          <xsl:value-of select="tmarc:s3" />
-        </pz:metadata>
+       <xsl:for-each select="tmarc:sa">
+         <pz:metadata type="physical-extent">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sb">
+         <pz:metadata type="physical-format">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sc">
+         <pz:metadata type="physical-dimensions">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:se">
+         <pz:metadata type="physical-accomp">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sf">
+         <pz:metadata type="physical-unittype">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sg">
+         <pz:metadata type="physical-unitsize">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:s3">
+         <pz:metadata type="physical-specified">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d440">
-        <pz:metadata type="series-title">
-          <xsl:value-of select="tmarc:sa" />
-        </pz:metadata>
+       <xsl:for-each select="tmarc:sa">
+         <pz:metadata type="series-title">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d500">
@@ -409,10 +486,12 @@
                             tmarc:d648 | tmarc:d650 | tmarc:d651 | tmarc:d653 |
                             tmarc:d654 | tmarc:d655 | tmarc:d656 | tmarc:d657 |
                             tmarc:d658 | tmarc:d662 | tmarc:d69X">
-         <pz:metadata type="subject">
-           <xsl:value-of select="tmarc:sa"/>
-         </pz:metadata>
-         <pz:metadata type="subject-long">
+       <xsl:for-each select="tmarc:sa">
+         <pz:metadata type="subject">
+           <xsl:value-of select="."/>
+         </pz:metadata>
+       </xsl:for-each>
+       <pz:metadata type="subject-long">
            <xsl:for-each select="node()/text()">
              <xsl:if test="position() &gt; 1">
                <xsl:text>, </xsl:text>
@@ -433,32 +512,40 @@
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d856">
-        <pz:metadata type="electronic-url">
-          <xsl:value-of select="tmarc:su" />
-        </pz:metadata>
+       <xsl:for-each select="tmarc:su">
+         <pz:metadata type="electronic-url">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
         <pz:metadata type="electronic-text">
-         <xsl:choose>
-             <xsl:when test="tmarc:sy">
-                  <xsl:value-of select="tmarc:sy/text()" />
-             </xsl:when>
-             <xsl:when test="tmarc:s3">
-                  <xsl:value-of select="tmarc:s3/text()" />
-             </xsl:when>
-             <xsl:when test="tmarc:sa">
-                  <xsl:value-of select="tmarc:sa/text()" />
-             </xsl:when>
-             <xsl:otherwise>Get resource</xsl:otherwise>
-            </xsl:choose>
-        </pz:metadata>
-        <pz:metadata type="electronic-note">
-          <xsl:value-of select="tmarc:sz" />
-        </pz:metadata>
-        <pz:metadata type="electronic-format-instruction">
-          <xsl:value-of select="tmarc:si" />
-        </pz:metadata>
-        <pz:metadata type="electronic-format-type">
-          <xsl:value-of select="tmarc:sq" />
+         <xsl:choose>
+           <xsl:when test="tmarc:sy">
+             <xsl:value-of select="tmarc:sy/text()" />
+           </xsl:when>
+           <xsl:when test="tmarc:s3">
+             <xsl:value-of select="tmarc:s3/text()" />
+           </xsl:when>
+           <xsl:when test="tmarc:sa">
+             <xsl:value-of select="tmarc:sa/text()" />
+           </xsl:when>
+           <xsl:otherwise>Get resource</xsl:otherwise>
+         </xsl:choose>
         </pz:metadata>
+       <xsl:for-each select="tmarc:sz">
+         <pz:metadata type="electronic-note">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:si">
+         <pz:metadata type="electronic-format-instruction">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
+       <xsl:for-each select="tmarc:sq">
+         <pz:metadata type="electronic-format-type">
+           <xsl:value-of select="." />
+         </pz:metadata>
+       </xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d773">
@@ -468,11 +555,11 @@
             <xsl:text> </xsl:text>
           </xsl:for-each>
         </pz:metadata>
-        <xsl:if test="tmarc:st">
+        <xsl:for-each select="tmarc:st">
           <pz:metadata type="journal-title">
-            <xsl:value-of select="tmarc:st"/>
+            <xsl:value-of select="."/>
           </pz:metadata>
-        </xsl:if>
+        </xsl:for-each>
         <xsl:if test="tmarc:sg">
          <xsl:variable name="value">
             <xsl:for-each select="tmarc:sg">
@@ -543,16 +630,16 @@
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d852">
-        <xsl:if test="tmarc:sy">
+        <xsl:for-each select="tmarc:sy">
           <pz:metadata type="publicnote">
-            <xsl:value-of select="tmarc:sy" />
+            <xsl:value-of select="." />
           </pz:metadata>
-        </xsl:if>
-        <xsl:if test="tmarc:sh">
+        </xsl:for-each>
+        <xsl:for-each select="tmarc:sh">
           <pz:metadata type="callnumber">
-            <xsl:value-of select="tmarc:sh" />
+            <xsl:value-of select="." />
           </pz:metadata>
-        </xsl:if>
+        </xsl:for-each>
       </xsl:for-each>
 
       <xsl:for-each select="tmarc:d876">

diff --git a/test/tmarc1.res.xml b/test/tmarc1.res.xml
index a50090a..d5c2397 100644 (file)
--- a/test/tmarc1.res.xml
+++ b/test/tmarc1.res.xml
@@ -1,29 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <collection xmlns="http://www.indexdata.com/turbomarc" xmlns:pz="http://www.indexdata.com/pazpar2/1.0" xmlns:tmarc="http://www.indexdata.com/turbomarc">
   <pz:record>
-    <pz:metadata type="oclc-number"/>
     <pz:metadata type="author">Sloman</pz:metadata>
-    <pz:metadata type="author-title"/>
-    <pz:metadata type="author-date"/>
     <pz:metadata type="date">2002</pz:metadata>
     <pz:metadata type="title">On the road with Bob Dylan</pz:metadata>
-    <pz:metadata type="title-remainder"/>
-    <pz:metadata type="title-responsibility"/>
-    <pz:metadata type="title-dates"/>
-    <pz:metadata type="title-medium"/>
-    <pz:metadata type="title-number-section"/>
     <pz:metadata type="title-complete">On the road with Bob Dylan</pz:metadata>
     <pz:metadata type="edition">Revised edition</pz:metadata>
     <pz:metadata type="publication-place">New York</pz:metadata>
     <pz:metadata type="publication-name">Three Rivers Press</pz:metadata>
     <pz:metadata type="publication-date">2002</pz:metadata>
     <pz:metadata type="physical-extent">xv, 464 sider, tavler</pz:metadata>
-    <pz:metadata type="physical-format"/>
-    <pz:metadata type="physical-dimensions"/>
-    <pz:metadata type="physical-accomp"/>
-    <pz:metadata type="physical-unittype"/>
-    <pz:metadata type="physical-unitsize"/>
-    <pz:metadata type="physical-specified"/>
     <pz:metadata type="description">Tidligere: 1. udgave. New York, Bantam, 1978</pz:metadata>
     <pz:metadata type="medium">book</pz:metadata>
     <pz:metadata type="has-fulltext">no</pz:metadata>

diff --git a/test/tmarc2.res.xml b/test/tmarc2.res.xml
index b690083..bce5221 100644 (file)
--- a/test/tmarc2.res.xml
+++ b/test/tmarc2.res.xml
@@ -1,28 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <collection xmlns="http://www.indexdata.com/turbomarc" xmlns:pz="http://www.indexdata.com/pazpar2/1.0" xmlns:tmarc="http://www.indexdata.com/turbomarc">
   <pz:record>
-    <pz:metadata type="oclc-number"/>
     <pz:metadata type="author">Mimms</pz:metadata>
-    <pz:metadata type="author-title"/>
-    <pz:metadata type="author-date"/>
     <pz:metadata type="date">1995</pz:metadata>
     <pz:metadata type="title">Cry baby</pz:metadata>
-    <pz:metadata type="title-remainder"/>
-    <pz:metadata type="title-responsibility"/>
-    <pz:metadata type="title-dates"/>
-    <pz:metadata type="title-medium"/>
-    <pz:metadata type="title-number-section"/>
+    <pz:metadata type="title">Warm and soulful</pz:metadata>
     <pz:metadata type="title-complete">Cry baby</pz:metadata>
     <pz:metadata type="publication-place">Bury St. Edmunds</pz:metadata>
     <pz:metadata type="publication-name">BGO</pz:metadata>
     <pz:metadata type="publication-date">1995</pz:metadata>
-    <pz:metadata type="physical-extent"/>
-    <pz:metadata type="physical-format"/>
-    <pz:metadata type="physical-dimensions"/>
-    <pz:metadata type="physical-accomp"/>
-    <pz:metadata type="physical-unittype"/>
-    <pz:metadata type="physical-unitsize"/>
-    <pz:metadata type="physical-specified"/>
     <pz:metadata type="medium">book</pz:metadata>
     <pz:metadata type="has-fulltext">no</pz:metadata>
   </pz:record>

diff --git a/test/tmarc3.res.xml b/test/tmarc3.res.xml
index cf6766d..ddd115f 100644 (file)
--- a/test/tmarc3.res.xml
+++ b/test/tmarc3.res.xml
@@ -1,31 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <collection xmlns="http://www.indexdata.com/turbomarc" xmlns:pz="http://www.indexdata.com/pazpar2/1.0" xmlns:tmarc="http://www.indexdata.com/turbomarc">
   <pz:record>
-    <pz:metadata type="oclc-number"/>
-    <pz:metadata type="date">-</pz:metadata>
     <pz:metadata type="title">Byfornyelse ved Ibsen-Ringen</pz:metadata>
-    <pz:metadata type="title-remainder"/>
-    <pz:metadata type="title-responsibility"/>
-    <pz:metadata type="title-dates"/>
-    <pz:metadata type="title-medium"/>
-    <pz:metadata type="title-number-section"/>
     <pz:metadata type="title-complete">Byfornyelse ved Ibsen-Ringen</pz:metadata>
-    <pz:metadata type="physical-extent"/>
     <pz:metadata type="physical-format">farvefoto</pz:metadata>
-    <pz:metadata type="physical-dimensions"/>
-    <pz:metadata type="physical-accomp"/>
-    <pz:metadata type="physical-unittype"/>
-    <pz:metadata type="physical-unitsize"/>
-    <pz:metadata type="physical-specified"/>
-    <pz:metadata type="subject"/>
+    <pz:metadata type="physical-format">plan</pz:metadata>
+    <pz:metadata type="physical-format">snit</pz:metadata>
     <pz:metadata type="subject-long">byfornyelse</pz:metadata>
-    <pz:metadata type="subject"/>
     <pz:metadata type="subject-long">sanering</pz:metadata>
     <pz:metadata type="subject">Telje Torp Aasen Arkitektkontor</pz:metadata>
     <pz:metadata type="subject-long">Telje Torp Aasen Arkitektkontor, Kristian Augustsgate 7B</pz:metadata>
     <pz:metadata type="subject">Eng, Dagfin</pz:metadata>
     <pz:metadata type="subject-long">Eng, Dagfin</pz:metadata>
-    <pz:metadata type="subject"/>
     <pz:metadata type="subject-long">anlund, Tom, Kristian Augustsgate, Pilestredet 19</pz:metadata>
     <pz:metadata type="medium">web</pz:metadata>
     <pz:metadata type="has-fulltext">no</pz:metadata>

diff --git a/test/tmarc4.res.xml b/test/tmarc4.res.xml
index a2ea977..966fc24 100644 (file)
--- a/test/tmarc4.res.xml
+++ b/test/tmarc4.res.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <collection xmlns="http://www.indexdata.com/turbomarc" xmlns:pz="http://www.indexdata.com/pazpar2/1.0" xmlns:tmarc="http://www.indexdata.com/turbomarc">
   <pz:record>
-    <pz:metadata type="oclc-number"/>
-    <pz:metadata type="date">-</pz:metadata>
     <pz:metadata type="medium">other</pz:metadata>
     <pz:metadata type="has-fulltext">no</pz:metadata>
   </pz:record>

diff --git a/test/tmarc5.res.xml b/test/tmarc5.res.xml
index cf68d05..5fa0c5b 100644 (file)
--- a/test/tmarc5.res.xml
+++ b/test/tmarc5.res.xml
@@ -2,29 +2,14 @@
 <collection xmlns="http://www.indexdata.com/turbomarc" xmlns:pz="http://www.indexdata.com/pazpar2/1.0" xmlns:tmarc="http://www.indexdata.com/turbomarc">
   <pz:record>
     <pz:metadata type="id">000277485</pz:metadata>
-    <pz:metadata type="oclc-number"/>
     <pz:metadata type="author">Μαρούδης, Κωνσταντίνος Ιω</pz:metadata>
-    <pz:metadata type="author-title"/>
-    <pz:metadata type="author-date"/>
     <pz:metadata type="date">1894</pz:metadata>
     <pz:metadata type="title">Ελληνικόν κρυπτογραφικόν λεξικόν /</pz:metadata>
-    <pz:metadata type="title-remainder"/>
     <pz:metadata type="title-responsibility">Κωνστ. Ι. Μαρούδης.</pz:metadata>
-    <pz:metadata type="title-dates"/>
-    <pz:metadata type="title-medium"/>
-    <pz:metadata type="title-number-section"/>
     <pz:metadata type="title-complete">Ελληνικόν κρυπτογραφικόν λεξικόν /</pz:metadata>
-    <pz:metadata type="edition"/>
     <pz:metadata type="publication-place">Αθήνα,</pz:metadata>
-    <pz:metadata type="publication-name"/>
     <pz:metadata type="publication-date">1894.</pz:metadata>
     <pz:metadata type="physical-extent">248 σελ.</pz:metadata>
-    <pz:metadata type="physical-format"/>
-    <pz:metadata type="physical-dimensions"/>
-    <pz:metadata type="physical-accomp"/>
-    <pz:metadata type="physical-unittype"/>
-    <pz:metadata type="physical-unitsize"/>
-    <pz:metadata type="physical-specified"/>
     <pz:metadata type="subject">Greek language, Modern</pz:metadata>
     <pz:metadata type="subject-long">Greek language, Modern, Dialects, Dictionaries</pz:metadata>
     <pz:metadata type="subject">Cryptography.</pz:metadata>

diff --git a/test/tmarc6.res.xml b/test/tmarc6.res.xml
index 10d1ca2..5665ab0 100644 (file)
--- a/test/tmarc6.res.xml
+++ b/test/tmarc6.res.xml
@@ -2,29 +2,12 @@
 <collection xmlns="http://www.indexdata.com/turbomarc" xmlns:pz="http://www.indexdata.com/pazpar2/1.0" xmlns:tmarc="http://www.indexdata.com/turbomarc">
   <pz:record>
     <pz:metadata type="id">   11224466 </pz:metadata>
-    <pz:metadata type="oclc-number"/>
     <pz:metadata type="lccn">   11224466 </pz:metadata>
     <pz:metadata type="author">Jack Collins</pz:metadata>
-    <pz:metadata type="author-title"/>
-    <pz:metadata type="author-date"/>
-    <pz:metadata type="date"/>
     <pz:metadata type="title">How to program a computer</pz:metadata>
-    <pz:metadata type="title-remainder"/>
-    <pz:metadata type="title-responsibility"/>
-    <pz:metadata type="title-dates"/>
-    <pz:metadata type="title-medium"/>
-    <pz:metadata type="title-number-section"/>
     <pz:metadata type="title-complete">How to program a computer</pz:metadata>
     <pz:metadata type="publication-place">Penguin</pz:metadata>
-    <pz:metadata type="publication-name"/>
-    <pz:metadata type="publication-date"/>
     <pz:metadata type="physical-extent">p. cm.</pz:metadata>
-    <pz:metadata type="physical-format"/>
-    <pz:metadata type="physical-dimensions"/>
-    <pz:metadata type="physical-accomp"/>
-    <pz:metadata type="physical-unittype"/>
-    <pz:metadata type="physical-unitsize"/>
-    <pz:metadata type="physical-specified"/>
     <pz:metadata type="medium">book</pz:metadata>
     <pz:metadata type="has-fulltext">no</pz:metadata>
   </pz:record>

diff --git a/test/tmarc7.res.xml b/test/tmarc7.res.xml
index 449b87e..dc96c3a 100644 (file)
--- a/test/tmarc7.res.xml
+++ b/test/tmarc7.res.xml
@@ -2,29 +2,18 @@
 <collection xmlns="http://www.indexdata.com/turbomarc" xmlns:pz="http://www.indexdata.com/pazpar2/1.0" xmlns:tmarc="http://www.indexdata.com/turbomarc">
   <pz:record>
     <pz:metadata type="id">   77123332 </pz:metadata>
-    <pz:metadata type="oclc-number"/>
     <pz:metadata type="lccn">   77123332 </pz:metadata>
     <pz:metadata type="system-control-nr">57779</pz:metadata>
     <pz:metadata type="system-control-nr">90490</pz:metadata>
     <pz:metadata type="system-control-nr">93202</pz:metadata>
     <pz:metadata type="date">2001</pz:metadata>
     <pz:metadata type="title">Voyager Diacritic test -- New input 001 (SBIE).</pz:metadata>
-    <pz:metadata type="title-remainder"/>
-    <pz:metadata type="title-responsibility"/>
-    <pz:metadata type="title-dates"/>
-    <pz:metadata type="title-medium"/>
-    <pz:metadata type="title-number-section"/>
     <pz:metadata type="title-complete">Voyager Diacritic test -- New input 001 (SBIE).</pz:metadata>
     <pz:metadata type="publication-place">ny :</pz:metadata>
     <pz:metadata type="publication-name">ny,</pz:metadata>
     <pz:metadata type="publication-date">2001.</pz:metadata>
     <pz:metadata type="physical-extent">100 p. ;</pz:metadata>
-    <pz:metadata type="physical-format"/>
     <pz:metadata type="physical-dimensions">12 cm.</pz:metadata>
-    <pz:metadata type="physical-accomp"/>
-    <pz:metadata type="physical-unittype"/>
-    <pz:metadata type="physical-unitsize"/>
-    <pz:metadata type="physical-specified"/>
     <pz:metadata type="description">New copy imported from file (8/12/99).</pz:metadata>
     <pz:metadata type="description">VOYAGER COLUMN 0  (NEW):  Degree sign (°);  Phono Copyright mark (℗);  Copyright mark (©);  Sharp (♯);  Inverted Question mark (¿);  Inverted Exclamation mark (¡).</pz:metadata>
     <pz:metadata type="description">VOYAGER COLUMN 1:  Script L (ℓ);  Polish L (Ł);  Scandanavian O (Ø);  D with Crossbar (Đ);  Icelandic Thorn (Þ);  AE Digraph (Æ); OE Digraph (Œ);  Miagkii Znak (ʹ);  Dot at Midline (·).</pz:metadata>

diff --git a/test/tmarc8.res.xml b/test/tmarc8.res.xml
index 0ea5e4e..609ae7b 100644 (file)
--- a/test/tmarc8.res.xml
+++ b/test/tmarc8.res.xml
@@ -2,29 +2,17 @@
 <collection xmlns="http://www.indexdata.com/turbomarc" xmlns:pz="http://www.indexdata.com/pazpar2/1.0" xmlns:tmarc="http://www.indexdata.com/turbomarc">
   <pz:record>
     <pz:metadata type="id">UCD-002592301</pz:metadata>
-    <pz:metadata type="oclc-number"/>
     <pz:metadata type="system-control-nr">99851339eo</pz:metadata>
     <pz:metadata type="author">Clinton, Atkinson.</pz:metadata>
-    <pz:metadata type="author-title"/>
-    <pz:metadata type="author-date"/>
     <pz:metadata type="date">1583?</pz:metadata>
     <pz:metadata type="title">Clinton, Purser &amp; Arnold, to their countreymen wheresoeuer</pz:metadata>
     <pz:metadata type="title-remainder">Wherein is described by their own hands their vnfeigned penitence for their offences past: their patience in welcoming their death, &amp; their duetiful minds towardes her most excellent Maiestie</pz:metadata>
-    <pz:metadata type="title-responsibility"/>
-    <pz:metadata type="title-dates"/>
     <pz:metadata type="title-medium">[electronic resource] :</pz:metadata>
-    <pz:metadata type="title-number-section"/>
     <pz:metadata type="title-complete">Clinton, Purser &amp; Arnold, to their countreymen wheresoeuer Wherein is described by their own hands their vnfeigned penitence for their offences past: their patience in welcoming their death, &amp; their duetiful minds towardes her most excellent Maiestie</pz:metadata>
     <pz:metadata type="publication-place">London :</pz:metadata>
     <pz:metadata type="publication-name">Imprinted by Iohn Wolfe and are to be sold [by W. Wright] at the middle shop in the Poultry, ioyning S. Mildreds Church,</pz:metadata>
     <pz:metadata type="publication-date">[1583?]</pz:metadata>
     <pz:metadata type="physical-extent">[12] p</pz:metadata>
-    <pz:metadata type="physical-format"/>
-    <pz:metadata type="physical-dimensions"/>
-    <pz:metadata type="physical-accomp"/>
-    <pz:metadata type="physical-unittype"/>
-    <pz:metadata type="physical-unitsize"/>
-    <pz:metadata type="physical-specified"/>
     <pz:metadata type="description">In verse</pz:metadata>
     <pz:metadata type="description">The first poem is signed: Thomas Walton alias Purser</pz:metadata>
     <pz:metadata type="description">Clinton's full name and bookseller's name from, and publication date conjectured by, STC</pz:metadata>
@@ -37,23 +25,15 @@
     <pz:metadata type="electronic-url">http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&amp;res_id=xri:eebo&amp;rft_val_fmt=&amp;rft_id=xri:eebo:image:16610</pz:metadata>
     <pz:metadata type="electronic-text">Get resource</pz:metadata>
     <pz:metadata type="electronic-note">Restricted to UC campuses</pz:metadata>
-    <pz:metadata type="electronic-format-instruction"/>
-    <pz:metadata type="electronic-format-type"/>
     <pz:metadata type="electronic-url">http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&amp;res_id=xri:eebo&amp;rft_val_fmt=&amp;rft_id=xri:eebo:image:16610</pz:metadata>
     <pz:metadata type="electronic-text">Get resource</pz:metadata>
     <pz:metadata type="electronic-note">Restricted to UC campuses</pz:metadata>
-    <pz:metadata type="electronic-format-instruction"/>
-    <pz:metadata type="electronic-format-type"/>
     <pz:metadata type="electronic-url">http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&amp;res_id=xri:eebo&amp;rft_val_fmt=&amp;rft_id=xri:eebo:image:16610</pz:metadata>
     <pz:metadata type="electronic-text">Get resource</pz:metadata>
     <pz:metadata type="electronic-note">Restricted to UC campuses</pz:metadata>
-    <pz:metadata type="electronic-format-instruction"/>
-    <pz:metadata type="electronic-format-type"/>
     <pz:metadata type="electronic-url">http://gateway.proquest.com/openurl?ctx_ver=Z39.88-2003&amp;res_id=xri:eebo&amp;rft_val_fmt=&amp;rft_id=xri:eebo:image:16610</pz:metadata>
     <pz:metadata type="electronic-text">Get resource</pz:metadata>
     <pz:metadata type="electronic-note">Restricted to UC campuses</pz:metadata>
-    <pz:metadata type="electronic-format-instruction"/>
-    <pz:metadata type="electronic-format-type"/>
     <pz:metadata type="callnumber">Internet</pz:metadata>
     <pz:metadata type="medium">book (electronic)</pz:metadata>
     <pz:metadata type="has-fulltext">no</pz:metadata>

diff --git a/test/tmarc9.res.xml b/test/tmarc9.res.xml
index 305b1b1..e545673 100644 (file)
--- a/test/tmarc9.res.xml
+++ b/test/tmarc9.res.xml
@@ -9,9 +9,6 @@
     <pz:metadata type="title">Qaḍāʼ al-usrah :</pz:metadata>
     <pz:metadata type="title-remainder">majallah mutakhaṣṣiṣah /</pz:metadata>
     <pz:metadata type="title-responsibility">Wizārat al-ʻAdl.</pz:metadata>
-    <pz:metadata type="title-dates"/>
-    <pz:metadata type="title-medium"/>
-    <pz:metadata type="title-number-section"/>
     <pz:metadata type="title-complete">Qaḍāʼ al-usrah : majallah mutakhaṣṣiṣah /</pz:metadata>
     <pz:metadata type="publication-place">al-Rabāṭ :</pz:metadata>
     <pz:metadata type="publication-name">Jamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah,</pz:metadata>
@@ -19,10 +16,6 @@
     <pz:metadata type="physical-extent">v. :</pz:metadata>
     <pz:metadata type="physical-format">ill. ;</pz:metadata>
     <pz:metadata type="physical-dimensions">24 cm.</pz:metadata>
-    <pz:metadata type="physical-accomp"/>
-    <pz:metadata type="physical-unittype"/>
-    <pz:metadata type="physical-unitsize"/>
-    <pz:metadata type="physical-specified"/>
     <pz:metadata type="description">Some issues have also a distinctive title.</pz:metadata>
     <pz:metadata type="description">Latest issue consulted: al-ʻAdad 3. (Dujanbir 2006).</pz:metadata>
     <pz:metadata type="subject">Domestic relations (Islamic law)</pz:metadata>