Added MARC-8 encoded Arabic record, marc9.marc, to test that blanks are

preserved.
Added UTF-8 encoded Chinese record, marccol3.u8.marc, which has the
Ideographic space sequence it.

diff --git a/test/Makefile.am b/test/Makefile.am
index 8fcdc41..b6ed006 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,6 @@
 ## Copyright (C) 1995-2007, Index Data ApS
 ## All rights reserved.
-## $Id: Makefile.am,v 1.35 2007-06-24 19:27:12 adam Exp $
+## $Id: Makefile.am,v 1.36 2007-09-23 07:21:51 adam Exp $
 
 check_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf tstodr tstccl tstlog \
  tstsoap1 tstsoap2 tstodrstack tstlogthread tstxmlquery tstpquery \
@@ -21,8 +21,10 @@ EXTRA_DIST = tstodr.asn tstodrcodec.c tstodrcodec.h cqlsample \
  marc6.marc marc6.xml marc6.chr marc6.xml.marc \
  marc7.marc marc7.xml marc7.chr marc7.xml.marc \
  marc8.marc marc8.xml marc8.chr marc8.xml.marc \
+ marc9.marc marc9.xml marc9.chr marc9.xml.marc \
  marccol1.u8.marc marccol1.u8.1.lst marccol1.u8.2.lst \
  marccol2.u8.marc marccol2.u8.1.lst marccol2.u8.2.lst \
+ marccol3.u8.marc marccol3.u8.1.lst marccol3.u8.2.lst \
  tst_record_conv.xsl 
 
 YAZCOMP = ../util/yaz-asncomp

diff --git a/test/marc9.chr b/test/marc9.chr
new file mode 100644 (file)
index 0000000..f51f8e4
--- /dev/null
+++ b/test/marc9.chr
@@ -0,0 +1 @@
+marc-8

diff --git a/test/marc9.marc b/test/marc9.marc
new file mode 100644 (file)
index 0000000..16bf71e
--- /dev/null
+++ b/test/marc9.marc
@@ -0,0 +1 @@
+02075cas  22005055a 4500001001300000003000400013005001700017008004100034010001700075012003100092035002100123906004500144040001800189041001300207042000700220043001200227050001500239066000700254245007900261246002600340246004600366260009800412300002500510310002700535362004100562490008800603500004700691500005700738546003600795650004700831650002600878650002700904650004100931710007700972710004001049850000801089880007801097880004801175880008601223880005301309880007001362880006301432880004601495936002801541\1e  2005336282\1eDLC\1e20070911033614.0\1e070910c20059999mr uu p      f0    0ara  \1e  \1fa  2005336282\1e  \1fa-3-7-0709110002-p-----    \1e  \1fa(OCoLC)170490164\1e  \1fa7\1fbund\1fcserials\1fdu\1fencip\1ff19\1fgn-oclcserc\1e  \1faDLC\1fcDLC\1fdDLC\1e0 \1faara\1fafre\1e  \1falc\1e  \1faf-mr---\1e00\1faIN PROCESS\1e  \1fc(3\1e00\1f6880-01\1faQaòdåa® al-usrah :\1fbmajallah mutakhaòsòsiòsah /\1fcWizåarat al-°Adl.\1e13\1faJustice de la famille\1e13\1f6880-02\1faMajallat Qaòdåa® al-usrah\1ff<2006>\1e  \1f6880-03\1faal-Rabåaòt :\1fbJam°åiyat Nashr al-Ma°låumah al-Qåanåunåiyah wa-al-Qaòdåa®åiyah,\1fc2005-\1e  \1fav. :\1fbill. ;\1fc24 cm.\1e  \1faIrregular (semiannual)\1e0 \1f6880-04\1faal-°Adad 1. (Yåulyåuz 2005)-\1e0 \1f6880-05\1faManshåuråat Jam°åiyat Nashr al-Ma°låumah al-Qåanåunåiyah wa-al-Qaòdåa®åiyah\1e  \1faSome issues have also a distinctive title.\1e  \1faLatest issue consulted: al-°Adad 3. (Dujanbir 2006).\1e  \1faChiefly in Arabic; some French.\1e 0\1faDomestic relations (Islamic law)\1fzMorocco.\1e 0\1faDivorce (Islamic law)\1e 0\1faMarriage law\1fzMorocco.\1e 0\1faLaw reports, digests, etc.\1fzMorocco.\1e2 \1f6880-06\1faJam°åiyat Nashr al-Ma°låumah al-Qåanåunåiyah wa-al-Qaòdåa®åiyah.\1e1 \1f6880-07\1faMorocco.\1fbWizåarat al-°Adl.\1e  \1faDLC\1e00\1f6245-01/(3/r\1fa\e(3bVGA GdCSQI :\e(B\1fb\e(3eLdI eJNUUI /\e(B\1fc\e(3hRGQI GdYOd.\e(B\1e13\1f6246-02/(3/r\1fa\e(3eLdI bVGA GdCSQI\e(B\1ff<2006>\1e  \1f6260-03/(3/r\1fa\e(3GdQHGW :\e(B\1fb\e(3LeYjI fTQ GdeYdheI GdbGfhfjI hGdbVGFjI,\e(B\1fc2005-\1e0 \1f6362-04/(3/r\1fa\e(3GdYOO \e(B1. (\e(3jhdjhR \e(B2005)-\1e0 \1f6490-05/(3/r\1fa\e(3efThQGJ LeYjI fTQ GdeYdheI GdbGfhfjI hGdbVGFjI\e(B\1e2 \1f6710-06/(3/r\1fa\e(3LeYjI fTQ GdeYdheI GdbGfhfjI hGdbVGFjI.\e(B\1e1 \1f6710-07/(3/r\1faMorocco.\1fb\e(3hRGQI GdYOd.\e(B\1e  \1faLC Cairo Office [we 45]\1e\1d
\ No newline at end of file

diff --git a/test/marc9.xml b/test/marc9.xml
new file mode 100644 (file)
index 0000000..d7ed2a5
--- /dev/null
+++ b/test/marc9.xml
@@ -0,0 +1,155 @@
+<record xmlns="http://www.loc.gov/MARC21/slim">
+  <leader>02075cas a22005055a 4500</leader>
+  <controlfield tag="001">  2005336282</controlfield>
+  <controlfield tag="003">DLC</controlfield>
+  <controlfield tag="005">20070911033614.0</controlfield>
+  <controlfield tag="008">070910c20059999mr uu p      f0    0ara  </controlfield>
+  <datafield tag="010" ind1=" " ind2=" ">
+    <subfield code="a">  2005336282</subfield>
+  </datafield>
+  <datafield tag="012" ind1=" " ind2=" ">
+    <subfield code="a">-3-7-0709110002-p-----    </subfield>
+  </datafield>
+  <datafield tag="035" ind1=" " ind2=" ">
+    <subfield code="a">(OCoLC)170490164</subfield>
+  </datafield>
+  <datafield tag="906" ind1=" " ind2=" ">
+    <subfield code="a">7</subfield>
+    <subfield code="b">und</subfield>
+    <subfield code="c">serials</subfield>
+    <subfield code="d">u</subfield>
+    <subfield code="e">ncip</subfield>
+    <subfield code="f">19</subfield>
+    <subfield code="g">n-oclcserc</subfield>
+  </datafield>
+  <datafield tag="040" ind1=" " ind2=" ">
+    <subfield code="a">DLC</subfield>
+    <subfield code="c">DLC</subfield>
+    <subfield code="d">DLC</subfield>
+  </datafield>
+  <datafield tag="041" ind1="0" ind2=" ">
+    <subfield code="a">ara</subfield>
+    <subfield code="a">fre</subfield>
+  </datafield>
+  <datafield tag="042" ind1=" " ind2=" ">
+    <subfield code="a">lc</subfield>
+  </datafield>
+  <datafield tag="043" ind1=" " ind2=" ">
+    <subfield code="a">f-mr---</subfield>
+  </datafield>
+  <datafield tag="050" ind1="0" ind2="0">
+    <subfield code="a">IN PROCESS</subfield>
+  </datafield>
+  <datafield tag="066" ind1=" " ind2=" ">
+    <subfield code="c">(3</subfield>
+  </datafield>
+  <datafield tag="245" ind1="0" ind2="0">
+    <subfield code="6">880-01</subfield>
+    <subfield code="a">Qaḍāʼ al-usrah :</subfield>
+    <subfield code="b">majallah mutakhaṣṣiṣah /</subfield>
+    <subfield code="c">Wizārat al-ʻAdl.</subfield>
+  </datafield>
+  <datafield tag="246" ind1="1" ind2="3">
+    <subfield code="a">Justice de la famille</subfield>
+  </datafield>
+  <datafield tag="246" ind1="1" ind2="3">
+    <subfield code="6">880-02</subfield>
+    <subfield code="a">Majallat Qaḍāʼ al-usrah</subfield>
+    <subfield code="f">&lt;2006&gt;</subfield>
+  </datafield>
+  <datafield tag="260" ind1=" " ind2=" ">
+    <subfield code="6">880-03</subfield>
+    <subfield code="a">al-Rabāṭ :</subfield>
+    <subfield code="b">Jamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah,</subfield>
+    <subfield code="c">2005-</subfield>
+  </datafield>
+  <datafield tag="300" ind1=" " ind2=" ">
+    <subfield code="a">v. :</subfield>
+    <subfield code="b">ill. ;</subfield>
+    <subfield code="c">24 cm.</subfield>
+  </datafield>
+  <datafield tag="310" ind1=" " ind2=" ">
+    <subfield code="a">Irregular (semiannual)</subfield>
+  </datafield>
+  <datafield tag="362" ind1="0" ind2=" ">
+    <subfield code="6">880-04</subfield>
+    <subfield code="a">al-ʻAdad 1. (Yūlyūz 2005)-</subfield>
+  </datafield>
+  <datafield tag="490" ind1="0" ind2=" ">
+    <subfield code="6">880-05</subfield>
+    <subfield code="a">Manshūrāt Jamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah</subfield>
+  </datafield>
+  <datafield tag="500" ind1=" " ind2=" ">
+    <subfield code="a">Some issues have also a distinctive title.</subfield>
+  </datafield>
+  <datafield tag="500" ind1=" " ind2=" ">
+    <subfield code="a">Latest issue consulted: al-ʻAdad 3. (Dujanbir 2006).</subfield>
+  </datafield>
+  <datafield tag="546" ind1=" " ind2=" ">
+    <subfield code="a">Chiefly in Arabic; some French.</subfield>
+  </datafield>
+  <datafield tag="650" ind1=" " ind2="0">
+    <subfield code="a">Domestic relations (Islamic law)</subfield>
+    <subfield code="z">Morocco.</subfield>
+  </datafield>
+  <datafield tag="650" ind1=" " ind2="0">
+    <subfield code="a">Divorce (Islamic law)</subfield>
+  </datafield>
+  <datafield tag="650" ind1=" " ind2="0">
+    <subfield code="a">Marriage law</subfield>
+    <subfield code="z">Morocco.</subfield>
+  </datafield>
+  <datafield tag="650" ind1=" " ind2="0">
+    <subfield code="a">Law reports, digests, etc.</subfield>
+    <subfield code="z">Morocco.</subfield>
+  </datafield>
+  <datafield tag="710" ind1="2" ind2=" ">
+    <subfield code="6">880-06</subfield>
+    <subfield code="a">Jamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah.</subfield>
+  </datafield>
+  <datafield tag="710" ind1="1" ind2=" ">
+    <subfield code="6">880-07</subfield>
+    <subfield code="a">Morocco.</subfield>
+    <subfield code="b">Wizārat al-ʻAdl.</subfield>
+  </datafield>
+  <datafield tag="850" ind1=" " ind2=" ">
+    <subfield code="a">DLC</subfield>
+  </datafield>
+  <datafield tag="880" ind1="0" ind2="0">
+    <subfield code="6">245-01/(3/r</subfield>
+    <subfield code="a">قضاء الأسرة :</subfield>
+    <subfield code="b">مجلة متخصصة /</subfield>
+    <subfield code="c">وزارة العدل.</subfield>
+  </datafield>
+  <datafield tag="880" ind1="1" ind2="3">
+    <subfield code="6">246-02/(3/r</subfield>
+    <subfield code="a">مجلة قضاء الأسرة</subfield>
+    <subfield code="f">&lt;2006&gt;</subfield>
+  </datafield>
+  <datafield tag="880" ind1=" " ind2=" ">
+    <subfield code="6">260-03/(3/r</subfield>
+    <subfield code="a">الرباط :</subfield>
+    <subfield code="b">جمعية نشر المعلومة القانونية والقضائية،</subfield>
+    <subfield code="c">2005-</subfield>
+  </datafield>
+  <datafield tag="880" ind1="0" ind2=" ">
+    <subfield code="6">362-04/(3/r</subfield>
+    <subfield code="a">العدد 1. (يوليوز 2005)-</subfield>
+  </datafield>
+  <datafield tag="880" ind1="0" ind2=" ">
+    <subfield code="6">490-05/(3/r</subfield>
+    <subfield code="a">منشورات جمعية نشر المعلومة القانونية والقضائية</subfield>
+  </datafield>
+  <datafield tag="880" ind1="2" ind2=" ">
+    <subfield code="6">710-06/(3/r</subfield>
+    <subfield code="a">جمعية نشر المعلومة القانونية والقضائية.</subfield>
+  </datafield>
+  <datafield tag="880" ind1="1" ind2=" ">
+    <subfield code="6">710-07/(3/r</subfield>
+    <subfield code="a">Morocco.</subfield>
+    <subfield code="b">وزارة العدل.</subfield>
+  </datafield>
+  <datafield tag="936" ind1=" " ind2=" ">
+    <subfield code="a">LC Cairo Office [we 45]</subfield>
+  </datafield>
+</record>

diff --git a/test/marc9.xml.marc b/test/marc9.xml.marc
new file mode 100644 (file)
index 0000000..9880e30
--- /dev/null
+++ b/test/marc9.xml.marc
@@ -0,0 +1 @@
+02244cas a22005055a 4500001001300000003000400013005001700017008004100034010001700075012003100092035002100123906004500144040001800189041001300207042000700220043001200227050001500239066000700254245008700261246002600348246004900374260011100423300002500534310002700559362004400586490010100630500004700731500005800778546003600836650004700872650002600919650002700945650004100972710008801013710004201101850000801143880009001151880005601241880011501297880005201412880010501464880009101569880005001660936002801710\1e  2005336282\1eDLC\1e20070911033614.0\1e070910c20059999mr uu p      f0    0ara  \1e  \1fa  2005336282\1e  \1fa-3-7-0709110002-p-----    \1e  \1fa(OCoLC)170490164\1e  \1fa7\1fbund\1fcserials\1fdu\1fencip\1ff19\1fgn-oclcserc\1e  \1faDLC\1fcDLC\1fdDLC\1e0 \1faara\1fafre\1e  \1falc\1e  \1faf-mr---\1e00\1faIN PROCESS\1e  \1fc(3\1e00\1f6880-01\1faQaḍāʼ al-usrah :\1fbmajallah mutakhaṣṣiṣah /\1fcWizārat al-ʻAdl.\1e13\1faJustice de la famille\1e13\1f6880-02\1faMajallat Qaḍāʼ al-usrah\1ff<2006>\1e  \1f6880-03\1faal-Rabāṭ :\1fbJamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah,\1fc2005-\1e  \1fav. :\1fbill. ;\1fc24 cm.\1e  \1faIrregular (semiannual)\1e0 \1f6880-04\1faal-ʻAdad 1. (Yūlyūz 2005)-\1e0 \1f6880-05\1faManshūrāt Jamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah\1e  \1faSome issues have also a distinctive title.\1e  \1faLatest issue consulted: al-ʻAdad 3. (Dujanbir 2006).\1e  \1faChiefly in Arabic; some French.\1e 0\1faDomestic relations (Islamic law)\1fzMorocco.\1e 0\1faDivorce (Islamic law)\1e 0\1faMarriage law\1fzMorocco.\1e 0\1faLaw reports, digests, etc.\1fzMorocco.\1e2 \1f6880-06\1faJamʻīyat Nashr al-Maʻlūmah al-Qānūnīyah wa-al-Qaḍāʼīyah.\1e1 \1f6880-07\1faMorocco.\1fbWizārat al-ʻAdl.\1e  \1faDLC\1e00\1f6245-01/(3/r\1faقضاء الأسرة :\1fbمجلة متخصصة /\1fcوزارة العدل.\1e13\1f6246-02/(3/r\1faمجلة قضاء الأسرة\1ff<2006>\1e  \1f6260-03/(3/r\1faالرباط :\1fbجمعية نشر المعلومة القانونية والقضائية،\1fc2005-\1e0 \1f6362-04/(3/r\1faالعدد 1. (يوليوز 2005)-\1e0 \1f6490-05/(3/r\1faمنشورات جمعية نشر المعلومة القانونية والقضائية\1e2 \1f6710-06/(3/r\1faجمعية نشر المعلومة القانونية والقضائية.\1e1 \1f6710-07/(3/r\1faMorocco.\1fbوزارة العدل.\1e  \1faLC Cairo Office [we 45]\1e\1d
\ No newline at end of file

diff --git a/test/marccol3.u8.1.lst b/test/marccol3.u8.1.lst
new file mode 100644 (file)
index 0000000..400f0e8
--- /dev/null
+++ b/test/marccol3.u8.1.lst
@@ -0,0 +1,29 @@
+01313cam a2200349ua 4500
+001 82129893
+003 DLC
+005 20070808062021.0
+008 841102s1980    cc a          000 0 chi  
+035    $a (DLC)5011703
+010    $a    82129893 
+035    $a (CStRLIN)DCLP84-B3561
+040    $a DLC-R $c DLC-R $d CStRLIN $d DLC
+050 00 $a TL546.7 $b .S48 1980
+066    $c $1
+082 00 $a 629.4 $2 19
+100 1  $6 880-01 $a Shen, Guoliang.
+245 10 $6 880-02 $a Yu zhou hang xing he shu li hua / $c Shen Guoliang wen ; Chen Genxiang tu.
+250    $6 880-03 $a Di 1 ban.
+260    $6 880-04 $a [Canton] : $b Guangdong ren min chu ban she : $b Guangdong sheng xin hua shu dian fa xing, $c 1980.
+300    $a 199 p. : $b ill. ; $c 19 cm.
+440  0 $6 880-05 $a Ke xue zhi shi pu ji cong shu
+650  0 $a Astronautics $x Popular works.
+700 1  $6 880-06 $a Chen, Genxiang.
+880 1  $6 100-01/1 $a 沈　国良.
+880 10 $6 245-02/1 $a 宇宙　航行　和　数理化 / $c 沈　国良　文 ; 陈　根祥　图.
+880    $6 250-03/1 $a 第1版.
+880    $6 260-04/1 $a [Canton] : $b 广东　人民　出版社 : $b 广东省　新華　書店　发行, $c 1980.
+880  0 $6 440-05/1 $a 科学　知识　普及　丛书
+880 1  $6 700-06/1 $a 陈　根祥.
+906    $a 0 $b cbc $c orignew $d u $e ncip $f 19 $g y-rlinjack
+985    $a spacingreload
+

diff --git a/test/marccol3.u8.2.lst b/test/marccol3.u8.2.lst
new file mode 100644 (file)
index 0000000..b3a9b15
--- /dev/null
+++ b/test/marccol3.u8.2.lst
@@ -0,0 +1,29 @@
+01373cam a2200349ua 4500
+001 82129893
+003 DLC
+005 20070808062021.0
+008 841102s1980    cc a          000 0 chi  
+035    $a (DLC)5011703
+010    $a    82129893 
+035    $a (CStRLIN)DCLP84-B3561
+040    $a DLC-R $c DLC-R $d CStRLIN $d DLC
+050 00 $a TL546.7 $b .S48 1980
+066    $c $1
+082 00 $a 629.4 $2 19
+100 1  $6 880-01 $a Shen, Guoliang.
+245 10 $6 880-02 $a Yu zhou hang xing he shu li hua / $c Shen Guoliang wen ; Chen Genxiang tu.
+250    $6 880-03 $a Di 1 ban.
+260    $6 880-04 $a [Canton] : $b Guangdong ren min chu ban she : $b Guangdong sheng xin hua shu dian fa xing, $c 1980.
+300    $a 199 p. : $b ill. ; $c 19 cm.
+440  0 $6 880-05 $a Ke xue zhi shi pu ji cong shu
+650  0 $a Astronautics $x Popular works.
+700 1  $6 880-06 $a Chen, Genxiang.
+880 1  $6 100-01/1 $a 沈　国良.
+880 10 $6 245-02/1 $a 宇宙　航行　和　数理化 / $c 沈　国良　文 ; 陈　根祥　图.
+880    $6 250-03/1 $a 第1版.
+880    $6 260-04/1 $a [Canton] : $b 广东　人民　出版社 : $b 广东省　新華　書店　发行, $c 1980.
+880  0 $6 440-05/1 $a 科学　知识　普及　丛书
+880 1  $6 700-06/1 $a 陈　根祥.
+906    $a 0 $b cbc $c orignew $d u $e ncip $f 19 $g y-rlinjack
+985    $a spacingreload
+

diff --git a/test/marccol3.u8.marc b/test/marccol3.u8.marc
new file mode 100644 (file)
index 0000000..ae1defa
--- /dev/null
+++ b/test/marccol3.u8.marc
@@ -0,0 +1 @@
+01313cam a2200349ua 4500001000900000003000400009005001700013008004100030035001700071010001700088035002600105040003100131050002300162066000700185082001400192100002800206245008500234250002200319260010600341300002900447440004200476650003300518700002800551880002800579880009200607880002300699880010200722880004800824880002800872906004500900985001800945\1e82129893\1eDLC\1e20070808062021.0\1e841102s1980    cc a          000 0 chi  \1e  \1fa(DLC)5011703\1e  \1fa   82129893 \1e  \1fa(CStRLIN)DCLP84-B3561\1e  \1faDLC-R\1fcDLC-R\1fdCStRLIN\1fdDLC\1e00\1faTL546.7\1fb.S48 1980\1e  \1fc$1\1e00\1fa629.4\1f219\1e1 \1f6880-01\1faShen, Guoliang.\1e10\1f6880-02\1faYu zhou hang xing he shu li hua /\1fcShen Guoliang wen ; Chen Genxiang tu.\1e  \1f6880-03\1faDi 1 ban.\1e  \1f6880-04\1fa[Canton] :\1fbGuangdong ren min chu ban she :\1fbGuangdong sheng xin hua shu dian fa xing,\1fc1980.\1e  \1fa199 p. :\1fbill. ;\1fc19 cm.\1e 0\1f6880-05\1faKe xue zhi shi pu ji cong shu\1e 0\1faAstronautics\1fxPopular works.\1e1 \1f6880-06\1faChen, Genxiang.\1e1 \1f6100-01/1\1fa沈　国良.\1e10\1f6245-02/1\1fa宇宙　航行　和　数理化 /\1fc沈　国良　文 ; 陈　根祥　图.\1e  \1f6250-03/1\1fa第1版.\1e  \1f6260-04/1\1fa[Canton] :\1fb广东　人民　出版社 :\1fb广东省　新華　書店　发行,\1fc1980.\1e 0\1f6440-05/1\1fa科学　知识　普及　丛书\1e1 \1f6700-06/1\1fa陈　根祥.\1e  \1fa0\1fbcbc\1fcorignew\1fdu\1fencip\1ff19\1fgy-rlinjack\1e  \1faspacingreload\1e\1d
\ No newline at end of file