mabmapper 1.0.0.pre18 → 2.0.0

data/lib/mabmapper/aleph_mab_xml_engine.rb

@@ -8,7 +8,7 @@ module Mabmapper
     # Id
     #
     field :id do
-      doc.controlfield('SYS').join
+      source.controlfield('SYS').values.join
     end
 
     #
@@ -18,14 +18,14 @@ module Mabmapper
       value = 'A'
 
       # gelöscht -> LDR Position 6 == 'd'
-      value = 'D' if doc.controlfield('LDR').at(5) == 'd'
+      value = 'D' if source.controlfield('LDR').at(5) == 'd'
       # ausgesondert über Feld 078
-      value = 'D' if doc.field('078', ind1: 'r').subfield('a').get.value.try(:downcase) == 'aus'
+      value = 'D' if source.datafields('078', ind1: 'r').subfields('a').value.try(:downcase) == 'aus'
       # Standort Detmold unterdrücken
-      detmold_locations = doc.field('LOC').subfield('n').get.values.flatten
+      detmold_locations = source.datafields('LOC').subfields('n').values.flatten
       value = 'D' if detmold_locations.present? && detmold_locations.all?{|v| v == '50'}
       # Interimsaufnahmen unterdrücken
-      value = 'D' if doc.field('537', ind1: '-', ind2: '1').subfield('a').get.values.flatten.any? { |v| v.downcase.include? 'interimsaufnahme' }
+      value = 'D' if source.datafields('537', ind1: '-', ind2: '1').subfields('a').values.flatten.any? { |v| v.downcase.include? 'interimsaufnahme' }
 
       value
     end
@@ -34,21 +34,21 @@ module Mabmapper
     # HT Nummer
     #
     field :ht_number do
-      doc.field('001', ind2: '1').subfield('a').get.value
+      source.datafields('001', ind2: '1').subfields('a').value
     end
 
     #
     # Creation date
     #
     field :creation_date do
-      doc.field('LOC', ind2: ' ').subfield('k').get.values.flatten.map(&:presence).compact.uniq
+      source.datafields('LOC', ind2: :blank).subfields('k').values.flatten.map(&:presence).compact.uniq
     end
 
     #
     # Materialtyp
     #
     field :materialtyp do
-      f050 = doc.controlfield('050')
+      f050 = source.controlfield('050')
       type = case
       when (%w(a    ).include?(f050.at( 0)) ) then 'print'
       when (%w(a b c).include?(f050.at( 3)) ) then 'microform'
@@ -68,10 +68,10 @@ module Mabmapper
     # Inhaltstyp
     #
     field :inhaltstyp do
-      f051  = doc.controlfield('051')
-      f052  = doc.controlfield('052')
-      f051s = f051.join.slice(1..3) || ""
-      f052s = f052.join.slice(1..6) || ""
+      f051  = source.controlfield('051')
+      f052  = source.controlfield('052')
+      f051s = f051.values.join.slice(1..3) || ""
+      f052s = f052.values.join.slice(1..6) || ""
 
       type = case
       # Monos
@@ -112,7 +112,7 @@ module Mabmapper
       # Bandzählung von Reihen
       volumes = []
       (456..496).step(10) do |f|
-        value = doc.field("#{f}", ind2: '1').subfield('a').get.value
+        value = source.datafields("#{f}", ind2: '1').subfields('a').value
         volumes << value if value.present?
       end
       volumes.first
@@ -122,20 +122,20 @@ module Mabmapper
     # Title
     #
     field :title do
-      f331_2 = doc.field('331', ind2: '2').subfield('a').get.value
-      f333_2 = doc.field('333', ind2: '2').subfield('a').get.value
-      f335_2 = doc.field('335', ind2: '2').subfield('a').get.value
-      f360_2 = doc.field('360', ind2: '2').subfield('a').get.value
-
-      f089_1 = doc.field('089', ind2: '1').subfield('a').get.value
-      f331_1 = doc.field('331', ind2: '1').subfield('a').get.value
-      f333_1 = doc.field('333', ind2: '1').subfield('a').get.value
-      f335_1 = doc.field('335', ind2: '1').subfield('a').get.value
-      f360_1 = doc.field('360', ind2: '1').subfield('a').get.value
-      f304_1 = doc.field('304', ind2: '1').subfield('a').get.value
-      f310_1 = doc.field('310', ind2: '1').subfield('a').get.value
-      f340_1 = doc.field('340', ind2: '1').subfield('a').get.value
-      f341_1 = doc.field('341', ind2: '1').subfield('a').get.value
+      f331_2 = source.datafields('331', ind2: '2').subfields('a').value
+      f333_2 = source.datafields('333', ind2: '2').subfields('a').value
+      f335_2 = source.datafields('335', ind2: '2').subfields('a').value
+      f360_2 = source.datafields('360', ind2: '2').subfields('a').value
+
+      f089_1 = source.datafields('089', ind2: '1').subfields('a').values.join(" ").presence # can occur multple times
+      f331_1 = source.datafields('331', ind2: '1').subfields('a').value
+      f333_1 = source.datafields('333', ind2: '1').subfields('a').value
+      f335_1 = source.datafields('335', ind2: '1').subfields('a').value
+      f360_1 = source.datafields('360', ind2: '1').subfields('a').value
+      f304_1 = source.datafields('304', ind2: '1').subfields('a').value
+      f310_1 = source.datafields('310', ind2: '1').subfields('a').value
+      f340_1 = source.datafields('340', ind2: '1').subfields('a').value
+      f341_1 = source.datafields('341', ind2: '1').subfields('a').value
 
       title = merge(title, f331_2, delimiter: '. ')
       title = merge(title, f333_2, delimiter: ' / ')
@@ -163,35 +163,42 @@ module Mabmapper
     end
 
     field :short_title_display do
-      f089_1 = doc.field('089', ind2: '1').subfield('a').get.value                   # Bandangabe in Vorlageform
-      f310_1 = doc.field('310', ind1: ['-', 'a'], ind2: '1').subfield('a').get.value # Hauptsachtitel in Ansetzungsform
-      f331_1 = doc.field('331', ind2: '1').subfield('a').get.value                   # Hauptsachtitel in Vorlageform oder Mischform
-      f331_2 = doc.field('331', ind2: '2').subfield('a').get.value                   #
-      f334_1 = doc.field('334', ind1: '-', ind2: '1').get.value                      # Allgemeine Materialbenennung
-      f335_1 = doc.field('335', ind2: '1').subfield('a').get.value                   # Zusätze zum Hauptsachtitel
-
-      short_title = if f310_1
-        f310_1
-      elsif (f331_1 && f334_1 && f335_1)
-        "#{f331_1} [#{f334_1}] : #{f335_1}"
-      elsif (f331_1 && f335_1)
-        "#{f331_1} : #{f335_1}"
-      elsif f331_1 && f334_1
-        "#{f331_1} [#{f334_1}]"
-      elsif f331_1
-        f331_1
-      elsif f089_1 && f089_1.length > 3 && f089_1[/\A(\d|\s)+\Z/].nil? && !['buch', 'hauptbd.'].include?(f089_1.gsub(/\[|\]/, '').downcase)
-        f089_1.gsub(/.*(bd|Bd).*\,/, '') # Try to remove volume count from
-      elsif f331_2
-        f331_2
-      else
-        ''
-      end
+      bandangabe_in_vorlageform                     = source.datafields('089', ind2: '1').subfields('a').values.join(" ")
+      hauptsachtitel_in_ansetzungsform              = source.datafields('310', ind1: ['-', 'a'], ind2: '1').subfields('a').value
+      hauptsachtitel_in_vorlageform                 = source.datafields('331', ind2: '1').subfields('a').value
+      hauptsachtitel_der_überordnung_in_vorlageform = source.datafields('331', ind2: '2').subfields('a').value
+      allgemeine_materialbenennung                  = source.datafields('334', ind1: '-', ind2: '1').value
+      zusätze_zum_hauptsachtitel                    = source.datafields('335', ind2: '1').subfields('a').value
+
+      # helper
+      bandangabe_may_be_used_as_title = -> (bandangabe) {
+        has_minimal_length = bandangabe_in_vorlageform.length > 3
+        does_not_only_contain_numbers_or_spaces = bandangabe_in_vorlageform[/\A(\d|\s)+\Z/].nil?
+        is_no_well_known_identifier = !['buch', 'hauptbd.'].include?(bandangabe_in_vorlageform.gsub(/\[|\]/, '').downcase)
+
+        has_minimal_length && does_not_only_contain_numbers_or_spaces && is_no_well_known_identifier
+      }
 
-      short_title.gsub!(/<<|>>/, '')
-      short_title.strip!
-      short_title[0] = short_title[0].upcase if short_title.present?
-      short_title.presence
+      if hauptsachtitel_in_ansetzungsform
+        hauptsachtitel_in_ansetzungsform
+      elsif hauptsachtitel_in_vorlageform
+        [
+          "#{hauptsachtitel_in_vorlageform}",
+          if allgemeine_materialbenennung then "[#{allgemeine_materialbenennung}]" end,
+          if zusätze_zum_hauptsachtitel   then ": #{zusätze_zum_hauptsachtitel}"   end
+        ]
+        .compact.join(" ")
+      elsif bandangabe_may_be_used_as_title.call(bandangabe_in_vorlageform)
+        bandangabe_in_vorlageform.gsub(/.*(bd|Bd).*\,/, '') # Try to remove volume count from
+      elsif hauptsachtitel_der_überordnung_in_vorlageform
+        hauptsachtitel_der_überordnung_in_vorlageform
+      end
+      .try do |_title|
+        _title.gsub(/<<|>>/, '').strip.presence
+      end
+      .try do |_cleaned_title|
+        _cleaned_title[0].upcase << _cleaned_title[1..-1]
+      end
     end
 
     field :title_search do
@@ -199,24 +206,24 @@ module Mabmapper
       search_titles << ref(:title_display)
 
       (342..355).each do |f|
-        search_titles << doc.field("#{f}", ind2: '1').subfield('a').get.values
+        search_titles << source.datafields("#{f}", ind2: '1').subfields('a').values
       end
 
-      search_titles << doc.field('370', ind2: '1').subfield('a').get.values
+      search_titles << source.datafields('370', ind2: '1').subfields('a').values
 
-      search_titles << doc.field('376', ind2: '1').subfield('a').get.values
+      search_titles << source.datafields('376', ind2: '1').subfields('a').values
       (451..491).step(10).each do |f|
-        search_titles << doc.field("#{f}", ind2: '1').subfield('a').get.values
+        search_titles << source.datafields("#{f}", ind2: '1').subfields('a').values
       end
-      search_titles << doc.field('502', ind2: '1').subfield('a').get.values
-      search_titles << doc.field('504', ind2: '1').subfield('a').get.values
-      search_titles << doc.field('505', ind2: '1').subfield('a').get.values
+      search_titles << source.datafields('502', ind2: '1').subfields('a').values
+      search_titles << source.datafields('504', ind2: '1').subfields('a').values
+      search_titles << source.datafields('505', ind2: '1').subfields('a').values
       (526..534).each do |f|
-        search_titles << doc.field("#{f}", ind2: '1').subfield('a').get.values
+        search_titles << source.datafields("#{f}", ind2: '1').subfields('a').values
       end
-      search_titles << doc.field('621', ind2: '1').subfield('a').get.values
-      search_titles << doc.field('627', ind2: '1').subfield('a').get.values
-      search_titles << doc.field('633', ind2: '1').subfield('a').get.values
+      search_titles << source.datafields('621', ind2: '1').subfields('a').values
+      search_titles << source.datafields('627', ind2: '1').subfields('a').values
+      search_titles << source.datafields('633', ind2: '1').subfields('a').values
 
       search_titles
       .flatten
@@ -242,26 +249,26 @@ module Mabmapper
 
       # Personen
       (100..196).step(4) do |f|
-        doc.field("#{f}", ind1: ['-', 'a'], ind2: ['1', '2']).get.fields.each do |field|
-          creators << (field.get_subfield('a').try(:value) || field.get_subfield('p').try(:value) || field.get_subfield('c').try(:value))
+        source.datafields("#{f}", ind1: ['-', 'a'], ind2: ['1', '2']).each do |datafield|
+          creators << (datafield.subfields('a').value || datafield.subfields('p').value || datafield.subfields('c').value)
         end
       end
 
-      creators.map(&:presence).compact.uniq
+      creators.map(&:presence).compact.uniq.map { |element| element.gsub(/<<|>>/, '') }
     end
 
-    def self.corporate_body_from_field(field)
-      subfield_a = field.get_subfield('a').try(:value) # Körperschafts-/Kongressname/Geografikum ohne IDN-Verknüpfung (NW)
-      subfield_b = field.get_subfield('b').try(:value) # Unterordnung
-      subfield_c = field.get_subfield('c').try(:value) # Ort (NW)
-      subfield_d = field.get_subfield('d').try(:value) # Datum (NW)
-      subfield_e = field.get_subfield('e').try(:value) # Kongressname (NW)
-      subfield_g = field.get_subfield('g').try(:value) # Name des Geografikums (NW)
-      subfield_h = field.get_subfield('h').try(:value) # Zusatz
-      subfield_k = field.get_subfield('k').try(:value) # Körperschaftsname (NW)
-      subfield_n = field.get_subfield('n').try(:value) # Zählung (W)
-      subfield_x = field.get_subfield('x').try(:value) # nachgeordneter Teil (W)
-      subfield_z = field.get_subfield('x').try(:value) # geografische Unterteilung (W)
+    def self.corporate_body_from_field(datafield)
+      subfield_a = datafield.subfields('a').value # Körperschafts-/Kongressname/Geografikum ohne IDN-Verknüpfung (NW)
+      subfield_b = datafield.subfields('b').value # Unterordnung
+      subfield_c = datafield.subfields('c').value # Ort (NW)
+      subfield_d = datafield.subfields('d').value # Datum (NW)
+      subfield_e = datafield.subfields('e').value # Kongressname (NW)
+      subfield_g = datafield.subfields('g').value # Name des Geografikums (NW)
+      subfield_h = datafield.subfields('h').value # Zusatz
+      subfield_k = datafield.subfields('k').value # Körperschaftsname (NW)
+      subfield_n = datafield.subfields('n').value # Zählung (W)
+      subfield_x = datafield.subfields('x').value # nachgeordneter Teil (W)
+      subfield_z = datafield.subfields('x').value # geografische Unterteilung (W)
 
       if !subfield_a && subfield_b && !subfield_c && !subfield_e && !subfield_g && subfield_h && subfield_k && !subfield_x && !subfield_z
         "#{subfield_k} <#{subfield_h}> / #{subfield_b}"
@@ -282,7 +289,7 @@ module Mabmapper
 
       # Körpferschaften
       (200..296).step(4) do |f|
-        doc.field("#{f}", ind1: ['-', 'a'], ind2: ['1', '2']).get.fields.each do |field|
+        source.datafields("#{f}", ind1: ['-', 'a'], ind2: ['1', '2']).each do |field|
           creators << engine.corporate_body_from_field(field)
         end
       end
@@ -291,8 +298,8 @@ module Mabmapper
     end
 
     field :author_statement do
-      f359_1 = doc.field('359', ind1:"-", ind2:'1').subfield('a').get.values.flatten.presence
-      f359_2 = doc.field('359', ind1:"-", ind2:'2').subfield('a').get.values.flatten.presence
+      f359_1 = source.datafields('359', ind1: :blank, ind2:'1').subfields('a').values.flatten.presence
+      f359_2 = source.datafields('359', ind1: :blank, ind2:'2').subfields('a').values.flatten.presence
       f359_1 || f359_2
     end
 
@@ -304,9 +311,9 @@ module Mabmapper
 
       # Personen
       (100..196).step(4) do |f|
-        doc.field("#{f}", ind1: ['b', 'c', 'e', 'f'], ind2: ['1', '2']).get.fields.each do |field|
-          name = (field.get_subfield('a').try(:value) || field.get_subfield('p').try(:value) || field.get_subfield('c').try(:value))
-          action_designator = field.get_subfield('b').try(:value)
+        source.datafields("#{f}", ind1: ['b', 'c', 'e', 'f'], ind2: ['1', '2']).each do |datafield|
+          name = (datafield.subfields('a').value || datafield.subfields('p').value || datafield.subfields('c').value)
+          action_designator = datafield.subfields('b').value
           contributors << [name, action_designator].map(&:presence).compact.join(' ')
         end
       end
@@ -319,7 +326,7 @@ module Mabmapper
 
       # Körpferschaften
       (200..296).step(4) do |f|
-        doc.field("#{f}", ind1: ['b', 'c', 'e', 'f'], ind2: ['1', '2']).get.fields.each do |field|
+        source.datafields("#{f}", ind1: ['b', 'c', 'e', 'f'], ind2: ['1', '2']).each do |field|
           contributors << engine.corporate_body_from_field(field)
         end
       end
@@ -332,16 +339,16 @@ module Mabmapper
 
       # Personen
       (100..196).step(4) do |f|
-        creators << doc.field("#{f}", ind2: ['1', '2']).subfield(['a','p','c','n','b']).get.value
+        creators << source.datafields("#{f}", ind2: ['1', '2']).map { |_field| _field.subfields(['a','p','n','c','b']).values.presence.try(:join, " ") }
       end
 
       # Körperschaften
       (200..296).step(4) do |f|
-        creators << doc.field("#{f}", ind2: ['1', '2']).subfield(['a','k','b','e','c','n','g','h']).get.value
+        creators << source.datafields("#{f}", ind2: ['1', '2']).map { |_field| _field.subfields(['a','k','b','e','n','c','g','h']).values.presence.try(:join, " ") }
       end
 
       # Sonderfall: Verfasserangaben aus 359 -> [u.a.]
-      t = doc.field("359", ind2: '1').subfield('a').get.value.presence
+      t = source.datafields("359", ind2: '1').subfields('a').value
       creators << '[u.a.]' if t && t.match(/\.\.\.|\[u\.a\.\]/i)
 
       # Cleanup
@@ -371,15 +378,15 @@ module Mabmapper
       creators.reject!{|e| e == '[u.a.]'}
 
       # + Index Felder für Personen
-      creators << doc.field('PPE').subfield(['a', 'p']).get.values
+      creators << source.datafields('PPE').subfields(['a', 'p']).values
 
       # + zweiteilige Nebeneintragungen / beigefügte oder enthaltene Werke
       (800..824).step(6) do |f|
-        creators << doc.field("#{f}").subfield(['a','p','c','n','b']).get.values
+        creators << source.datafields("#{f}").subfields(['a','p','c','n','b']).values
       end
 
       # + Index Felder für Körperschaften
-      creators << doc.field('PKO').subfield(['a','k','b','e','g']).get.values
+      creators << source.datafields('PKO').subfields(['a','k','b','e','g']).values
 
       # Füge alle Teile zusammen
       creators = creators.flatten.compact
@@ -393,9 +400,9 @@ module Mabmapper
     # Edition
     #
     field :edition do
-      f403_1 = doc.field('403', ind2: '1').subfield('a').get.value
-      f403_2 = doc.field('403', ind2: '2').subfield('a').get.value
-      f407_1 = doc.field('407', ind2: '1').subfield('a').get.value
+      f403_1 = source.datafields('403', ind2: '1').subfields('a').value
+      f403_2 = source.datafields('403', ind2: '2').subfields('a').value
+      f407_1 = source.datafields('407', ind2: '1').subfields('a').value
 
       f403_1.presence || f403_2.presence || f407_1.presence
     end
@@ -404,62 +411,83 @@ module Mabmapper
     # Publisher
     #
     field :publisher do
-      # Verlagsort
-      f410_1 = doc.field('410', ind2: '1').subfield('a').get.value
-      f410_2 = doc.field('410', ind2: '2').subfield('a').get.value
-      f415_1 = doc.field('415', ind2: '1').subfield('a').get.value
-      f415_2 = doc.field('415', ind2: '2').subfield('a').get.value
+      publisher = []
+
+      is_rda_record = source.datafields('419').present?
 
-      f410 = f410_1.presence or f410_2.presence
-      f415 = f415_1.presence or f415_2.presence
+      if is_rda_record
+        source.datafields('419').each do |_veröffentlichungsangabe|
+          verlagsorte = _veröffentlichungsangabe.subfields('a').values.first.try(:split, ';').try(:map!, &:strip)
+          verlagsname = _veröffentlichungsangabe.subfields('b').value
+          erster_verlagsort = verlagsorte.try(:first)
 
-      # Verleger
-      f412_1 = doc.field('412', ind2: '1').subfield('a').get.value
-      f412_2 = doc.field('412', ind2: '2').subfield('a').get.value
-      f417_1 = doc.field('417', ind2: '1').subfield('a').get.value
-      f417_2 = doc.field('417', ind2: '2').subfield('a').get.value
+          if verlagsname.present?
+            publisher << [erster_verlagsort, verlagsname].compact.join(" : ")
+          end
+        end
+      else # is rak record
+        orte_der_ersten_verleger                  = source.datafields('410', ind2: '1').subfields('a').values.presence
+        orte_der_ersten_verleger_der_überordnung  = source.datafields('410', ind2: '2').subfields('a').values.presence
+        orte_der_zweiten_verleger                 = source.datafields('415', ind2: '1').subfields('a').values.presence
+        orte_der_zweiten_verleger_der_überordnung = source.datafields('415', ind2: '2').subfields('a').values.presence
 
-      f412 = f412_1.presence or f412_2.presence
-      f417 = f417_1.presence or f417_2.presence
-      # ... weitere Verleger in 418 ohne Ortsangabe ignorieren wir
+        orte_der_ersten_verleger  ||= orte_der_ersten_verleger_der_überordnung
+        orte_der_zweiten_verleger ||= orte_der_zweiten_verleger_der_überordnung
 
-      publisher = []
-      publisher << [f410, f412].map(&:presence).compact.join(' : ')
-      publisher << [f415, f417].map(&:presence).compact.join(' : ')
-      publisher.map(&:presence).compact.map { |element| element.gsub(/<<|>>/, '') }
+        namen_der_ersten_verleger                  = source.datafields('412', ind2: '1').subfields('a').values.presence
+        namen_der_ersten_verleger_der_überordnung  = source.datafields('412', ind2: '2').subfields('a').values.presence
+        namen_der_zweiten_verleger                 = source.datafields('417', ind2: '1').subfields('a').values.presence
+        namen_der_zweiten_verleger_der_überordnung = source.datafields('417', ind2: '2').subfields('a').values.presence
+
+        namen_der_ersten_verleger  ||= namen_der_ersten_verleger_der_überordnung
+        namen_der_zweiten_verleger ||= namen_der_zweiten_verleger_der_überordnung
+
+        # ... weitere Verleger in 418 ohne Ortsangabe ignorieren wir
+
+        erste_verleger = namen_der_ersten_verleger
+        .try(:map).try(:with_index) do |_name_eines_ersten_verlegers, _index|
+          [orte_der_ersten_verleger.try(:[], _index), _name_eines_ersten_verlegers].compact.join(" : ")
+        end
+
+        zweite_verleger = namen_der_zweiten_verleger
+        .try(:map).try(:with_index) do |_name_eines_zweiten_verlegers, _index|
+          [orte_der_zweiten_verleger.try(:[], _index), _name_eines_zweiten_verlegers].compact.join(" : ")
+        end
+
+        publisher.concat(erste_verleger) if erste_verleger.present?
+        publisher.concat(zweite_verleger) if zweite_verleger.present?
+      end
+
+      publisher.map! { |_verleger| _verleger.gsub(/<<|>>/, '') }
     end
 
     #
     # Creation date
     #
     field :creationdate do
-      f051 = doc.controlfield('051')
-      f052 = doc.controlfield('052')
-
-      f425_a1 = doc.field('425', ind1: 'a', ind2: '1').subfield('a').get.value # Erscheinungsjahr in Sortierform
-      f425_b1 = doc.field('425', ind1: 'b', ind2: '1').subfield('a').get.value # Erscheinungsjahr in Sortierform des frühsten Bandes
-      f425_c1 = doc.field('425', ind1: 'c', ind2: '1').subfield('a').get.value # Erscheinungsjahr in Sortierform des letzten Bandes
-      f425_p1 = doc.field('425', ind1: 'p', ind2: '1').subfield('a').get.value # Erscheinungsjahr in Sortierform eines Tonträgers
-      f595    = doc.field('595').get.value                                     # Erscheinungsjahr der Quelle
-
-      if f595.present?
-        f595 # Erscheinungsjahr der Quelle hat Vorrang vor dem eigentlichen Erscheinungsjahr (falls vorhanden)
-      elsif %w(n t).include?(f051.at(0)) or %w(r p).include?(f052.at(0)) # es handelt sich um eine Überordnung
-        if f425_b1.present? and f425_c1.present?
-          if f425_b1 == f425_c1
-            f425_b1
-          else
-            "#{f425_b1} – #{f425_c1}"
-          end
-        elsif f425_b1.present? and not f425_c1.present?
-          "#{f425_b1} –"
-        elsif f425_c1.present? and not f425_b1.present?
-          "– #{f425_c1}"
-        else
-          f425_a1.presence || f425_p1.presence
-        end
+      is_superorder = begin
+        f051 = source.controlfield('051')
+        f052 = source.controlfield('052')
+
+        %w(n t).include?(f051.at(0)) || %w(r p).include?(f052.at(0))
+      end
+
+      erscheinungsjahr_in_ansetzungsform  = source.datafields('425', ind1: 'a', ind2: '1').subfields('a').value
+      erscheinungsjahr_des_ersten_bandes  = source.datafields('425', ind1: 'b', ind2: '1').subfields('a').value
+      erscheinungsjahr_des_letzten_bandes = source.datafields('425', ind1: 'c', ind2: '1').subfields('a').value
+      publikationsdatum_bei_tonträgern    = source.datafields('425', ind1: 'p', ind2: '1').subfields('a').value
+      erscheinungsjahr_der_quelle         = source.datafields('595').value
+
+      if erscheinungsjahr_der_quelle
+        erscheinungsjahr_der_quelle # hat Vorrang vor dem eigentlichen Erscheinungsjahr
+      elsif is_superorder && (erscheinungsjahr_des_ersten_bandes || erscheinungsjahr_des_letzten_bandes)
+        [
+          erscheinungsjahr_des_ersten_bandes,
+          erscheinungsjahr_des_letzten_bandes
+        ]
+        .uniq.join(" - ").strip # returns either "xxxx -", "xxxx - yyyy" or "- yyyy"
       else
-        f425_a1.presence || f425_p1.presence
+        erscheinungsjahr_in_ansetzungsform || publikationsdatum_bei_tonträgern
       end
     end
 
@@ -474,11 +502,11 @@ module Mabmapper
     # Format
     #
     field :format do
-      f433 = doc.field('433', ind2: '1').subfield('a').get.value
-      f434 = doc.field('434', ind2: '1').subfield('a').get.values.join(', ')
-      f435 = doc.field('435', ind2: '1').subfield('a').get.value
-      f437 = doc.field('437', ind2: '1').subfield('a').get.value
-      f653 = doc.field('653', ind2: '1').subfield('a').get.values.join(', ')
+      f433 = source.datafields('433', ind2: '1').subfields('a').value
+      f434 = source.datafields('434', ind2: '1').subfields('a').values.join(', ')
+      f435 = source.datafields('435', ind2: '1').subfields('a').value
+      f437 = source.datafields('437', ind2: '1').subfields('a').value
+      f653 = source.datafields('653', ind2: '1').subfields('a').values.join(', ')
 
       format = f433
       format = merge(format, f434, delimiter: ' : ')
@@ -493,16 +521,16 @@ module Mabmapper
     # Is part of
     #
     field :is_part_of do
-      f525   = doc.field('525', ind2: '1').subfield(['p','a']).get.value(join_subfields: ': ')
-      f590   = doc.field('590', ind2: '1').subfield('a').get.value
-      f591   = doc.field('591', ind2: '1').subfield('a').get.value
-      f592   = doc.field('592', ind2: '1').subfield('a').get.value
-      f593   = doc.field('593', ind2: '1').subfield('a').get.value
-      f594   = doc.field('594', ind2: '1').subfield('a').get.value
-      f595   = doc.field('595', ind2: '1').subfield('a').get.value
-      f596   = doc.field('596', ind2: '1').subfield('a').get.value
-      f597   = doc.field('597', ind2: '1').subfield('a').get.value
-      f598   = doc.field('598', ind2: '1').subfield('a').get.value
+      f525   = source.datafields('525', ind2: '1').subfields(['p','a']).values.presence.try(:join, ': ')
+      f590   = source.datafields('590', ind2: '1').subfields('a').value
+      f591   = source.datafields('591', ind2: '1').subfields('a').value
+      f592   = source.datafields('592', ind2: '1').subfields('a').value
+      f593   = source.datafields('593', ind2: '1').subfields('a').value
+      f594   = source.datafields('594', ind2: '1').subfields('a').value
+      f595   = source.datafields('595', ind2: '1').subfields('a').value
+      f596   = source.datafields('596', ind2: '1').subfields('a').value
+      f597   = source.datafields('597', ind2: '1').subfields('a').value
+      f598   = source.datafields('598', ind2: '1').subfields('a').value
 
       #f599_1 = doc.datafield('599', ind1: 'a,b', ind2: '1', subfield: 'a', multiple: true).join(' ') # ISSN
       #f599_2 = doc.datafield('599', ind1: 'c,d', ind2: '1', subfield: 'a', multiple: true).join(' ') # ISBN
@@ -533,9 +561,15 @@ module Mabmapper
     #
     field :isbn do
       isbns = []
-      isbns << doc.field('540', ind1: '-z', ind2: '1').subfield('a').get.values
-      isbns << doc.field('634', ind1: '-z', ind2: '1').subfield('a').get.values
-      isbns << doc.field('086', ind2: '1').subfield(['b','c','d']).get.values
+      source.datafields('540', ind2: '1').each do |_datafield|
+        isbns << _datafield.subfields('a').values if _datafield.ind1 != "z"
+      end
+
+      source.datafields('634', ind2: '1').each do |_datafield|
+        isbns << _datafield.subfields('a').values if _datafield.ind1 != "z"
+      end
+
+      isbns << source.datafields('086', ind2: '1').subfields(['b','c','d']).values
       isbns.flatten.map{|v| v.gsub(/[^0-9\-x]/i, '').strip if v.present?}.map(&:presence).compact.uniq
     end
 
@@ -544,9 +578,15 @@ module Mabmapper
     #
     field :issn do
       issns = []
-      issns << doc.field('542', ind1: '-z', ind2: '1').subfield('a').get.values
-      issns << doc.field('635', ind1: '-z', ind2: '1').subfield('a').get.values
-      issns << doc.field('545', ind2: '1').subfield(['a','b','c','d']).get.values
+      source.datafields('542', ind2: '1').each do |_datafield|
+        issns << _datafield.subfields('a').values if _datafield.ind1 != "z"
+      end
+
+      source.datafields('635', ind2: '1').each do |_datafield|
+        issns << _datafield.subfields('a').values if _datafield.ind1 != "z"
+      end
+
+      issns << source.datafields('545', ind2: '1').subfields(['a','b','c','d']).values
       issns.flatten.map{|v| v.gsub(/[^0-9\-x]/i, '').strip if v.present?}.map(&:presence).compact.uniq
     end
 
@@ -555,7 +595,7 @@ module Mabmapper
     #
     field :zdb_id do
       zdb_ids = []
-      zdb_ids << doc.field('025', ind1: 'z',  ind2: '1').subfield('a').get.values
+      zdb_ids << source.datafields('025', ind1: 'z',  ind2: '1').subfields('a').values
       zdb_ids.flatten.map(&:presence).compact.uniq
     end
 
@@ -565,11 +605,11 @@ module Mabmapper
     field :subject do
       subjects = []
 
-      subjects << doc.field('902').subfield(['a','p','k','s','g','e','t']).get.values
+      subjects << source.datafields('902').subfields(['a','p','k','s','g','e','t']).values
 
       # Beispiel aus 740: New York (N.Y.)--Social life and customs--20th century--Fiction.
       %w(710 711 740).each do |f|
-        t = doc.field(f).subfield('a').get.values
+        t = source.datafields(f).subfields('a').values
         t = t.flatten.map(&:presence).compact
         t = t.map{|a| a.split('--')}.flatten.map{|s| s.end_with?('.') ? s[0..-2].strip : s}.map(&:presence).compact.uniq
         subjects = subjects + t
@@ -585,7 +625,7 @@ module Mabmapper
       subjects << ref(:subject)
 
       # + Index Felder für weitere Schlagworte
-      subjects << doc.field('PSW').subfield(['a','k','e','g','s','p','t','f','z']).get.values
+      subjects << source.datafields('PSW').subfields(['a','k','e','g','s','p','t','f','z']).values
 
       subjects.flatten.map(&:presence).compact.map{|f| f.delete('<').delete('>')}.uniq
     end
@@ -595,8 +635,8 @@ module Mabmapper
     #
     field :ddc do
       ddc_fields = []
-      ddc_fields << doc.field('700', ind1: 'b', ind2: '1').subfield('a').get.values
-      ddc_fields << doc.field('705', ind1: ' ', ind2: '1').subfield('a').get.values
+      ddc_fields << source.datafields('700', ind1: 'b', ind2: '1').subfields('a').values
+      ddc_fields << source.datafields('705', ind1: :blank, ind2: '1').subfields('a').values
 
       ddc_fields.flatten.map(&:presence).compact.uniq
     end
@@ -607,9 +647,9 @@ module Mabmapper
     field :abstract do
       abstracts = []
 
-      abstracts << doc.field('750').subfield('a').get.value
-      abstracts << doc.field('753').subfield('a').get.value
-      abstracts << doc.field('756').subfield('a').get.value
+      abstracts << source.datafields('750').subfields('a').value
+      abstracts << source.datafields('753').subfields('a').value
+      abstracts << source.datafields('756').subfields('a').value
 
       abstracts.map(&:presence).compact
     end
@@ -619,7 +659,7 @@ module Mabmapper
     #
     field :language do
       languages = []
-      languages << doc.field('037', ind1: 'b', ind2: ['1','2']).subfield('a').get.values
+      languages << source.datafields('037', ind1: 'b', ind2: ['1','2']).subfields('a').values
       languages.flatten.map(&:presence).compact.uniq
     end
 
@@ -629,14 +669,14 @@ module Mabmapper
     field :relation do
       relations = []
 
-      if (f021a = doc.field('021').subfield('a').get.value).present?
+      if (f021a = source.datafields('021').subfields('a').value).present?
         relations << {
           ht_number: f021a,
           label: 'Primärform'
         }
       end
 
-      if (f022a = doc.field('022').subfield('a').get.value).present?
+      if (f022a = source.datafields('022').subfields('a').value).present?
         relations << {
           ht_number: f022a,
           label: 'Sekundärform'
@@ -644,11 +684,11 @@ module Mabmapper
       end
 
       (526..534).each do |mab_field_number|
-        doc.field("#{mab_field_number}", ind2: '1').get.fields.each do |field|
-          ht_number = field.get_subfield('9').try(:value).presence
+        source.datafields("#{mab_field_number}", ind2: '1').each do |datafield|
+          ht_number = datafield.subfields('9').value
           label = [
-            field.get_subfield('p').try(:value).presence,
-            field.get_subfield('a').try(:value).try(:gsub, /<<|>>/, '').presence
+            datafield.subfields('p').value,
+            datafield.subfields('a').value.try(:gsub, /<<|>>/, '')
           ].compact.join(' ')
 
           relations << {ht_number: ht_number, label: label} if label
@@ -666,23 +706,24 @@ module Mabmapper
 
       # Link zur Überordung eines mehrbändigen Werkes
       superorders << {
-        ht_number: doc.field('010', ind2: '1').subfield('a').get.value,
-        label: doc.field('331', ind2: '2').subfield('a').get.value,
-        volume_count: doc.field('089', ind2: '1').subfield('a').get.value # Bandzählung dieses Werkes innerhalb der entsprechenden Überordnung
+        ht_number: source.datafields('010', ind2: '1').subfields('a').value,
+        label: source.datafields('331', ind2: '2').subfields('a').value,
+        volume_count: source.datafields('089', ind2: '1').subfields('a').values.presence.try(:join, " ") # Bandzählung dieses Werkes innerhalb der entsprechenden Überordnung
       }
 
       # 451 ff
       (451..491).step(10) do |f|
         superorders << {
-          ht_number: doc.field("#{f+2}", ind2: '1').subfield('a').get.value,
-          label: [doc.field("#{f}", ind2: '1').subfield('a').get.value, doc.field("#{f}", ind2: '2').subfield('a').get.value].compact.reject { |label| label[/\A\.\.\.\s+(;|:)/] }.first,
-          volume_count: doc.field("#{f+4}", ind2: '1').subfield('a').get.value
+          ht_number: source.datafields("#{f+2}", ind2: '1').subfields('a').value,
+          label: [source.datafields("#{f}", ind2: '1').subfields('a').value, source.datafields("#{f}", ind2: '2').subfields('a').value].compact.reject { |label| label[/\A\.\.\.\s+(;|:)/] }.first,
+          volume_count: source.datafields("#{f+4}", ind2: '1').subfields('a').value
         }
       end
 
       superorders
       .map(&:presence)
       .delete_if { |element| element[:label].blank? }
+      .deep_dup # to be able tu use .gsub!
       .each do |element|
         # remove 'not sort' indicators from label
         element[:label].try(:gsub!, /<<|>>/, '')
@@ -726,8 +767,8 @@ module Mabmapper
     field :superorder do
       superorders = []
 
-      f623 = doc.field('623').get.value # Identifikationsnummer des 1. GT der Sekundärform
-      f629 = doc.field('629').get.value # Identifikationsnummer des 2. GT der Sekundärform
+      f623 = source.datafields('623').value # Identifikationsnummer des 1. GT der Sekundärform
+      f629 = source.datafields('629').value # Identifikationsnummer des 2. GT der Sekundärform
 
       superorders << if (json_encoded_superorders_display = ref(:superorder_display)).present?
         superorders_display = json_encoded_superorders_display.map { |json_encoded_superorder_display| JSON.parse(json_encoded_superorder_display) }
@@ -744,8 +785,8 @@ module Mabmapper
     # Sind wir eine Überordnung?
     #
     field :is_superorder do
-      f051  = doc.controlfield('051')
-      f052  = doc.controlfield('052')
+      f051  = source.controlfield('051')
+      f052  = source.controlfield('052')
 
       f051.at(0) == 'n' || f051.at(0) == 't' || f052.at(0) == 'p' || f052.at(0) == 'r' || f052.at(0) == 'z'
     end
@@ -761,10 +802,10 @@ module Mabmapper
     # Erscheinungsform
     #
     field :erscheinungsform do
-      f051  = doc.controlfield('051')
-      f052  = doc.controlfield('052')
-      f051s = f051.join.slice(1..3) || ""
-      f052s = f052.join.slice(1..6) || ""
+      f051  = source.controlfield('051')
+      f052  = source.controlfield('052')
+      f051s = f051.values.join.slice(1..3) || ""
+      f052s = f052.values.join.slice(1..6) || ""
 
       type = case
       when (f051.at(0) == 'a') then 'article'
@@ -802,20 +843,20 @@ module Mabmapper
       descriptions = []
 
       # 405 - Erscheinungsverlauf von Zeitschriften
-      descriptions << doc.field('405', ind2: '1').subfield(['a', 'p']).get.values(join_subfields: ': ')
+      descriptions << source.datafields('405', ind2: '1').map { |_field| _field.subfields(['p', 'a']).values.join(': ') }
 
       # 522 - Teilungsvermerk bei fortlaufenden Sammelwerken
-      descriptions << doc.field('522', ind2: '1').subfield(['a', 'p']).get.values(join_subfields: ': ')
+      descriptions << source.datafields('522', ind2: '1').map { |_field| _field.subfields(['p', 'a']).values.join(': ') }
 
       # 523 - Erscheinungsverlauf von Monos
-      descriptions << doc.field('523', ind2: '1').subfield(['a', 'p']).get.values(join_subfields: ': ')
+      descriptions << source.datafields('523', ind2: '1').map { |_field| _field.subfields(['p', 'a']).values.join(': ') }
 
       (501..519).each do |f|
-        descriptions << doc.field("#{f}", ind2: '1').subfield(['a', 'p']).get.values(join_subfields: ': ')
+        descriptions << source.datafields("#{f}", ind2: '1').map { |_field| _field.subfields(['p', 'a']).values.join(': ') }
       end
 
       (536..537).each do |f|
-        descriptions << doc.field("#{f}", ind2: '1').subfield(['a', 'p']).get.values(join_subfields: ': ') unless f == 537 && ref(:erscheinungsform) == "journal"
+        descriptions << source.datafields("#{f}", ind2: '1').map { |_field| _field.subfields(['p', 'a']).values.join(': ') } unless f == 537 && ref(:erscheinungsform) == "journal"
       end
 
       # Finally...
@@ -840,16 +881,16 @@ module Mabmapper
 
     field :volume_count_sort do
       possible_values = []
-      possible_values << doc.field('090', ind2: '1').subfield('a').get.value
-      (451..491).step(10) { |f| possible_values << doc.field("#{f+5}", ind2: '1').subfield('a').get.value }
+      possible_values << source.datafields('090', ind2: '1').subfields('a').value
+      (451..491).step(10) { |f| possible_values << source.datafields("#{f+5}", ind2: '1').subfields('a').value }
       count = possible_values.map(&:presence).compact.uniq.first
       count.rjust(15, '0') if count.present?
     end
 
     field :volume_count_sort2 do
       possible_values = []
-      possible_values << doc.field('090', ind2: '1').subfield('a').get.value
-      (451..491).step(10) { |f| possible_values << doc.field("#{f+5}", ind2: '1').subfield('a').get.value }
+      possible_values << source.datafields('090', ind2: '1').subfields('a').value
+      (451..491).step(10) { |f| possible_values << source.datafields("#{f+5}", ind2: '1').subfields('a').value }
       count = possible_values.map(&:presence).compact.uniq.first
 
       if count.present?
@@ -876,7 +917,7 @@ module Mabmapper
     # Notation
     #
     field :notation do
-      doc.field('700', ind2: ' ').subfield('a').get.values(join_subfields: '')
+      source.datafields('700', ind2: ' ').subfields('a').values
     end
 
     field :notation_sort do
@@ -887,7 +928,7 @@ module Mabmapper
     # Table of contents
     #
     field :toc do
-      doc.field('TXT').subfield('a').get.values.join(' ')
+      source.datafields('TXT').subfields('a').values.join(' ')
     end
 
     #
@@ -897,11 +938,11 @@ module Mabmapper
       signatures = []
 
       # Lade LOC Felder für Signaturen-Extraktion
-      fields = doc.field('LOC').subfield(['b','d','5']).get.fields.presence || []
+      fields = source.datafields('LOC')
       # Lösche alle Felder die kein Unterfeld d haben (ausgesondert)
-      fields = fields.reject{|f| f.subfields.find{|sf| sf.name == "d"}.blank?}
+      fields = fields.reject{|f| f.subfields.find{|sf| sf.code == "d"}.blank?}
       # Prüfe ob alle Exemplare im Magazin stehen
-      all_stack = fields.map{|f| f.subfields.find {|sf| sf.name == 'b' && sf.value.match(/02|03|04|07/)}.present?}.all?
+      all_stack = fields.map{|f| f.subfields.find {|sf| sf.code == 'b' && sf.value.match(/02|03|04|07/)}.present?}.all?
 
       # Zeitschriftensignatur (haben Vorrgang, falls vorhanden)
       #
@@ -909,16 +950,16 @@ module Mabmapper
       # Darüber hinaus kann dieses Feld mehrfach vorkommen. Wir nehmen an, dass Subfeld 0 eine Art Zählung angibt, weshalb dort
       # ein Wert von '1' zu bevorzugen ist.
       #
-      signatures << doc.field('200', ind1: ' ', ind2: ' ').get.fields
-      .select { |f| f.get_subfield('f').present?                  }
-      .select { |f| (value = f.get_subfield('0').try(:value)) == '1' || value.nil? }
-      .map    { |f| f.get_subfield('f').value.try(:gsub, ' ', '') }
+      signatures << source.datafields('200', ind1: ' ', ind2: ' ')
+      .select { |f| f.subfields('f').present?                  }
+      .select { |f| (value = f.subfields('0').value) == '1' || value.nil? }
+      .map    { |f| f.subfields('f').value.try(:gsub, ' ', '') }
       .first.presence
 
       # Wenn alle Exemplare im Magzin stehen, dann nimm nur die erste signatur
       if all_stack
         fields.each do |field|
-          subfield = field.subfields.find{|f| f.name == "d"}
+          subfield = field.subfields.find{|f| f.code == "d"}
           if subfield.present? && subfield.value.present?
             signatures << subfield.value
             break
@@ -927,14 +968,14 @@ module Mabmapper
       # ansonsten extrahiere aus den normalen Signaturen eine Basis-Signatur
       else
         # Lösche alle Felder die als Standordkennziffer eine Magazinkennung haben
-        fields = fields.reject{|f| f.subfields.find{|sf| sf.name == 'b' && sf.value.match(/02|03|04|07/)}.present?}
+        fields = fields.reject{|f| f.subfields.find{|sf| sf.code == 'b' && sf.value.match(/02|03|04|07/)}.present?}
 
         # Sortiere die restlichen Felder nach Unterfeld 5 (Strichcode)
         fields = fields.sort do |x, y|
-         x5 = x.subfields.find{|f| f.name == "5"}
-         y5 = y.subfields.find{|f| f.name == "5"}
+         x5 = x.subfields.find{|f| f.code == "5"}
+         y5 = y.subfields.find{|f| f.code == "5"}
          if x5 && y5
-           x5.value <=> y.value
+           x5.value <=> y5.value
          else
            0
          end
@@ -942,7 +983,7 @@ module Mabmapper
 
         # Extrahiere die Signaturen aus Unterfeld d und erzeuge eine Basis-Signatur
         fields.each do |field|
-          subfield = field.subfields.find{|f| f.name == "d"}
+          subfield = field.subfields.find{|f| f.code == "d"}
           if subfield.present? && subfield.value.present?
             signature      = subfield.value
             index          = signature.index('+') || signature.length
@@ -953,7 +994,7 @@ module Mabmapper
       end
 
       # Stücktitel Signatur
-      signatures << doc.field('100', ind2: ' ').subfield('a').get.value
+      signatures << source.datafields('100', ind2: ' ').subfields('a').value
 
       # Some additional love for journal signatures
       signatures.map! do |signature|
@@ -961,9 +1002,9 @@ module Mabmapper
         if signature.try(:[], /\d+[A-Za-z]\d+$/).present?
           # unless there is a leading standortkennziffer
           unless signature.starts_with?('P')
-            standort_kennziffer = if (loc_standort_kennziffer = doc.field('LOC').subfield('b').get.value).present?
+            standort_kennziffer = if (loc_standort_kennziffer = source.datafields('LOC').subfields('b').value).present?
               loc_standort_kennziffer
-            elsif (f105a = doc.field('105').subfield('a').get.value).present?
+            elsif (f105a = source.datafields('105').subfields('a').value).present?
               f105a
             end
 
@@ -982,11 +1023,11 @@ module Mabmapper
 
     field :signature_search do
       signatures = []
-      signatures = signatures + doc.field('LOC').subfield('d').get.values
+      signatures = signatures + source.datafields('LOC').subfields('d').values
       # Stücktitel Signatur
-      signatures << doc.field('100', ind2: ' ').subfield('a').get.value
+      signatures << source.datafields('100', ind2: ' ').subfields('a').value
       # Zeitschriftensignatur
-      signatures << doc.field('200', ind1: ' ', ind2: ' ').subfield('f').get.values
+      signatures << source.datafields('200', ind1: ' ', ind2: ' ').subfields('f').values
 
       signatures = signatures.flatten.map(&:presence).compact
       .map do |signature|
@@ -1006,9 +1047,9 @@ module Mabmapper
       if (journal_signature = signatures.select { |signature| signature.try(:[], /\d+[A-Za-z]\d+$/).present? }.first).present?
         if signatures.none? { |signature| signature.starts_with? 'P' }
           # TODO: code duplication with :signature
-          standort_kennziffer = if (loc_standort_kennziffer = doc.field('LOC').subfield('b').get.value).present?
+          standort_kennziffer = if (loc_standort_kennziffer = source.datafields('LOC').subfields('b').value).present?
             loc_standort_kennziffer
-          elsif (f105a = doc.field('105').subfield('a').get.value).present?
+          elsif (f105a = source.datafields('105').subfields('a').value).present?
             f105a
           end
 
@@ -1037,12 +1078,11 @@ module Mabmapper
     field :resource_link do
       fulltext_links = []
 
-      links = doc.field('655').subfield(['u', '3', 'z', 't']).get.fields
-      links.each do |link|
-        url        = link.get_subfield('u').try(:value)
-        subfield_3 = link.get_subfield('3') # HBZ Inhaltsverzeichnisse
-        subfield_z = link.get_subfield('z') # BVB Inhaltsverzeichnisse
-        subfield_t = link.get_subfield('t') # Type: VIEW => Adam Inhaltsverzeichnis
+      source.datafields('655').each do |datafield|
+        url        = datafield.subfields('u').value
+        subfield_3 = datafield.subfields('3') # HBZ Inhaltsverzeichnisse
+        subfield_z = datafield.subfields('z') # BVB Inhaltsverzeichnisse
+        subfield_t = datafield.subfields('t') # Type: VIEW => Adam Inhaltsverzeichnis
 
         unless (url.present? && subfield_3.present? && subfield_3.value =~ /^inhalt/i) ||
                (url.present? && subfield_z.present? && subfield_z.value =~ /^inhalt/i) ||
@@ -1060,12 +1100,11 @@ module Mabmapper
     field :link_to_toc do
       toc_links = []
 
-      links = doc.field('655').subfield(['u', '3', 'z', 't']).get.fields
-      links.each do |link|
-        url        = link.get_subfield('u').try(:value)
-        subfield_3 = link.get_subfield('3') # HBZ Inhaltsverzeichnisse
-        subfield_z = link.get_subfield('z') # BVB Inhaltsverzeichnisse
-        subfield_t = link.get_subfield('t') # Type: VIEW => Adam Inhaltsverzeichnis
+      source.datafields('655').each do |datafield|
+        url        = datafield.subfields('u').value
+        subfield_3 = datafield.subfields('3') # HBZ Inhaltsverzeichnisse
+        subfield_z = datafield.subfields('z') # BVB Inhaltsverzeichnisse
+        subfield_t = datafield.subfields('t') # Type: VIEW => Adam Inhaltsverzeichnis
 
         if (url.present? && subfield_3.present? && subfield_3.value =~ /^inhaltsv/i) ||
            (url.present? && subfield_z.present? && subfield_z.value =~ /^inhaltsv/i) ||
@@ -1082,7 +1121,7 @@ module Mabmapper
     #
     field :selection_code do
       codes = []
-      codes << doc.field('078', ind1: ['e', 'r']).subfield('a').get.values
+      codes << source.datafields('078', ind1: ['e', 'r']).subfields('a').values
 
       codes.flatten.map(&:presence).compact.uniq
     end
@@ -1101,21 +1140,20 @@ module Mabmapper
       #   f - Signatur
       r = []
 
-      fields = doc.field('200', ind2: ' ').subfield(['0', 'a', 'b', 'c', 'e', 'f']).get.fields
-      fields.each do |field|
-        field_0 = field.get_subfield('0')
-        field_a = field.get_subfield('a')
-        field_b = field.get_subfield('b')
-        field_c = field.get_subfield('c')
-        field_e = field.get_subfield('e')
-        field_f = field.get_subfield('f')
+      source.datafields('200', ind2: ' ').each do |field|
+        field_0 = field.subfields('0')
+        field_a = field.subfields('a')
+        field_b = field.subfields('b')
+        field_c = field.subfields('c')
+        field_e = field.subfields('e')
+        field_f = field.subfields('f')
 
         s = ""
-        s = merge(s, field_a.try(:value), delimiter: ' ')
-        s = merge(s, field_b.try(:value), delimiter: ': ')
-        s = merge(s, field_c.try(:value), delimiter: ' ')
-        s = merge(s, field_e.try(:value), delimiter: '. ')
-        s = merge(s, field_f.try(:value), delimiter: ' <strong>Zeitschriftensignatur</strong>: ')
+        s = merge(s, field_a.value, delimiter: ' ')
+        s = merge(s, field_b.value, delimiter: ': ')
+        s = merge(s, field_c.value, delimiter: ' ')
+        s = merge(s, field_e.value, delimiter: '. ')
+        s = merge(s, field_f.value, delimiter: ' <strong>Zeitschriftensignatur</strong>: ')
 
         # Cleanup
         s = s.gsub(/^\- /, '') # Z.b. "- Index: Foo Bar"
@@ -1142,11 +1180,11 @@ module Mabmapper
     #
     field :frbr_t do
       value = 1
-      f052  = doc.controlfield('052')
-      ffmt  = doc.controlfield('FMT')
-      f100  = doc.field('100').subfield(['a','p']).get.value
-      f200  = doc.field('200').subfield(['a','k','g','e']).get.value
-      f300  = doc.field('300', ind2: '2').subfield('a').get.value
+      f052  = source.controlfield('052')
+      ffmt  = source.controlfield('FMT')
+      f100  = source.datafields('100').subfields(['a','p']).value
+      f200  = source.datafields('200').subfields(['a','k','g','e']).value
+      f300  = source.datafields('300', ind2: '2').subfields('a').value
 
       if (f052.present? and ['p','z','r','j'].include?(f052.at(0)))
         value = 99
@@ -1164,11 +1202,11 @@ module Mabmapper
     #
     field :frbr_k1 do
       value  = nil
-      ffmt   = doc.controlfield('FMT')
-      f052   = doc.controlfield('052')
-      f334   = doc.field('334', ind2: '1').subfield('a').get.value.try(:downcase)
-      f100_1 = doc.naco_normalization(doc.field('100', ind1: '-', ind2: '1').subfield(['a','p']).get.value).presence
-      f100_2 = doc.naco_normalization(doc.field('100', ind1: 'b', ind2: '1').subfield(['a','p']).get.value).presence
+      ffmt   = source.controlfield('FMT')
+      f052   = source.controlfield('052')
+      f334   = source.datafields('334', ind2: '1').subfields('a').value.try(:downcase)
+      f100_1 = doc.naco_normalization(source.datafields('100', ind1: '-', ind2: '1').subfields(['a','p']).value).presence
+      f100_2 = doc.naco_normalization(source.datafields('100', ind1: 'b', ind2: '1').subfields(['a','p']).value).presence
 
       if (f100_1.present?)
         value = "$$Kpad#{f100_1}$$AA"
@@ -1184,54 +1222,57 @@ module Mabmapper
     end
 
     field :redactional_remark do
-      doc.field("537", ind2: '1').subfield(['a', 'p']).get.values(join_subfields: ': ').presence.try(:join)
+      source.datafields("537", ind2: '1').map do |_datafield|
+        _datafield.subfields(['a', 'p']).values.join(': ')
+      end
+      .presence.try(:join)
     end
 
     #
     # Sekundärformen
     #
     field :is_secondary_form do
-      (doc.field('610').get.value || doc.field('611').get.value || doc.field('619').get.value || doc.field('621').get.value) != nil
+      (source.datafields('610').value || source.datafields('611').value || source.datafields('619').value || source.datafields('621').value) != nil
     end
 
     field :secondary_form_preliminary_phrase do
-      doc.field('610', ind1: '-', ind2: '1').get.value
+      source.datafields('610', ind1: '-', ind2: '1').value
     end
 
     field :secondary_form_publisher do
-      (doc.field('611').get.value.to_s << ' : ' << doc.field('613').get.value.to_s).gsub(/\A : /, '').presence
+      (source.datafields('611').value.to_s << ' : ' << source.datafields('613').value.to_s).gsub(/\A : /, '').presence
     end
 
     field :secondary_form_creationdate do
-      doc.field('619').get.value
+      source.datafields('619').value
     end
 
     field :secondary_form_isbn do
-      doc.field('634').get.value
+      source.datafields('634').value
     end
 
     field :secondary_form_physical_description do
-      doc.field('637').get.value
+      source.datafields('637').value
     end
 
     # there can at most be two of 'em
     field :secondary_form_superorder do
       [
         {
-          ht_number: doc.field('623').get.value,
-          label: doc.field('621').get.value,
-          volume_count: doc.field('625').get.value
+          ht_number: source.datafields('623').value,
+          label: source.datafields('621').value,
+          volume_count: source.datafields('625').value
         },
         {
-          ht_number: doc.field('629').get.value,
-          label: doc.field('627').get.value,
-          volume_count: doc.field('631').get.value
+          ht_number: source.datafields('629').value,
+          label: source.datafields('627').value,
+          volume_count: source.datafields('631').value
         }
       ].select { |superorder| superorder[:label].present? }.map(&:to_json).presence
     end
 
     field :local_comment do
-      doc.field('125', ind1: ' ', ind2: ' ').subfield(['_', 'a']).get.fields.map(&:values).flatten.uniq.presence
+      source.datafields('125', ind1: ' ', ind2: ' ').subfields(['_', 'a']).values.flatten.uniq.presence
     end
 
     #