Cumulative update

pulibrary · Jul 30, 2018 · 523cf54 · 523cf54
1 parent 8949baa
commit 523cf54
Show file tree

Hide file tree

Showing 8 changed files with 1,773 additions and 48 deletions.
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.6.0
+0.7.0
diff --git a/lib/marc_cleanup.rb b/lib/marc_cleanup.rb
@@ -5,4 +5,5 @@
 require_relative 'marc_cleanup/bib_marc_fixes'
 require_relative 'marc_cleanup/bib_rubymarc_fixes'
 require 'marc'
+require 'uri'
 include MarcCleanup
diff --git a/lib/marc_cleanup/bib_marc_fixes.rb b/lib/marc_cleanup/bib_marc_fixes.rb
@@ -4,11 +4,23 @@ def controlcharfix(record)
     record.force_encoding('binary')
     fixed_record = ''
     leader = record.slice(0..LEADER_LENGTH - 1)
-    fixed_record << leader
-    base_address = leader[12..16].to_i
+    leader_size = leader[0..4]
+    leader_status = 'c'
+    leader_type_to_ctrl = leader[6..8]
+    leader_coding = 'a'
+    leader_counts = '22'
+    leader_base = leader[12..16]
+    leader_encoding = leader[17] =~ /[^1-8uzIJKLM ]/ ? 'u' : leader[17]
+    leader_cat_form = leader[18] =~ /[^aciu\s]/ ? 'u' : leader[18]
+    leader_multipart = leader[19] =~ /[^abcr ]/ ? ' ' : leader[19]
+    leader_end = '4500'
+    base_address = leader_base.to_i
+    new_leader = [leader_size, leader_status, leader_type_to_ctrl, leader_coding, leader_counts, leader_base, leader_encoding, leader_cat_form, leader_multipart, leader_end].join('')
+    fixed_record << new_leader
     directory = record[LEADER_LENGTH..base_address - 2]
     num_fields = directory.length / DIRECTORY_ENTRY_LENGTH
     mba = record.bytes.to_a
+    directory.force_encoding('UTF-8')
     fixed_record << directory
     fixed_record << END_OF_FIELD
     new_directory = ''
@@ -17,36 +29,41 @@ def controlcharfix(record)
       entry_start = field_num * DIRECTORY_ENTRY_LENGTH
       entry_end = entry_start + DIRECTORY_ENTRY_LENGTH
       entry = directory[entry_start..entry_end]
+      next unless entry
       tag = entry[0..2]
       length = entry[3..6].to_i
       offset = entry[7..11].to_i
       fixed_field = ''
       field_start = base_address + offset
       field_end = field_start + length - 1
+      next unless mba[field_start..field_end]
       field_data = mba[field_start..field_end].pack('c*')
       field_data.force_encoding('UTF-8')
+      field_data.scrub!('')
       if tag =~ /00[1-9]/
         field_data.gsub!(char_regex, '')
         fixed_field << field_data
       else
         field_data.gsub!(/[#{END_OF_FIELD}]/, '')
         subfields = field_data.split(SUBFIELD_INDICATOR)
         indicators = subfields.shift
+        indicators = '  ' if indicators.nil?
         fixed_field << indicators
         subfields.each do |subfield|
           next if subfield.nil?
           fixed_subfield = subfield.gsub(char_regex, '')
           fixed_field << SUBFIELD_INDICATOR
           fixed_field << fixed_subfield
         end
+        fixed_field << END_OF_FIELD
+        fixed_field.force_encoding('UTF-8')
+        fixed_record << fixed_field
+        field_length = fixed_field.respond_to?(:bytesize) ? fixed_field.bytesize : fixed_field.length
+        new_directory << format('%03s', tag)
+        new_directory << format('%04i', field_length)
+        new_directory << format('%05i', new_offset)
+        new_offset += field_length
       end
-      fixed_field << END_OF_FIELD
-      fixed_record << fixed_field
-      field_length = fixed_field.respond_to?(:bytesize) ? fixed_field.bytesize : fixed_field.length
-      new_directory << format('%03s', tag)
-      new_directory << format('%04i', field_length)
-      new_directory << format('%05i', new_offset)
-      new_offset += field_length
     end
     fixed_record << END_OF_RECORD
     fixed_length = fixed_record.respond_to?(:bytesize) ? fixed_record.bytesize : fixed_record.length