marc 0.8.0 → 0.8.1

data/lib/marc/reader.rb

@@ -1,5 +1,8 @@
 require 'ensure_valid_encoding'
-require 'marc/marc8/to_unicode'
+
+# Note: requiring 'marc/marc8/to_unicode' below, in #initialize,
+# only when necessary
+
 
 module MARC
   # A class for reading MARC binary (ISO 2709) files. 
@@ -210,7 +213,13 @@ module MARC
         # with binary marc data, the transcode can mess up the byte count
         # and make it unreadable. 
         @encoding_options[:external_encoding] ||= @handle.external_encoding
-      end      
+      end
+
+      # Only pull in the MARC8 translation if we need it, since it's really big
+      if @encoding_options[:external_encoding]  == "MARC-8"
+        require 'marc/marc8/to_unicode' unless defined? MARC::Marc8::ToUnicode
+      end
+
     end
 
     # to support iteration:

data/lib/marc/version.rb

@@ -1,3 +1,3 @@
 module MARC
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marc
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: marc
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ensure_valid_encoding
@@ -65,7 +65,6 @@ files:
 - lib/marc/record.rb
 - lib/marc/subfield.rb
 - lib/marc/version.rb
-- lib/marc/writer-NEW.rb
 - lib/marc/writer.rb
 - lib/marc/xml_parsers.rb
 - lib/marc/xmlreader.rb
@@ -74,19 +73,14 @@ files:
 - test/bad_eacc_encoding.marc8.marc
 - test/batch.dat
 - test/batch.xml
-- test/bib178448.okay.human
-- test/bib178448.okay.marc
-- test/bib178448.writtenout.marc
 - test/cp866_multirecord.marc
 - test/cp866_unimarc.marc
 - test/escaped_character_reference.marc8.marc
-- test/hebrew880s.marc
 - test/marc8/data/test_marc8.txt
 - test/marc8/data/test_utf8.txt
 - test/marc8/tc_marc8_mapping.rb
 - test/marc8/tc_to_unicode.rb
 - test/marc8_accented_chars.marc
-- test/marc_with_bad_utf8.utf8.human
 - test/marc_with_bad_utf8.utf8.marc
 - test/no-leading-zero.xml
 - test/non-numeric.dat

data/lib/marc/writer-NEW.rb

@@ -1,108 +0,0 @@
-module MARC
-
-  # A class for writing MARC records as MARC21.
-
-  class Writer
-
-    # the constructor which you must pass a file path
-    # or an object that responds to a write message
-
-    def initialize(file)
-      if file.class == String
-        @fh = File.new(file,"w")
-      elsif file.respond_to?('write')
-        @fh = file
-      else
-        throw "must pass in file name or handle"
-      end
-    end
-
-
-    # write a record to the file or handle
-
-    def write(record)
-      @fh.write(MARC::Writer.encode(record))
-    end
-
-
-    # close underlying filehandle
-
-    def close
-      @fh.close
-    end
-
-
-    # a static method that accepts a MARC::Record object
-    # and returns the record encoded as MARC21 in transmission format
-
-    def self.encode(record)
-      directory = ''
-      fields = ''
-      offset = 0
-      for field in record.fields
-
-        # encode the field
-        field_data = ''
-        if field.class == MARC::DataField 
-          warn("Warn:  Missing indicator") unless field.indicator1 && field.indicator2
-          field_data = (field.indicator1 || " ") + (field.indicator2 || " ")
-          for s in field.subfields
-            field_data += SUBFIELD_INDICATOR + s.code + s.value
-          end
-        elsif field.class == MARC::ControlField
-          field_data = field.value
-        end
-        field_data += END_OF_FIELD
-
-        # calculate directory entry for the field
-        field_length = (field_data.respond_to?(:bytesize) ?
-          field_data.bytesize() :
-          field_data.length())        
-        directory += sprintf("%03s", field.tag) + format_byte_count(field_length, 4) + format_byte_count(offset)
-
-
-        # add field to data for other fields
-        fields += field_data 
-
-        # update offset for next field
-        offset += field_length
-      end
-
-      # determine the base (leader + directory)
-      base = record.leader + directory + END_OF_FIELD
-
-      # determine complete record
-      marc = base + fields + END_OF_RECORD
-
-      # update leader with the byte offest to the end of the directory
-      marc[12..16] = format_byte_count(base.respond_to?(:bytesize) ?
-        base.bytesize() :
-        base.length() 
-      )
-
-      # update the record length
-      marc[0..4] = format_byte_count(marc.respond_to?(:bytesize) ?
-        marc.bytesize() :
-        marc.length()
-      )      
-      
-      # store updated leader in the record that was passed in
-      record.leader = marc[0..LEADER_LENGTH-1]
-
-      # return encoded marc
-      return marc
-    end
-
-    def self.format_byte_count(number, num_digits=5)
-      formatted = sprintf("%0#{num_digits}i", number)
-      if formatted.length > num_digits
-        # uh, oh, we've exceeded our max. Either zero out
-        # or raise, depending on settings.
-        #formatted = sprintf("%0#{num_digits}i", "")
-        formatted = "9" * num_digits
-      end
-      return formatted
-    end
-
-  end
-end

data/test/bib178448.okay.human

@@ -1,24 +0,0 @@
-01161cam a2200289   4500
-001 178448
-008       s1996    xx                  spa d
-035    $a X!b
-049    $a JHWV [AV] [NIRC] $n o
-096    $a WY 20.5 VC6 1996
-110 2  $a National Institutes of Health (U.S.)
-110 2  $a National Institute of Nursing Research (U.S.)
-110 2  $a Department of Health & Human Services (U.S.)
-245  0 $a Ten years at NIH : $b advancing health through science : the human dimension / $c Patricia A. Grady, Harold Varmus.
-246    $a 10 years at NIH
-300    $a 2 videocassettes (229 min.) : $b sd., col. ; $c 1/2 in.
-520    $a A series of speakers recounts advances in nursing research from 1986 to 1996. ˜
-538    $a VHS.
-650  2 $a Nursing Care $x videocassettes
-650  2 $a Nursing Research $x videocassettes
-650  2 $a Nursing $x videocassettes
-700 10 $a Grady, Patricia Anne, $d 1943-
-700 1  $a Varmus, Harold
-910    $a 178448 $b Horizon bib#
-949 31 $7 1 $5 WY 20.5 VC6 1996 $0 26 $0 G $2 A $8 5 $4 1
-991    $a WY 20.5 VC6 1996 $f nlm $b wnlm $c c. 1 $q 0 $i 3199765 $l wempbk $m elsc
-991    $a WY 20.5 VC6 1996 $f nlm $b wnlm $c c. 1 $q 0 $i 3199766 $l wempbk $m elsc
-

data/test/bib178448.okay.marc

@@ -1 +0,0 @@
-01161cam a2200289   4500001000700000008004100007035000800048049002400056096002100080110004100101110005100142110004900193245011600242246002000358300005600378520008500434538000900519650003300528650003700561650002800598700003300626700001900659910002500678949004000703991006400743991006400807178448      s1996    xx                  spa d  aX!b  aJHWV [AV] [NIRC]no  aWY 20.5 VC6 19962 aNational Institutes of Health (U.S.)2 aNational Institute of Nursing Research (U.S.)2 aDepartment of Health & Human Services (U.S.) 0aTen years at NIH :badvancing health through science : the human dimension /cPatricia A. Grady, Harold Varmus.  a10 years at NIH  a2 videocassettes (229 min.) :bsd., col. ;c1/2 in.  aA series of speakers recounts advances in nursing research from 1986 to 1996. ˜  aVHS. 2aNursing Carexvideocassettes 2aNursing Researchxvideocassettes 2aNursingxvideocassettes10aGrady, Patricia Anne,d1943-1 aVarmus, Harold  a178448bHorizon bib#31715WY 20.5 VC6 19960260G2A8541  aWY 20.5 VC6 1996fnlmbwnlmcc. 1q0i3199765lwempbkmelsc  aWY 20.5 VC6 1996fnlmbwnlmcc. 1q0i3199766lwempbkmelsc

data/test/bib178448.writtenout.marc

@@ -1 +0,0 @@
-01161cam a2200289   4500001000700000008004100007035000800048049002400056096002100080110004100101110005100142110004900193245011600242246002000358300005600378520008500434538000900519650003300528650003700561650002800598700003300626700001900659910002500678949004000703991006400743991006400807178448      s1996    xx                  spa d  aX!b  aJHWV [AV] [NIRC]no  aWY 20.5 VC6 19962 aNational Institutes of Health (U.S.)2 aNational Institute of Nursing Research (U.S.)2 aDepartment of Health & Human Services (U.S.) 0aTen years at NIH :badvancing health through science : the human dimension /cPatricia A. Grady, Harold Varmus.  a10 years at NIH  a2 videocassettes (229 min.) :bsd., col. ;c1/2 in.  aA series of speakers recounts advances in nursing research from 1986 to 1996. ˜  aVHS. 2aNursing Carexvideocassettes 2aNursing Researchxvideocassettes 2aNursingxvideocassettes10aGrady, Patricia Anne,d1943-1 aVarmus, Harold  a178448bHorizon bib#31715WY 20.5 VC6 19960260G2A8541  aWY 20.5 VC6 1996fnlmbwnlmcc. 1q0i3199765lwempbkmelsc  aWY 20.5 VC6 1996fnlmbwnlmcc. 1q0i3199766lwempbkmelsc

data/test/hebrew880s.marc

@@ -1 +0,0 @@
-01998cam a2200469 a 4500001000800000005001700008008004100025020001800066020001500084024001800099024001200117035001200129035001700141035002100158040003200179042000800211049000900219050002100228066000700249100002900256245010000285246008400385260015000469300002100619504006400640541010900704600004100813600004700854650002500901650002300926650002900949650002500978752002201003880003701025880013001062880017301192910002601365936002701391938003801418991006001456994001201516408398520120302131100.0110313s2011    is       b    001 0 heb c  a9789651321337  a96513213348 a00032002131958 a3221319  a4083985  aocn710973037  a(OCoLC)710973037  aWEINBcWEINBdHLSdIXAdCUY  apcc  aJHEE 4aDS149b.R38 2011  c(21 6880-01aRatsabi, Shalom.106880-02aAnarkhizm be-"Tsiyon" :bben Marṭin Buber le-Aharon Daṿid Gordon /cShalom Ratsabi.1 iTitle on t.p. verso:aAnarchy in "Zion" :bbetween Martin Buber and A.D. Gordon  6880-03a[Tel Aviv] :bʻAm ʻoved :bha-Makhon le-ḥeḳer ha-Tsiyonut ve-Yiśra'el ʻa. sh. Ḥayim Ṿaitsman, Universiṭat Tel Aviv,cc2011.  a339 p. ;c23 cm.  aIncludes bibliographical references (p. 320-330) and index.  3Eisenhower copy:cPurchased with support from the National Endowment for the Humanities;dFY2012.5MdBJ.10aBuber, Martin,d1878-1965xReligion.10aGordon, Aaron David,d1856-1922xReligion. 0aZionism and Judaism. 0aReligious Zionism. 0aZionismxHistoriography. 0aZionismxPhilosophy.  aIsraeldTel Aviv.1 6100-01/(2/raרצבי, שלום.106245-02/(2/raאנרכיזם ב״ציון״ :bבין מרטין בובר לאהרן דוד גורדון /cשלום רצבי.  6260-03/(2/ra[תל אביב] :bעם עובד :bהמכון לחקר הציונות וישראל עʺש חיים ויצמן, אוניברסיטת תל אביב,cc2011.  a4083985bHorizon bib#  aPR 747581025 741225747  aA.I. WeinbergbWEINnwb2011369996  aDS149.R38 2011flcbelccc. 1q0i6085034lemainmemsel  aC0bJHE

data/test/marc_with_bad_utf8.utf8.human

@@ -1,40 +0,0 @@
-01161cam a2200289   4500
-001 178448
-008       s1996    xx                  spa d
-035    $a X!b
-049    $a JHWV [AV] [NIRC] $n o
-096    $a WY 20.5 VC6 1996
-110 2  $a National Institutes of Health (U.S.)
-110 2  $a National Institute of Nursing Research (U.S.)#
-(No separator at end of field length=51)
-(Bad indicator data. Skipping 2 bytes)
-110 2  $a Department of Health & Human Services (U.S.)
-(Bad indicator data. Skipping 2 bytes)
-245  0 $a Ten years at NIH : $b advancing health through science : the human dimension / $c Patricia A. Grady, Harold Varmus.
-(Bad indicator data. Skipping 2 bytes)
-246    $a 10 years at NIH
-(Bad indicator data. Skipping 2 bytes)
-300    $a 2 videocassettes (229 min.) : $b sd., col. ; $c 1/2 in.
-(Bad indicator data. Skipping 2 bytes)
-520    $a A series of speakers recounts advances in nursing research from 1986 to 1996. ˜
-(Bad indicator data. Skipping 2 bytes)
-538    $a VHS.
-(Bad indicator data. Skipping 2 bytes)
-650  2 $a Nursing Care $x videocassettes
-(Bad indicator data. Skipping 2 bytes)
-650  2 $a Nursing Research $x videocassettes
-(Bad indicator data. Skipping 2 bytes)
-650  2 $a Nursing $x videocassettes
-(Bad indicator data. Skipping 2 bytes)
-700 10 $a Grady, Patricia Anne, $d 1943-
-(Bad indicator data. Skipping 2 bytes)
-700 1  $a Varmus, Harold
-(Bad indicator data. Skipping 2 bytes)
-910    $a 178448 $b Horizon bib#
-(Bad indicator data. Skipping 2 bytes)
-949 31 $7 1 $5 WY 20.5 VC6 1996 $0 26 $0 G $2 A $8 5 $4 1
-(Bad indicator data. Skipping 2 bytes)
-991    $a WY 20.5 VC6 1996 $f nlm $b wnlm $c c. 1 $q 0 $i 3199765 $l wempbk $m elsc
-(Bad indicator data. Skipping 2 bytes)
-991    $a WY 20.5 VC6 1996 $f nlm $b wnlm $c c. 1 $q 0 $i 3199766 $l wempbk $m elsc
-