Better check of marc leader info YAZ-691

Problem is that some systems generate MARCXML/MarcXchange with
funny headers. These will not work if encoded as ISO2709.
Some tests produce new output, due to updated warning messages
about leader content.

diff --git a/src/marcdisp.c b/src/marcdisp.c
index ff4c97e..12ecb38 100644 (file)
--- a/src/marcdisp.c
+++ b/src/marcdisp.c
@@ -371,53 +371,48 @@ void yaz_marc_set_leader(yaz_marc_t mt, const char *leader_c,
     check_ascii(mt, leader, 7, 'a');
     check_ascii(mt, leader, 8, '#');
     check_ascii(mt, leader, 9, '#');
-    if (!atoi_n_check(leader+10, 1, indicator_length))
+    if (!atoi_n_check(leader+10, 1, indicator_length) || *indicator_length == 0)
     {
-        yaz_marc_cprintf(mt,
-                         "Indicator length at offset 10 should hold a digit."
-                         " Assuming 2");
+        yaz_marc_cprintf(mt, "Indicator length at offset 10 should"
+                         " hold a number 1-9. Assuming 2");
         leader[10] = '2';
         *indicator_length = 2;
     }
-    if (!atoi_n_check(leader+11, 1, identifier_length))
+    if (!atoi_n_check(leader+11, 1, identifier_length) || *identifier_length == 0)
     {
-        yaz_marc_cprintf(mt,
-                         "Identifier length at offset 11 should hold a digit."
-                         " Assuming 2");
+        yaz_marc_cprintf(mt, "Identifier length at offset 11 should "
+                         " hold a number 1-9. Assuming 2");
         leader[11] = '2';
         *identifier_length = 2;
     }
     if (!atoi_n_check(leader+12, 5, base_address))
     {
-        yaz_marc_cprintf(mt,
-                         "Base address at offsets 12..16 should hold a number."
-                         " Assuming 0");
+        yaz_marc_cprintf(mt, "Base address at offsets 12..16 should"
+                         " hold a number. Assuming 0");
         *base_address = 0;
     }
     check_ascii(mt, leader, 17, '#');
     check_ascii(mt, leader, 18, '#');
     check_ascii(mt, leader, 19, '#');
-    if (!atoi_n_check(leader+20, 1, length_data_entry))
+    if (!atoi_n_check(leader+20, 1, length_data_entry) ||
+        *length_data_entry < 3)
     {
-        yaz_marc_cprintf(mt,
-                         "Length data entry at offset 20 should hold a digit."
-                         " Assuming 4");
+        yaz_marc_cprintf(mt, "Length data entry at offset 20 should"
+                         " hold a number 3-9. Assuming 4");
         *length_data_entry = 4;
         leader[20] = '4';
     }
-    if (!atoi_n_check(leader+21, 1, length_starting))
+    if (!atoi_n_check(leader+21, 1, length_starting) || *length_starting < 4)
     {
-        yaz_marc_cprintf(mt,
-                         "Length starting at offset 21 should hold a digit."
-                         " Assuming 5");
+        yaz_marc_cprintf(mt, "Length starting at offset 21 should"
+                         " hold a number 4-9. Assuming 5");
         *length_starting = 5;
         leader[21] = '5';
     }
     if (!atoi_n_check(leader+22, 1, length_implementation))
     {
-        yaz_marc_cprintf(mt,
-                         "Length implementation at offset 22 should hold a digit."
-                         " Assuming 0");
+        yaz_marc_cprintf(mt, "Length implementation at offset 22 should"
+                         " hold a number. Assuming 0");
         *length_implementation = 0;
         leader[22] = '0';
     }

diff --git a/test/marc1.xml b/test/marc1.xml
index 3d0cfaf..8d6759b 100644 (file)
--- a/test/marc1.xml
+++ b/test/marc1.xml
@@ -1,6 +1,6 @@
 <collection xmlns="http://www.loc.gov/MARC21/slim">
 <record>
-<!-- Length implementation at offset 22 should hold a digit. Assuming 0 -->
+<!-- Length implementation at offset 22 should hold a number. Assuming 0 -->
   <leader>00988nam0a32003011  450 </leader>
   <datafield tag="001" ind1="0" ind2="0" ind3="0">
     <subfield code="a">9 181 423 4</subfield>

diff --git a/test/marc2.xml b/test/marc2.xml
index b665385..29f87c4 100644 (file)
--- a/test/marc2.xml
+++ b/test/marc2.xml
@@ -1,6 +1,6 @@
 <collection xmlns="http://www.loc.gov/MARC21/slim">
 <record>
-<!-- Length implementation at offset 22 should hold a digit. Assuming 0 -->
+<!-- Length implementation at offset 22 should hold a number. Assuming 0 -->
   <leader>01116nam0a32002171  450 </leader>
   <datafield tag="001" ind1="0" ind2="0" ind3="0">
     <subfield code="a">9 182 502 3</subfield>

diff --git a/test/marc3.xml b/test/marc3.xml
index 2784431..2a22aae 100644 (file)
--- a/test/marc3.xml
+++ b/test/marc3.xml
@@ -1,6 +1,6 @@
 <collection xmlns="http://www.loc.gov/MARC21/slim">
 <record>
-<!-- Length implementation at offset 22 should hold a digit. Assuming 0 -->
+<!-- Length implementation at offset 22 should hold a number. Assuming 0 -->
   <leader>00914naa a2200337   450 </leader>
   <datafield tag="001" ind1=" " ind2=" ">
     <subfield code="a">a00001508</subfield>

diff --git a/test/marc4.xml b/test/marc4.xml
index 331553f..3d96bf5 100644 (file)
--- a/test/marc4.xml
+++ b/test/marc4.xml
@@ -1,9 +1,9 @@
 <collection xmlns="http://www.loc.gov/MARC21/slim">
 <record>
-<!-- Indicator length at offset 10 should hold a digit. Assuming 2 -->
-<!-- Identifier length at offset 11 should hold a digit. Assuming 2 -->
+<!-- Indicator length at offset 10 should hold a number 1-9. Assuming 2 -->
+<!-- Identifier length at offset 11 should  hold a number 1-9. Assuming 2 -->
 <!-- Base address at offsets 12..16 should hold a number. Assuming 0 -->
-<!-- Length implementation at offset 22 should hold a digit. Assuming 0 -->
+<!-- Length implementation at offset 22 should hold a number. Assuming 0 -->
   <leader>009140091a22a  22003370 </leader>
 <!-- Directory offset 24: Bad value for data length and/or length starting ( 45  00100170) -->
 <!-- Base address not at end of directory, base 0, end 25 -->

diff --git a/test/tmarc1.xml b/test/tmarc1.xml
index dab3674..ff98d78 100644 (file)
--- a/test/tmarc1.xml
+++ b/test/tmarc1.xml
@@ -1,6 +1,6 @@
 <collection xmlns="http://www.indexdata.com/turbomarc">
 <r>
-<!-- Length implementation at offset 22 should hold a digit. Assuming 0 -->
+<!-- Length implementation at offset 22 should hold a number. Assuming 0 -->
   <l>00988nam0a32003011  450 </l>
   <d001 i1="0" i2="0" i3="0">
     <sa>9 181 423 4</sa>

diff --git a/test/tmarc2.xml b/test/tmarc2.xml
index 8f28780..69f11ba 100644 (file)
--- a/test/tmarc2.xml
+++ b/test/tmarc2.xml
@@ -1,6 +1,6 @@
 <collection xmlns="http://www.indexdata.com/turbomarc">
 <r>
-<!-- Length implementation at offset 22 should hold a digit. Assuming 0 -->
+<!-- Length implementation at offset 22 should hold a number. Assuming 0 -->
   <l>01116nam0a32002171  450 </l>
   <d001 i1="0" i2="0" i3="0">
     <sa>9 182 502 3</sa>

diff --git a/test/tmarc3.xml b/test/tmarc3.xml
index 84f8bbe..3463449 100644 (file)
--- a/test/tmarc3.xml
+++ b/test/tmarc3.xml
@@ -1,6 +1,6 @@
 <collection xmlns="http://www.indexdata.com/turbomarc">
 <r>
-<!-- Length implementation at offset 22 should hold a digit. Assuming 0 -->
+<!-- Length implementation at offset 22 should hold a number. Assuming 0 -->
   <l>00914naa a2200337   450 </l>
   <d001 i1=" " i2=" ">
     <sa>a00001508</sa>

diff --git a/test/tmarc4.xml b/test/tmarc4.xml
index dadbd7b..49034eb 100644 (file)
--- a/test/tmarc4.xml
+++ b/test/tmarc4.xml
@@ -1,9 +1,9 @@
 <collection xmlns="http://www.indexdata.com/turbomarc">
 <r>
-<!-- Indicator length at offset 10 should hold a digit. Assuming 2 -->
-<!-- Identifier length at offset 11 should hold a digit. Assuming 2 -->
+<!-- Indicator length at offset 10 should hold a number 1-9. Assuming 2 -->
+<!-- Identifier length at offset 11 should  hold a number 1-9. Assuming 2 -->
 <!-- Base address at offsets 12..16 should hold a number. Assuming 0 -->
-<!-- Length implementation at offset 22 should hold a digit. Assuming 0 -->
+<!-- Length implementation at offset 22 should hold a number. Assuming 0 -->
   <l>009140091a22a  22003370 </l>
 <!-- Directory offset 24: Bad value for data length and/or length starting ( 45  00100170) -->
 <!-- Base address not at end of directory, base 0, end 25 -->

diff --git a/test/xml2marc1.xml b/test/xml2marc1.xml
index b355e9f..10abc18 100644 (file)
--- a/test/xml2marc1.xml
+++ b/test/xml2marc1.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<record xmlns="http://www.loc.gov/MARC21/slim"><!--Length implementation at offset 22 should hold a digit. Assuming 0--><leader>00988nam0a32003011  450 </leader><datafield tag="001" ind1="0" ind2="0" ind3="0"><subfield code="a">9 181 423 4</subfield><subfield code="b">710100</subfield><subfield code="f">a</subfield></datafield><datafield tag="004" ind1="0" ind2="0" ind3="0"><subfield code="r">n</subfield><subfield code="a">e</subfield></datafield><datafield tag="008" ind1="0" ind2="0" ind3="0"><subfield code="t">m</subfield><subfield code="u">u</subfield><subfield code="a">2002</subfield><subfield code="b">us</subfield><subfield code="l">eng</subfield><subfield code="v">0</subfield></datafield><datafield tag="009" ind1="0" ind2="0" ind3="0"><subfield code="a">a</subfield><subfield code="g">xx</subfield></datafield><datafield tag="021" ind1="0" ind2="0" ind3="0"><subfield code="a">1-4000-4596-7</subfield><subfield code="d">$14,00</subfield></datafield><datafield tag="032" ind1="0" ind2="0" ind3="0"><subfield code="&amp;">DBC200439</subfield></datafield><datafield tag="100" ind1="0" ind2="0" ind3="0"><subfield code="0"></subfield><subfield code="a">Sloman</subfield><subfield code="h">Larry</subfield></datafield><datafield tag="245" ind1="0" ind2="0" ind3="0"><subfield code="a">On the road with Bob Dylan</subfield><subfield code="e">Larry "Ratso" Sloman</subfield></datafield><datafield tag="250" ind1="0" ind2="0" ind3="0"><subfield code="a">Revised edition</subfield><subfield code="b">Three Rivers Press</subfield></datafield><datafield tag="260" ind1="0" ind2="0" ind3="0"><subfield code="a">New York</subfield><subfield code="b">Three Rivers Press</subfield><subfield code="c">2002</subfield></datafield><datafield tag="300" ind1="0" ind2="0" ind3="0"><subfield code="a">xv, 464 sider, tavler</subfield></datafield><datafield tag="504" ind1="0" ind2="0" ind3="0"><subfield code="a">Larry "Ratso" Slomans meget personlige beretning om Bob Dylans koncertturne i USA i 1975: "The Rolling Thunder revue"</subfield></datafield><datafield tag="512" ind1="0" ind2="0" ind3="0"><subfield code="a">P&#xE5; omslaget: With a new introduction by Kinky Friedman</subfield></datafield><datafield tag="520" ind1="0" ind2="0" ind3="0"><subfield code="a">Tidligere: 1. udgave. New York, Bantam, 1978</subfield></datafield><datafield tag="652" ind1="0" ind2="0" ind3="0"><subfield code="0"></subfield><subfield code="m">99.4</subfield><subfield code="a">Dylan</subfield><subfield code="h">Bob</subfield></datafield><datafield tag="652" ind1="0" ind2="0" ind3="0"><subfield code="p">78.9064</subfield><subfield code="v">5</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="f">folkemusik</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="f">folkemusikere</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="f">rockmusik</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="f">rockmusikere</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="f">rockkoncerter</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="e">USA</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="i">1970-1979</subfield></datafield></record>
+<record xmlns="http://www.loc.gov/MARC21/slim"><!--Length implementation at offset 22 should hold a number. Assuming 0--><leader>00988nam0a32003011  450 </leader><datafield tag="001" ind1="0" ind2="0" ind3="0"><subfield code="a">9 181 423 4</subfield><subfield code="b">710100</subfield><subfield code="f">a</subfield></datafield><datafield tag="004" ind1="0" ind2="0" ind3="0"><subfield code="r">n</subfield><subfield code="a">e</subfield></datafield><datafield tag="008" ind1="0" ind2="0" ind3="0"><subfield code="t">m</subfield><subfield code="u">u</subfield><subfield code="a">2002</subfield><subfield code="b">us</subfield><subfield code="l">eng</subfield><subfield code="v">0</subfield></datafield><datafield tag="009" ind1="0" ind2="0" ind3="0"><subfield code="a">a</subfield><subfield code="g">xx</subfield></datafield><datafield tag="021" ind1="0" ind2="0" ind3="0"><subfield code="a">1-4000-4596-7</subfield><subfield code="d">$14,00</subfield></datafield><datafield tag="032" ind1="0" ind2="0" ind3="0"><subfield code="&amp;">DBC200439</subfield></datafield><datafield tag="100" ind1="0" ind2="0" ind3="0"><subfield code="0"></subfield><subfield code="a">Sloman</subfield><subfield code="h">Larry</subfield></datafield><datafield tag="245" ind1="0" ind2="0" ind3="0"><subfield code="a">On the road with Bob Dylan</subfield><subfield code="e">Larry "Ratso" Sloman</subfield></datafield><datafield tag="250" ind1="0" ind2="0" ind3="0"><subfield code="a">Revised edition</subfield><subfield code="b">Three Rivers Press</subfield></datafield><datafield tag="260" ind1="0" ind2="0" ind3="0"><subfield code="a">New York</subfield><subfield code="b">Three Rivers Press</subfield><subfield code="c">2002</subfield></datafield><datafield tag="300" ind1="0" ind2="0" ind3="0"><subfield code="a">xv, 464 sider, tavler</subfield></datafield><datafield tag="504" ind1="0" ind2="0" ind3="0"><subfield code="a">Larry "Ratso" Slomans meget personlige beretning om Bob Dylans koncertturne i USA i 1975: "The Rolling Thunder revue"</subfield></datafield><datafield tag="512" ind1="0" ind2="0" ind3="0"><subfield code="a">P&#xE5; omslaget: With a new introduction by Kinky Friedman</subfield></datafield><datafield tag="520" ind1="0" ind2="0" ind3="0"><subfield code="a">Tidligere: 1. udgave. New York, Bantam, 1978</subfield></datafield><datafield tag="652" ind1="0" ind2="0" ind3="0"><subfield code="0"></subfield><subfield code="m">99.4</subfield><subfield code="a">Dylan</subfield><subfield code="h">Bob</subfield></datafield><datafield tag="652" ind1="0" ind2="0" ind3="0"><subfield code="p">78.9064</subfield><subfield code="v">5</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="f">folkemusik</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="f">folkemusikere</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="f">rockmusik</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="f">rockmusikere</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="f">rockkoncerter</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="e">USA</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="i">1970-1979</subfield></datafield></record>

diff --git a/test/xml2marc2.xml b/test/xml2marc2.xml
index 9252e5c..ea973c4 100644 (file)
--- a/test/xml2marc2.xml
+++ b/test/xml2marc2.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<record xmlns="http://www.loc.gov/MARC21/slim"><!--Length implementation at offset 22 should hold a digit. Assuming 0--><leader>01116nam0a32002171  450 </leader><datafield tag="001" ind1="0" ind2="0" ind3="0"><subfield code="a">9 182 502 3</subfield><subfield code="b">710100</subfield><subfield code="f">a</subfield></datafield><datafield tag="004" ind1="0" ind2="0" ind3="0"><subfield code="r">c</subfield><subfield code="a">e</subfield></datafield><datafield tag="008" ind1="0" ind2="0" ind3="0"><subfield code="t">s</subfield><subfield code="u">f</subfield><subfield code="a">1995</subfield><subfield code="b">gb</subfield><subfield code="l">eng</subfield><subfield code="v">0</subfield></datafield><datafield tag="009" ind1="0" ind2="0" ind3="0"><subfield code="a">s</subfield><subfield code="g">xc</subfield></datafield><datafield tag="039" ind1="0" ind2="0" ind3="0"><subfield code="a">bef</subfield></datafield><datafield tag="100" ind1="0" ind2="0" ind3="0"><subfield code="a">Mimms</subfield><subfield code="h">Garnet</subfield></datafield><datafield tag="245" ind1="0" ind2="0" ind3="0"><subfield code="a">Cry baby</subfield><subfield code="a">Warm and soulful</subfield><subfield code="e">Garnet Mimms ... [et al.]</subfield></datafield><datafield tag="260" ind1="0" ind2="0" ind3="0"><subfield code="a">Bury St. Edmunds</subfield><subfield code="b">BGO</subfield><subfield code="c">1995</subfield></datafield><datafield tag="300" ind1="0" ind2="0" ind3="0"><subfield code="n">1 cd</subfield></datafield><datafield tag="512" ind1="0" ind2="0" ind3="0"><subfield code="a">Indspilninger publiceret 1963 (Cry baby) og 1965 (Warm and soulful)</subfield></datafield><datafield tag="531" ind1="0" ind2="0" ind3="0"><subfield code="a">Indhold:</subfield></datafield><datafield tag="538" ind1="0" ind2="0" ind3="0"><subfield code="f">BGO</subfield><subfield code="g">BGOCD268</subfield></datafield><datafield tag="652" ind1="0" ind2="0" ind3="0"><subfield code="m">78.794</subfield><subfield code="v">4</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="m">soul</subfield><subfield code="m">rhythm &amp; blues</subfield><subfield code="n">vokal</subfield><subfield code="p">1960-1969</subfield><subfield code="l">USA</subfield></datafield><datafield tag="795" ind1="0" ind2="0" ind3="0"><subfield code="&#xE5;">11</subfield><subfield code="a">Cry baby</subfield><subfield code="a">Nobody but you</subfield><subfield code="a">Until you were gone</subfield><subfield code="a">Anytime you want me</subfield><subfield code="a">So close</subfield><subfield code="a">For your precious love</subfield><subfield code="a">Baby don't you weep</subfield><subfield code="a">A &#xA4;quiet place</subfield><subfield code="a">Cry to me</subfield><subfield code="a">Don't change your heart</subfield><subfield code="a">Wanting you</subfield><subfield code="a">The &#xA4;truth hurts</subfield><subfield code="a">I'll take good care of you</subfield><subfield code="a">Looking for you</subfield><subfield code="a">It won't hurt (half as much)</subfield><subfield code="a">It was easier to hurt her</subfield><subfield code="a">Thinkin'</subfield><subfield code="a">Prove it to me</subfield><subfield code="a">More than a miracle</subfield><subfield code="a">As long as I have you</subfield><subfield code="a">One girl</subfield><subfield code="a">There goes my baby</subfield><subfield code="a">It's just a matter of time</subfield><subfield code="a">A &#xA4;little bit of soap</subfield><subfield code="a">Look away</subfield><subfield code="a">I'll make it up to you</subfield></datafield><datafield tag="795" ind1="0" ind2="0" ind3="0"><subfield code="&#xE5;">40</subfield><subfield code="y">0</subfield><subfield code="a">1 girl</subfield></datafield></record>
+<record xmlns="http://www.loc.gov/MARC21/slim"><!--Length implementation at offset 22 should hold a number. Assuming 0--><leader>01116nam0a32002171  450 </leader><datafield tag="001" ind1="0" ind2="0" ind3="0"><subfield code="a">9 182 502 3</subfield><subfield code="b">710100</subfield><subfield code="f">a</subfield></datafield><datafield tag="004" ind1="0" ind2="0" ind3="0"><subfield code="r">c</subfield><subfield code="a">e</subfield></datafield><datafield tag="008" ind1="0" ind2="0" ind3="0"><subfield code="t">s</subfield><subfield code="u">f</subfield><subfield code="a">1995</subfield><subfield code="b">gb</subfield><subfield code="l">eng</subfield><subfield code="v">0</subfield></datafield><datafield tag="009" ind1="0" ind2="0" ind3="0"><subfield code="a">s</subfield><subfield code="g">xc</subfield></datafield><datafield tag="039" ind1="0" ind2="0" ind3="0"><subfield code="a">bef</subfield></datafield><datafield tag="100" ind1="0" ind2="0" ind3="0"><subfield code="a">Mimms</subfield><subfield code="h">Garnet</subfield></datafield><datafield tag="245" ind1="0" ind2="0" ind3="0"><subfield code="a">Cry baby</subfield><subfield code="a">Warm and soulful</subfield><subfield code="e">Garnet Mimms ... [et al.]</subfield></datafield><datafield tag="260" ind1="0" ind2="0" ind3="0"><subfield code="a">Bury St. Edmunds</subfield><subfield code="b">BGO</subfield><subfield code="c">1995</subfield></datafield><datafield tag="300" ind1="0" ind2="0" ind3="0"><subfield code="n">1 cd</subfield></datafield><datafield tag="512" ind1="0" ind2="0" ind3="0"><subfield code="a">Indspilninger publiceret 1963 (Cry baby) og 1965 (Warm and soulful)</subfield></datafield><datafield tag="531" ind1="0" ind2="0" ind3="0"><subfield code="a">Indhold:</subfield></datafield><datafield tag="538" ind1="0" ind2="0" ind3="0"><subfield code="f">BGO</subfield><subfield code="g">BGOCD268</subfield></datafield><datafield tag="652" ind1="0" ind2="0" ind3="0"><subfield code="m">78.794</subfield><subfield code="v">4</subfield></datafield><datafield tag="666" ind1="0" ind2="0" ind3="0"><subfield code="m">soul</subfield><subfield code="m">rhythm &amp; blues</subfield><subfield code="n">vokal</subfield><subfield code="p">1960-1969</subfield><subfield code="l">USA</subfield></datafield><datafield tag="795" ind1="0" ind2="0" ind3="0"><subfield code="&#xE5;">11</subfield><subfield code="a">Cry baby</subfield><subfield code="a">Nobody but you</subfield><subfield code="a">Until you were gone</subfield><subfield code="a">Anytime you want me</subfield><subfield code="a">So close</subfield><subfield code="a">For your precious love</subfield><subfield code="a">Baby don't you weep</subfield><subfield code="a">A &#xA4;quiet place</subfield><subfield code="a">Cry to me</subfield><subfield code="a">Don't change your heart</subfield><subfield code="a">Wanting you</subfield><subfield code="a">The &#xA4;truth hurts</subfield><subfield code="a">I'll take good care of you</subfield><subfield code="a">Looking for you</subfield><subfield code="a">It won't hurt (half as much)</subfield><subfield code="a">It was easier to hurt her</subfield><subfield code="a">Thinkin'</subfield><subfield code="a">Prove it to me</subfield><subfield code="a">More than a miracle</subfield><subfield code="a">As long as I have you</subfield><subfield code="a">One girl</subfield><subfield code="a">There goes my baby</subfield><subfield code="a">It's just a matter of time</subfield><subfield code="a">A &#xA4;little bit of soap</subfield><subfield code="a">Look away</subfield><subfield code="a">I'll make it up to you</subfield></datafield><datafield tag="795" ind1="0" ind2="0" ind3="0"><subfield code="&#xE5;">40</subfield><subfield code="y">0</subfield><subfield code="a">1 girl</subfield></datafield></record>

diff --git a/test/xml2marc3.xml b/test/xml2marc3.xml
index 74de296..5f9e7fa 100644 (file)
--- a/test/xml2marc3.xml
+++ b/test/xml2marc3.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<record xmlns="http://www.loc.gov/MARC21/slim"><!--Length implementation at offset 22 should hold a digit. Assuming 0--><leader>00914naa a2200337   450 </leader><datafield tag="001" ind1=" " ind2=" "><subfield code="a">a00001508</subfield><subfield code="f">a</subfield></datafield><datafield tag="004" ind1=" " ind2=" "><subfield code="a">i</subfield><subfield code="r">n</subfield></datafield><datafield tag="008" ind1=" " ind2=" "><subfield code="a">1991</subfield><subfield code="b">xx</subfield><subfield code="l">nor</subfield><subfield code="t">a</subfield><subfield code="v">9</subfield></datafield><datafield tag="009" ind1=" " ind2=" "><subfield code="a">a</subfield><subfield code="g">xx</subfield></datafield><datafield tag="041" ind1=" " ind2=" "><subfield code="a">nor</subfield></datafield><datafield tag="041" ind1=" " ind2=" "><subfield code="d">eng</subfield></datafield><datafield tag="097" ind1="0" ind2="0"><subfield code="a">06</subfield></datafield><datafield tag="245" ind1=" " ind2=" "><subfield code="a">Byfornyelse ved Ibsen-Ringen</subfield></datafield><datafield tag="300" ind1=" " ind2=" "><subfield code="b">farvefoto</subfield><subfield code="b">plan</subfield><subfield code="b">snit</subfield></datafield><datafield tag="557" ind1=" " ind2=" "><subfield code="a">Byggekunst</subfield><subfield code="j">1991</subfield><subfield code="v">1/2</subfield><subfield code="k">41-45</subfield></datafield><datafield tag="630" ind1=" " ind2=" "><subfield code="f">byfornyelse</subfield></datafield><datafield tag="630" ind1=" " ind2=" "><subfield code="f">sanering</subfield></datafield><datafield tag="633" ind1=" " ind2=" "><subfield code="f">Norge</subfield></datafield><datafield tag="633" ind1=" " ind2=" "><subfield code="f">Oslo</subfield></datafield><datafield tag="648" ind1=" " ind2=" "><subfield code="a">Telje Torp Aasen Arkitektkontor</subfield><subfield code="c">Kristian Augustsgate 7B</subfield></datafield><datafield tag="648" ind1=" " ind2=" "><subfield code="a">Eng, Dagfin</subfield></datafield><datafield tag="648" ind1=" " ind2=" "><subfield code="r">anlund, Tom</subfield><subfield code="c">Kristian Augustsgate</subfield><subfield code="c">Pilestredet 19</subfield></datafield><datafield tag="J01" ind1=" " ind2=" "><subfield code="a">a</subfield></datafield><datafield tag="BAS" ind1=" " ind2=" "><subfield code="0"></subfield></datafield><datafield tag="LKR" ind1=" " ind2=" "><subfield code="a">ITM</subfield><subfield code="l">ARK50</subfield><subfield code="b">0000145</subfield><subfield code="y">1991</subfield><subfield code="i">1/2</subfield><subfield code="k">41-45</subfield></datafield><datafield tag="CAT" ind1=" " ind2=" "><subfield code="a"></subfield><subfield code="b"></subfield><subfield code="c">20020111</subfield><subfield code="l">ARK01</subfield><subfield code="h">2002</subfield></datafield><datafield tag="CAT" ind1=" " ind2=" "><subfield code="a"></subfield><subfield code="b"></subfield><subfield code="c">20020111</subfield><subfield code="l">ARK01</subfield><subfield code="h">2116</subfield></datafield><datafield tag="CAT" ind1=" " ind2=" "><subfield code="a"></subfield><subfield code="b"></subfield><subfield code="c">20021002</subfield><subfield code="l">ARK01</subfield><subfield code="h">1000</subfield></datafield><datafield tag="CAT" ind1=" " ind2=" "><subfield code="a">ICLLOAD</subfield><subfield code="b">00</subfield><subfield code="c">20021122</subfield><subfield code="l">ARK01</subfield><subfield code="h">1948</subfield></datafield><datafield tag="CAT" ind1=" " ind2=" "><subfield code="c">20030618</subfield><subfield code="l">ARK01</subfield><subfield code="h">1330</subfield></datafield><datafield tag="UID" ind1=" " ind2=" "><subfield code="a">a00001508</subfield></datafield></record>
+<record xmlns="http://www.loc.gov/MARC21/slim"><!--Length implementation at offset 22 should hold a number. Assuming 0--><leader>00914naa a2200337   450 </leader><datafield tag="001" ind1=" " ind2=" "><subfield code="a">a00001508</subfield><subfield code="f">a</subfield></datafield><datafield tag="004" ind1=" " ind2=" "><subfield code="a">i</subfield><subfield code="r">n</subfield></datafield><datafield tag="008" ind1=" " ind2=" "><subfield code="a">1991</subfield><subfield code="b">xx</subfield><subfield code="l">nor</subfield><subfield code="t">a</subfield><subfield code="v">9</subfield></datafield><datafield tag="009" ind1=" " ind2=" "><subfield code="a">a</subfield><subfield code="g">xx</subfield></datafield><datafield tag="041" ind1=" " ind2=" "><subfield code="a">nor</subfield></datafield><datafield tag="041" ind1=" " ind2=" "><subfield code="d">eng</subfield></datafield><datafield tag="097" ind1="0" ind2="0"><subfield code="a">06</subfield></datafield><datafield tag="245" ind1=" " ind2=" "><subfield code="a">Byfornyelse ved Ibsen-Ringen</subfield></datafield><datafield tag="300" ind1=" " ind2=" "><subfield code="b">farvefoto</subfield><subfield code="b">plan</subfield><subfield code="b">snit</subfield></datafield><datafield tag="557" ind1=" " ind2=" "><subfield code="a">Byggekunst</subfield><subfield code="j">1991</subfield><subfield code="v">1/2</subfield><subfield code="k">41-45</subfield></datafield><datafield tag="630" ind1=" " ind2=" "><subfield code="f">byfornyelse</subfield></datafield><datafield tag="630" ind1=" " ind2=" "><subfield code="f">sanering</subfield></datafield><datafield tag="633" ind1=" " ind2=" "><subfield code="f">Norge</subfield></datafield><datafield tag="633" ind1=" " ind2=" "><subfield code="f">Oslo</subfield></datafield><datafield tag="648" ind1=" " ind2=" "><subfield code="a">Telje Torp Aasen Arkitektkontor</subfield><subfield code="c">Kristian Augustsgate 7B</subfield></datafield><datafield tag="648" ind1=" " ind2=" "><subfield code="a">Eng, Dagfin</subfield></datafield><datafield tag="648" ind1=" " ind2=" "><subfield code="r">anlund, Tom</subfield><subfield code="c">Kristian Augustsgate</subfield><subfield code="c">Pilestredet 19</subfield></datafield><datafield tag="J01" ind1=" " ind2=" "><subfield code="a">a</subfield></datafield><datafield tag="BAS" ind1=" " ind2=" "><subfield code="0"></subfield></datafield><datafield tag="LKR" ind1=" " ind2=" "><subfield code="a">ITM</subfield><subfield code="l">ARK50</subfield><subfield code="b">0000145</subfield><subfield code="y">1991</subfield><subfield code="i">1/2</subfield><subfield code="k">41-45</subfield></datafield><datafield tag="CAT" ind1=" " ind2=" "><subfield code="a"></subfield><subfield code="b"></subfield><subfield code="c">20020111</subfield><subfield code="l">ARK01</subfield><subfield code="h">2002</subfield></datafield><datafield tag="CAT" ind1=" " ind2=" "><subfield code="a"></subfield><subfield code="b"></subfield><subfield code="c">20020111</subfield><subfield code="l">ARK01</subfield><subfield code="h">2116</subfield></datafield><datafield tag="CAT" ind1=" " ind2=" "><subfield code="a"></subfield><subfield code="b"></subfield><subfield code="c">20021002</subfield><subfield code="l">ARK01</subfield><subfield code="h">1000</subfield></datafield><datafield tag="CAT" ind1=" " ind2=" "><subfield code="a">ICLLOAD</subfield><subfield code="b">00</subfield><subfield code="c">20021122</subfield><subfield code="l">ARK01</subfield><subfield code="h">1948</subfield></datafield><datafield tag="CAT" ind1=" " ind2=" "><subfield code="c">20030618</subfield><subfield code="l">ARK01</subfield><subfield code="h">1330</subfield></datafield><datafield tag="UID" ind1=" " ind2=" "><subfield code="a">a00001508</subfield></datafield></record>

diff --git a/test/xml2marc4.xml b/test/xml2marc4.xml
index 9c5f943..9ba3a75 100644 (file)
--- a/test/xml2marc4.xml
+++ b/test/xml2marc4.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<record xmlns="http://www.loc.gov/MARC21/slim"><!--Indicator length at offset 10 should hold a digit. Assuming 2--><!--Identifier length at offset 11 should hold a digit. Assuming 2--><!--Base address at offsets 12..16 should hold a number. Assuming 0--><!--Length implementation at offset 22 should hold a digit. Assuming 0--><leader>009140091a22a  22003370 </leader><!--Directory offset 24: Bad value for data length and/or length starting ( 45  00100170)--><!--Base address not at end of directory, base 0, end 25--></record>
+<record xmlns="http://www.loc.gov/MARC21/slim"><!--Indicator length at offset 10 should hold a number 1-9. Assuming 2--><!--Identifier length at offset 11 should  hold a number 1-9. Assuming 2--><!--Base address at offsets 12..16 should hold a number. Assuming 0--><!--Length implementation at offset 22 should hold a number. Assuming 0--><leader>009140091a22a  22003370 </leader><!--Directory offset 24: Bad value for data length and/or length starting ( 45  00100170)--><!--Base address not at end of directory, base 0, end 25--></record>

diff --git a/test/xml2tmarc1.xml b/test/xml2tmarc1.xml
index f3c388e..b624136 100644 (file)
--- a/test/xml2tmarc1.xml
+++ b/test/xml2tmarc1.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<r xmlns="http://www.indexdata.com/turbomarc"><!--Length implementation at offset 22 should hold a digit. Assuming 0--><l>00988nam0a32003011  450 </l><d001 i1="0" i2="0" i3="0"><sa>9 181 423 4</sa><sb>710100</sb><sf>a</sf></d001><d004 i1="0" i2="0" i3="0"><sr>n</sr><sa>e</sa></d004><d008 i1="0" i2="0" i3="0"><st>m</st><su>u</su><sa>2002</sa><sb>us</sb><sl>eng</sl><sv>0</sv></d008><d009 i1="0" i2="0" i3="0"><sa>a</sa><sg>xx</sg></d009><d021 i1="0" i2="0" i3="0"><sa>1-4000-4596-7</sa><sd>$14,00</sd></d021><d032 i1="0" i2="0" i3="0"><s code="&amp;">DBC200439</s></d032><d100 i1="0" i2="0" i3="0"><s0></s0><sa>Sloman</sa><sh>Larry</sh></d100><d245 i1="0" i2="0" i3="0"><sa>On the road with Bob Dylan</sa><se>Larry "Ratso" Sloman</se></d245><d250 i1="0" i2="0" i3="0"><sa>Revised edition</sa><sb>Three Rivers Press</sb></d250><d260 i1="0" i2="0" i3="0"><sa>New York</sa><sb>Three Rivers Press</sb><sc>2002</sc></d260><d300 i1="0" i2="0" i3="0"><sa>xv, 464 sider, tavler</sa></d300><d504 i1="0" i2="0" i3="0"><sa>Larry "Ratso" Slomans meget personlige beretning om Bob Dylans koncertturne i USA i 1975: "The Rolling Thunder revue"</sa></d504><d512 i1="0" i2="0" i3="0"><sa>P&#xE5; omslaget: With a new introduction by Kinky Friedman</sa></d512><d520 i1="0" i2="0" i3="0"><sa>Tidligere: 1. udgave. New York, Bantam, 1978</sa></d520><d652 i1="0" i2="0" i3="0"><s0></s0><sm>99.4</sm><sa>Dylan</sa><sh>Bob</sh></d652><d652 i1="0" i2="0" i3="0"><sp>78.9064</sp><sv>5</sv></d652><d666 i1="0" i2="0" i3="0"><sf>folkemusik</sf></d666><d666 i1="0" i2="0" i3="0"><sf>folkemusikere</sf></d666><d666 i1="0" i2="0" i3="0"><sf>rockmusik</sf></d666><d666 i1="0" i2="0" i3="0"><sf>rockmusikere</sf></d666><d666 i1="0" i2="0" i3="0"><sf>rockkoncerter</sf></d666><d666 i1="0" i2="0" i3="0"><se>USA</se></d666><d666 i1="0" i2="0" i3="0"><si>1970-1979</si></d666></r>
+<r xmlns="http://www.indexdata.com/turbomarc"><!--Length implementation at offset 22 should hold a number. Assuming 0--><l>00988nam0a32003011  450 </l><d001 i1="0" i2="0" i3="0"><sa>9 181 423 4</sa><sb>710100</sb><sf>a</sf></d001><d004 i1="0" i2="0" i3="0"><sr>n</sr><sa>e</sa></d004><d008 i1="0" i2="0" i3="0"><st>m</st><su>u</su><sa>2002</sa><sb>us</sb><sl>eng</sl><sv>0</sv></d008><d009 i1="0" i2="0" i3="0"><sa>a</sa><sg>xx</sg></d009><d021 i1="0" i2="0" i3="0"><sa>1-4000-4596-7</sa><sd>$14,00</sd></d021><d032 i1="0" i2="0" i3="0"><s code="&amp;">DBC200439</s></d032><d100 i1="0" i2="0" i3="0"><s0></s0><sa>Sloman</sa><sh>Larry</sh></d100><d245 i1="0" i2="0" i3="0"><sa>On the road with Bob Dylan</sa><se>Larry "Ratso" Sloman</se></d245><d250 i1="0" i2="0" i3="0"><sa>Revised edition</sa><sb>Three Rivers Press</sb></d250><d260 i1="0" i2="0" i3="0"><sa>New York</sa><sb>Three Rivers Press</sb><sc>2002</sc></d260><d300 i1="0" i2="0" i3="0"><sa>xv, 464 sider, tavler</sa></d300><d504 i1="0" i2="0" i3="0"><sa>Larry "Ratso" Slomans meget personlige beretning om Bob Dylans koncertturne i USA i 1975: "The Rolling Thunder revue"</sa></d504><d512 i1="0" i2="0" i3="0"><sa>P&#xE5; omslaget: With a new introduction by Kinky Friedman</sa></d512><d520 i1="0" i2="0" i3="0"><sa>Tidligere: 1. udgave. New York, Bantam, 1978</sa></d520><d652 i1="0" i2="0" i3="0"><s0></s0><sm>99.4</sm><sa>Dylan</sa><sh>Bob</sh></d652><d652 i1="0" i2="0" i3="0"><sp>78.9064</sp><sv>5</sv></d652><d666 i1="0" i2="0" i3="0"><sf>folkemusik</sf></d666><d666 i1="0" i2="0" i3="0"><sf>folkemusikere</sf></d666><d666 i1="0" i2="0" i3="0"><sf>rockmusik</sf></d666><d666 i1="0" i2="0" i3="0"><sf>rockmusikere</sf></d666><d666 i1="0" i2="0" i3="0"><sf>rockkoncerter</sf></d666><d666 i1="0" i2="0" i3="0"><se>USA</se></d666><d666 i1="0" i2="0" i3="0"><si>1970-1979</si></d666></r>

diff --git a/test/xml2tmarc2.xml b/test/xml2tmarc2.xml
index c2208fa..c5c7529 100644 (file)
--- a/test/xml2tmarc2.xml
+++ b/test/xml2tmarc2.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<r xmlns="http://www.indexdata.com/turbomarc"><!--Length implementation at offset 22 should hold a digit. Assuming 0--><l>01116nam0a32002171  450 </l><d001 i1="0" i2="0" i3="0"><sa>9 182 502 3</sa><sb>710100</sb><sf>a</sf></d001><d004 i1="0" i2="0" i3="0"><sr>c</sr><sa>e</sa></d004><d008 i1="0" i2="0" i3="0"><st>s</st><su>f</su><sa>1995</sa><sb>gb</sb><sl>eng</sl><sv>0</sv></d008><d009 i1="0" i2="0" i3="0"><sa>s</sa><sg>xc</sg></d009><d039 i1="0" i2="0" i3="0"><sa>bef</sa></d039><d100 i1="0" i2="0" i3="0"><sa>Mimms</sa><sh>Garnet</sh></d100><d245 i1="0" i2="0" i3="0"><sa>Cry baby</sa><sa>Warm and soulful</sa><se>Garnet Mimms ... [et al.]</se></d245><d260 i1="0" i2="0" i3="0"><sa>Bury St. Edmunds</sa><sb>BGO</sb><sc>1995</sc></d260><d300 i1="0" i2="0" i3="0"><sn>1 cd</sn></d300><d512 i1="0" i2="0" i3="0"><sa>Indspilninger publiceret 1963 (Cry baby) og 1965 (Warm and soulful)</sa></d512><d531 i1="0" i2="0" i3="0"><sa>Indhold:</sa></d531><d538 i1="0" i2="0" i3="0"><sf>BGO</sf><sg>BGOCD268</sg></d538><d652 i1="0" i2="0" i3="0"><sm>78.794</sm><sv>4</sv></d652><d666 i1="0" i2="0" i3="0"><sm>soul</sm><sm>rhythm &amp; blues</sm><sn>vokal</sn><sp>1960-1969</sp><sl>USA</sl></d666><d795 i1="0" i2="0" i3="0"><s code="&#xE5;">11</s><sa>Cry baby</sa><sa>Nobody but you</sa><sa>Until you were gone</sa><sa>Anytime you want me</sa><sa>So close</sa><sa>For your precious love</sa><sa>Baby don't you weep</sa><sa>A &#xA4;quiet place</sa><sa>Cry to me</sa><sa>Don't change your heart</sa><sa>Wanting you</sa><sa>The &#xA4;truth hurts</sa><sa>I'll take good care of you</sa><sa>Looking for you</sa><sa>It won't hurt (half as much)</sa><sa>It was easier to hurt her</sa><sa>Thinkin'</sa><sa>Prove it to me</sa><sa>More than a miracle</sa><sa>As long as I have you</sa><sa>One girl</sa><sa>There goes my baby</sa><sa>It's just a matter of time</sa><sa>A &#xA4;little bit of soap</sa><sa>Look away</sa><sa>I'll make it up to you</sa></d795><d795 i1="0" i2="0" i3="0"><s code="&#xE5;">40</s><sy>0</sy><sa>1 girl</sa></d795></r>
+<r xmlns="http://www.indexdata.com/turbomarc"><!--Length implementation at offset 22 should hold a number. Assuming 0--><l>01116nam0a32002171  450 </l><d001 i1="0" i2="0" i3="0"><sa>9 182 502 3</sa><sb>710100</sb><sf>a</sf></d001><d004 i1="0" i2="0" i3="0"><sr>c</sr><sa>e</sa></d004><d008 i1="0" i2="0" i3="0"><st>s</st><su>f</su><sa>1995</sa><sb>gb</sb><sl>eng</sl><sv>0</sv></d008><d009 i1="0" i2="0" i3="0"><sa>s</sa><sg>xc</sg></d009><d039 i1="0" i2="0" i3="0"><sa>bef</sa></d039><d100 i1="0" i2="0" i3="0"><sa>Mimms</sa><sh>Garnet</sh></d100><d245 i1="0" i2="0" i3="0"><sa>Cry baby</sa><sa>Warm and soulful</sa><se>Garnet Mimms ... [et al.]</se></d245><d260 i1="0" i2="0" i3="0"><sa>Bury St. Edmunds</sa><sb>BGO</sb><sc>1995</sc></d260><d300 i1="0" i2="0" i3="0"><sn>1 cd</sn></d300><d512 i1="0" i2="0" i3="0"><sa>Indspilninger publiceret 1963 (Cry baby) og 1965 (Warm and soulful)</sa></d512><d531 i1="0" i2="0" i3="0"><sa>Indhold:</sa></d531><d538 i1="0" i2="0" i3="0"><sf>BGO</sf><sg>BGOCD268</sg></d538><d652 i1="0" i2="0" i3="0"><sm>78.794</sm><sv>4</sv></d652><d666 i1="0" i2="0" i3="0"><sm>soul</sm><sm>rhythm &amp; blues</sm><sn>vokal</sn><sp>1960-1969</sp><sl>USA</sl></d666><d795 i1="0" i2="0" i3="0"><s code="&#xE5;">11</s><sa>Cry baby</sa><sa>Nobody but you</sa><sa>Until you were gone</sa><sa>Anytime you want me</sa><sa>So close</sa><sa>For your precious love</sa><sa>Baby don't you weep</sa><sa>A &#xA4;quiet place</sa><sa>Cry to me</sa><sa>Don't change your heart</sa><sa>Wanting you</sa><sa>The &#xA4;truth hurts</sa><sa>I'll take good care of you</sa><sa>Looking for you</sa><sa>It won't hurt (half as much)</sa><sa>It was easier to hurt her</sa><sa>Thinkin'</sa><sa>Prove it to me</sa><sa>More than a miracle</sa><sa>As long as I have you</sa><sa>One girl</sa><sa>There goes my baby</sa><sa>It's just a matter of time</sa><sa>A &#xA4;little bit of soap</sa><sa>Look away</sa><sa>I'll make it up to you</sa></d795><d795 i1="0" i2="0" i3="0"><s code="&#xE5;">40</s><sy>0</sy><sa>1 girl</sa></d795></r>

diff --git a/test/xml2tmarc3.xml b/test/xml2tmarc3.xml
index 3d58c9d..bf921c5 100644 (file)
--- a/test/xml2tmarc3.xml
+++ b/test/xml2tmarc3.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<r xmlns="http://www.indexdata.com/turbomarc"><!--Length implementation at offset 22 should hold a digit. Assuming 0--><l>00914naa a2200337   450 </l><d001 i1=" " i2=" "><sa>a00001508</sa><sf>a</sf></d001><d004 i1=" " i2=" "><sa>i</sa><sr>n</sr></d004><d008 i1=" " i2=" "><sa>1991</sa><sb>xx</sb><sl>nor</sl><st>a</st><sv>9</sv></d008><d009 i1=" " i2=" "><sa>a</sa><sg>xx</sg></d009><d041 i1=" " i2=" "><sa>nor</sa></d041><d041 i1=" " i2=" "><sd>eng</sd></d041><d097 i1="0" i2="0"><sa>06</sa></d097><d245 i1=" " i2=" "><sa>Byfornyelse ved Ibsen-Ringen</sa></d245><d300 i1=" " i2=" "><sb>farvefoto</sb><sb>plan</sb><sb>snit</sb></d300><d557 i1=" " i2=" "><sa>Byggekunst</sa><sj>1991</sj><sv>1/2</sv><sk>41-45</sk></d557><d630 i1=" " i2=" "><sf>byfornyelse</sf></d630><d630 i1=" " i2=" "><sf>sanering</sf></d630><d633 i1=" " i2=" "><sf>Norge</sf></d633><d633 i1=" " i2=" "><sf>Oslo</sf></d633><d648 i1=" " i2=" "><sa>Telje Torp Aasen Arkitektkontor</sa><sc>Kristian Augustsgate 7B</sc></d648><d648 i1=" " i2=" "><sa>Eng, Dagfin</sa></d648><d648 i1=" " i2=" "><sr>anlund, Tom</sr><sc>Kristian Augustsgate</sc><sc>Pilestredet 19</sc></d648><dJ01 i1=" " i2=" "><sa>a</sa></dJ01><dBAS i1=" " i2=" "><s0></s0></dBAS><dLKR i1=" " i2=" "><sa>ITM</sa><sl>ARK50</sl><sb>0000145</sb><sy>1991</sy><si>1/2</si><sk>41-45</sk></dLKR><dCAT i1=" " i2=" "><sa></sa><sb></sb><sc>20020111</sc><sl>ARK01</sl><sh>2002</sh></dCAT><dCAT i1=" " i2=" "><sa></sa><sb></sb><sc>20020111</sc><sl>ARK01</sl><sh>2116</sh></dCAT><dCAT i1=" " i2=" "><sa></sa><sb></sb><sc>20021002</sc><sl>ARK01</sl><sh>1000</sh></dCAT><dCAT i1=" " i2=" "><sa>ICLLOAD</sa><sb>00</sb><sc>20021122</sc><sl>ARK01</sl><sh>1948</sh></dCAT><dCAT i1=" " i2=" "><sc>20030618</sc><sl>ARK01</sl><sh>1330</sh></dCAT><dUID i1=" " i2=" "><sa>a00001508</sa></dUID></r>
+<r xmlns="http://www.indexdata.com/turbomarc"><!--Length implementation at offset 22 should hold a number. Assuming 0--><l>00914naa a2200337   450 </l><d001 i1=" " i2=" "><sa>a00001508</sa><sf>a</sf></d001><d004 i1=" " i2=" "><sa>i</sa><sr>n</sr></d004><d008 i1=" " i2=" "><sa>1991</sa><sb>xx</sb><sl>nor</sl><st>a</st><sv>9</sv></d008><d009 i1=" " i2=" "><sa>a</sa><sg>xx</sg></d009><d041 i1=" " i2=" "><sa>nor</sa></d041><d041 i1=" " i2=" "><sd>eng</sd></d041><d097 i1="0" i2="0"><sa>06</sa></d097><d245 i1=" " i2=" "><sa>Byfornyelse ved Ibsen-Ringen</sa></d245><d300 i1=" " i2=" "><sb>farvefoto</sb><sb>plan</sb><sb>snit</sb></d300><d557 i1=" " i2=" "><sa>Byggekunst</sa><sj>1991</sj><sv>1/2</sv><sk>41-45</sk></d557><d630 i1=" " i2=" "><sf>byfornyelse</sf></d630><d630 i1=" " i2=" "><sf>sanering</sf></d630><d633 i1=" " i2=" "><sf>Norge</sf></d633><d633 i1=" " i2=" "><sf>Oslo</sf></d633><d648 i1=" " i2=" "><sa>Telje Torp Aasen Arkitektkontor</sa><sc>Kristian Augustsgate 7B</sc></d648><d648 i1=" " i2=" "><sa>Eng, Dagfin</sa></d648><d648 i1=" " i2=" "><sr>anlund, Tom</sr><sc>Kristian Augustsgate</sc><sc>Pilestredet 19</sc></d648><dJ01 i1=" " i2=" "><sa>a</sa></dJ01><dBAS i1=" " i2=" "><s0></s0></dBAS><dLKR i1=" " i2=" "><sa>ITM</sa><sl>ARK50</sl><sb>0000145</sb><sy>1991</sy><si>1/2</si><sk>41-45</sk></dLKR><dCAT i1=" " i2=" "><sa></sa><sb></sb><sc>20020111</sc><sl>ARK01</sl><sh>2002</sh></dCAT><dCAT i1=" " i2=" "><sa></sa><sb></sb><sc>20020111</sc><sl>ARK01</sl><sh>2116</sh></dCAT><dCAT i1=" " i2=" "><sa></sa><sb></sb><sc>20021002</sc><sl>ARK01</sl><sh>1000</sh></dCAT><dCAT i1=" " i2=" "><sa>ICLLOAD</sa><sb>00</sb><sc>20021122</sc><sl>ARK01</sl><sh>1948</sh></dCAT><dCAT i1=" " i2=" "><sc>20030618</sc><sl>ARK01</sl><sh>1330</sh></dCAT><dUID i1=" " i2=" "><sa>a00001508</sa></dUID></r>

diff --git a/test/xml2tmarc4.xml b/test/xml2tmarc4.xml
index bd386e6..68336bf 100644 (file)
--- a/test/xml2tmarc4.xml
+++ b/test/xml2tmarc4.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<r xmlns="http://www.indexdata.com/turbomarc"><!--Indicator length at offset 10 should hold a digit. Assuming 2--><!--Identifier length at offset 11 should hold a digit. Assuming 2--><!--Base address at offsets 12..16 should hold a number. Assuming 0--><!--Length implementation at offset 22 should hold a digit. Assuming 0--><l>009140091a22a  22003370 </l><!--Directory offset 24: Bad value for data length and/or length starting ( 45  00100170)--><!--Base address not at end of directory, base 0, end 25--></r>
+<r xmlns="http://www.indexdata.com/turbomarc"><!--Indicator length at offset 10 should hold a number 1-9. Assuming 2--><!--Identifier length at offset 11 should  hold a number 1-9. Assuming 2--><!--Base address at offsets 12..16 should hold a number. Assuming 0--><!--Length implementation at offset 22 should hold a number. Assuming 0--><l>009140091a22a  22003370 </l><!--Directory offset 24: Bad value for data length and/or length starting ( 45  00100170)--><!--Base address not at end of directory, base 0, end 25--></r>