berkeley_library-tind 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ade606682d0d814a4debfbe0be2a6741ae72977d710511d5df70118569dea764
-  data.tar.gz: 2da4f7cd4b7f0c1cf6f8dcf9bf3346d89599e9130f28a185cb0cab0a37a39d3d
+  metadata.gz: 7e02344bc1a5d5c119c860bd357dfac55753bc809149cef7a068941f0566682c
+  data.tar.gz: aaba20e6650860ef0d89619522264746f1e689800e20abde0247ca0a3c55bad2
 SHA512:
-  metadata.gz: ed708269e8c628616c89643c49cb3394401febf8f9a0f4defde88abad17a8ac2f5b43663345cd0513aa2e7b02e41fb3475446f55aa7ad394aa83ad62ae114565
-  data.tar.gz: b4f851305ad936b9f7cb46c8a521358cdfff34f51aebfb6d121481545777476af8adce6c3b8c0042aeaeca2ee00a7d1826f955f46ee5ad1f11361c7ed1843b72
+  metadata.gz: c83767367a893dd418c47bc1a74e5d2bf362bceeb009af7427a5e1f240dd4cb5ab57b8c032295e6e253dd5f71f5b512fd2bf112b1734a80d22d62a06b92d6c28
+  data.tar.gz: 224863c5c06224dbc4c2caae4e73c7f1752ee1f5303a758af1428667a938bb561a2d97e0a31306627cd37325e4518d4f674e22d270f2bcd40e631b90265eb62f

data/.idea/tind.iml

@@ -9,16 +9,16 @@
     </content>
     <orderEntry type="jdk" jdkName="RVM: ruby-2.7.5" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="actionpack (v7.0.2.3, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionview (v7.0.2.3, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activesupport (v7.0.2.3, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionpack (v7.0.2.4, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionview (v7.0.2.4, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activesupport (v7.0.2.4, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="addressable (v2.8.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="amazing_print (v1.4.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.2, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="berkeley_library-alma (v0.0.4, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="berkeley_library-logging (v0.2.6, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="berkeley_library-marc (v0.3.1, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="berkeley_library-util (v0.1.1, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="berkeley_library-util (v0.1.2, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.4, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundle-audit (v0.1.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v2.2.31, RVM: ruby-2.7.5) [gem]" level="application" />
@@ -41,14 +41,14 @@
     <orderEntry type="library" scope="PROVIDED" name="i18n (v1.10.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ice_nine (v0.11.2, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="lograge (v0.12.0, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="loofah (v2.15.0, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="loofah (v2.17.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="marc (v1.1.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="method_source (v1.0.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.4.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2022.0105, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="minitest (v5.15.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="netrc (v0.11.0, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.13.3, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.13.5, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="oj (v3.13.11, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ougai (v1.9.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="parallel (v1.21.0, RVM: ruby-2.7.5) [gem]" level="application" />
@@ -60,7 +60,7 @@
     <orderEntry type="library" scope="PROVIDED" name="rack-test (v1.1.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v2.0.3, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.4.2, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="railties (v7.0.2.3, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="railties (v7.0.2.4, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.1.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.6, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rchardet (v1.8.0, RVM: ruby-2.7.5) [gem]" level="application" />

data/.rubocop.yml

@@ -331,4 +331,4 @@ Style/SwapValues: # (new in 1.1)
 Gemspec/DateAssignment: # (new in 1.10)
   Enabled: true
 Style/HashConversion: # (new in 1.10)
-  Enabled: true
+  Enabled: true

data/CHANGES.md

@@ -1,10 +1,18 @@
-# 0.6.0 (2023-04-06)
+# 0.7.0 (2022-10-26)
+
+- Preserves subfield order insofar as possible when mapping Alma records to TIND.
+- Adds collection-specific configuration for mapping Alma records to TIND.
+- Adds `BerkeleyLibrary::TIND::Mapping::TindRecordUtil` class for manipulating
+  subfields in TIND MARC records.
+- Removes `BerkeleyLibrary::Util::Files` class, which is now part of `berkeley_library-util`.
+
+# 0.6.0 (2022-04-06)
 
 - Adds `BerkeleyLibrary::TIND::Mapping` module to map MARC records from Alma to TIND.
 - `BerkeleyLibrary::TIND::MARC::XMLWriter` now assumes that any object that response to `:write`
   and `:close` is suffiently `IO`-like to write to.
 
-# 0.5.1 (2023-03-23)
+# 0.5.1 (2022-03-23)
 
 - Fix an issue where `BerkeleyLibrary::TIND::MARC::XMLWriter` would drop fields with nonstandard tags (e.g. `FFT` fields)
   and would group and sort fields by tag instead of preserving the original order.

data/README.md

@@ -45,10 +45,10 @@ string setting will raise `URI::InvalidURIError`.
 
 ### Alma configuration
 
-When mapping Alma records to TIND (see below), this gem uses 
+When mapping Alma records to TIND (see below), this gem uses
 [`berkeley_library-alma`](https://github.com/BerkeleyLibrary/alma) to load
 Alma records. The scripts in the `bin` directory use the default Alma
-configuration; see the `berkeley_library-alma` 
+configuration; see the `berkeley_library-alma`
 [README](https://github.com/BerkeleyLibrary/alma#configuration) for
 details.
 
@@ -127,7 +127,8 @@ variable are set for either, the explicit option takes precedence.
 ### Example
 
 1. Setup collection information
-   
+
+   Include below collection level fields:
    - 336:  type of resource
    - 852:  collection's repository name
    - 980:  collection's 980 value
@@ -137,6 +138,7 @@ variable are set for either, the explicit option takes precedence.
 ``` ruby
 
 def setup_collection
+  # 1. Define collection level field information
   BerkeleyLibrary::TIND::Mapping::AlmaBase.collection_parameter_hash = {
     '336' => ['Image'],
     '852' => ['East Asian Library'],
@@ -144,11 +146,27 @@ def setup_collection
     '982' => ['Pre 1912 Chinese Materials - short name', 'Pre 1912 Chinese Materials - long name'],
     '991' => []
   }
-  
+
+  # 2. A flag to include a pre-defined 035 formated in "(980__$a)mms_id",
+  #    the default value is 'false'
   # BerkeleyLibrary::TIND::Mapping::AlmaBase.is_035_from_mms_id = true  
 
-  # Flag on getting Alma record using Barcode
-  BerkeleyLibrary::TIND::Mapping::AlmaBase.is_barcode = true           
+  # 3. A flag on getting Alma record using Barcode, the defalut value is 'false'
+  # BerkeleyLibrary::TIND::Mapping::AlmaBase.is_barcode = true    
+
+  # 4. Define a list of origin tags from an Alma record.
+  #    Only those related fields (including 880 fields) will be mapped to a TIND record.
+  #    The default value is []. '001', '008' will be included by default, no need to be listed here.
+  # BerkeleyLibrary::TIND::Mapping::AlmaBase.excluding_origin_tags = %w[256]
+
+  # 5. Define a list of origin tags from an Alma record which will be excluded during mapping.
+  #    The default value is []
+  #       1) When the list includes an 880 tag, all 880 fields will be excluded
+  #       2) When the list has no 880 tag, only related 880 fields will be excludded
+  # BerkeleyLibrary::TIND::Mapping::AlmaBase.including_origin_tags = %w[245 700]
+
+  # 6. Not allow to define both #5 and #6. Returning empty fields when defining both #5 and #6
+
 end
 ```
 
@@ -204,3 +222,29 @@ alma_tind = BerkeleyLibrary::TIND::Mapping::AlmaMultipleTIND.new(id)
 tind_record_1 = alma_tind.record(additional_tind_fields_1)
 tind_record_2 = alma_tind.record(additional_tind_fields_2)
 ```
+
+5. Updating TIND record with TindRecordUtil : 1) add/update subfields to one-occurrenced field; 2) remove fields.
+
+``` ruby
+# 5.1 This is an example hash for updating/adding subfields.  
+tag_subfield_hash = { '245' => { 'b' => 'subtitle', 'a' => 'title' }, '336' => { 'a' => 'Audio' }, '246' => {'a' => nil}}
+
+# if 245__$b existed, it will be replaced it with 'subtitle';
+# otherwise, adding a new 245__$b subfield with value 'subtile';
+# '246' => {'a' => nil}, since value is nil, it won't add/update 246__$a
+
+# 5.2 This is an example array of removing fields.
+fields_removal_list = [%w[856 4 1] %w[260 _ _]]
+
+# Each item includes field information: [tag, indicator1, indictor2].
+# if indicator is empty, using '_'
+
+# How to use it:
+    #   a.  add/update subfields of existed fields in a TIND Marc record:
+            new_record = BerkeleyLibrary::TIND::Mapping::TindRecordUtil.update_record(record, tag_subfield_hash)
+    #   b.  remove a list of fields in a TIND Marc record:
+            new_record = BerkeleyLibrary::TIND::Mapping::TindRecordUtil.update_record(record, nil, fields_removal_list)
+    #   c.  both a. and b. :
+            new_record = BerkeleyLibrary::TIND::Mapping::TindRecordUtil.update_record(record, tag_subfield_hash, fields_removal_list)
+
+```

data/berkeley_library-tind.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
   spec.homepage = BerkeleyLibrary::TIND::ModuleInfo::HOMEPAGE
 
   spec.files = `git ls-files -z`.split("\x0")
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
   spec.executables << 'tind-export'
 
@@ -26,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'berkeley_library-alma', '~> 0.0.1'
   spec.add_dependency 'berkeley_library-logging', '~> 0.2'
   spec.add_dependency 'berkeley_library-marc', '~> 0.3.0', '>= 0.3.1'
-  spec.add_dependency 'berkeley_library-util', '~> 0.1'
+  spec.add_dependency 'berkeley_library-util', '~> 0.1', '>= 0.1.2'
   spec.add_dependency 'ice_nine', '~> 0.11'
   spec.add_dependency 'marc', '~> 1.0'
   spec.add_dependency 'rchardet', '~> 1.8'

data/lib/berkeley_library/tind/export/ods_exporter.rb

@@ -67,12 +67,10 @@ module BerkeleyLibrary
 
         def header_cell_style_for(col_index)
           @header_cell_styles ||= []
-          @header_cell_styles[col_index] ||= begin
-            find_or_create_cell_style(
-              color: color_for(col_index),
-              font_weight: 'bold'
-            )
-          end
+          @header_cell_styles[col_index] ||= find_or_create_cell_style(
+            color: color_for(col_index),
+            font_weight: 'bold'
+          )
         end
 
         def find_or_create_cell_style(color:, font_weight: nil, wrap: false)

data/lib/berkeley_library/tind/mapping/alma_base.rb

@@ -9,11 +9,16 @@ module BerkeleyLibrary
         @collection_parameter_hash = {}
         @is_barcode = false
         @is_035_from_mms_id = false
+        @including_origin_tags = []
+        @excluding_origin_tags = []
 
         class << self
           attr_accessor :collection_parameter_hash
           attr_accessor :is_barcode
           attr_accessor :is_035_from_mms_id
+          attr_accessor :including_origin_tags
+          attr_accessor :excluding_origin_tags
+
         end
 
         # id can be:
@@ -74,6 +79,8 @@ module BerkeleyLibrary
         end
 
         def tind_record(id, marc_record, datafields)
+          return nil unless Util.collection_config_correct?
+
           tindmarc = TindMarc.new(marc_record)
           # get all derived tind_fields: 1) from collection information; 2) from id
           mms_id = tindmarc.field_catalog.mms_id

data/lib/berkeley_library/tind/mapping/data/one_to_one_mapping.csv

@@ -1,39 +1,39 @@
-tag_origin,tag_destination,subfield_single_from,subfield_single_to,subfield_combined_from_1,subfield_combined_to_1,symbol_1 ,subfield_combined_from_2,subfield_combined_to_2,symbol_2,subfield_combined_from_3,subfield_combined_to_3,symbol_3,New_indecator,Position_from,Position_to,Map_if_no_this_tag_existed,Map_if_no_this_tag_subfield_existed, Keep_one_if_multiple_available
-100,700,"6,e","6,e","a,b,c,d,q",a,,,,,,,,"1,_",,,,,
-110,710,"6,e","6,e","a,b",a,,,,,,,,"2,_",,,,,
-111,711,6,6,"a,c,d,e,f,n,p,t",a,,,,,,,,"_,_",,,,,
-242,246,6,6,"a,b,p,n",a,,,,,,,,,,,,,
-245,245,"6,a","6,a","n,p",p,,,,,"b,f,k",b,,"_,_",,,,,
-246,246,6,6,"a,b,p,n",a,,,,,,,,"_,_",,,,,
-250,250,"6,a","6,a",,,,,,,,,,"_,_",,,,,
-255,255,"6,a,b,c","6,a,b,c",,,,,,,,,,"_,_",,,,,
-260,260,"6,a,b,c","6,a,b,c",,,,,,,,,,"_,_",,,,,
-264,260,"6,a,b,c","6,a,b,c",,,,,,,,,,"_,_",,,260,,1
-300,300,"6,b,c","6,b,c","3,a",a,,,,,,,,"_,_",,,,,
-351,505,6,6,"a,b",a,,,,,,,,"_,_",,,,,
-490,490,6,6,"a,v",a,,,,,,,,"_,_",,,,,
-500,500,"6,a","6,a",,,,,,,,,,"_,_",,,,,
-502,502,6,6,"a,b,c,d,g,o",a,,,,,,,,"_,_",,,,,
-505,505,6,6,"a,g,r,t",a,,,,,,,,"_,_",,,,,
-507,255,"6,a","6,a",,,,,,,,,,"_,_",,,,255__a,
-520,520,"6,a","6,a",,,,,,,,,,"_,_",,,,,
-522,522,"6,a","6,a",,,,,,,,,,"_,_",,,,,
-524,524,"6,a","6,a",,,,,,,,,,"_,_",,,,,
-536,536,"6,a","6,a",,,,,,,,,,"_,_",,,,,
-541,541,6,6,"c,a,d",a,,,,,,,,"_,_",,,,,
-545,545,"6,a","6,a",,,,,,,,,,"_,_",,,,,
-546,546,"6,a","6,a",,,,,,,,,,"_,_",,,,,
-600,600,6,6,"a,b,c,d,f,j,k,l,m,n,o,p,q,r,s,t",a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
-610,610,6,6,"a,b,c,d,f,j,k,l,m,n,o,p,q,r,s,t",a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
-611,611,6,6,"a,b,c,d,f,j,k,l,m,n,o,p,q,r,s,t",a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
-630,630,6,6,"a,b,c,d,f,j,k,l,m,n,o,p,q,r,s,t",a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
-650,650,6,6,"a,b,c",a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
-651,651,6,6,a,a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
-655,655,"6,2","6,2",a,a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
-700,700,"6,e","6,e","a,b,c,d,q",a,,,,,,,,"1,_",,,,,
-710,710,"6,e","6,e","a,b",a,,,,,,,,"2,_",,,,,
-711,711,6,6,"a,c,d,e,f,n,p,t",a,,,,,,,,"_,_",,,,,
-720,700,"6,a,e","6,a,e",,,,,,,,,,"1,_",,,,,
-752,651,6,6,,,,"a,b,c,d,f,g",a,a--a,,,,"_,_",,,,,
-773,773,"6,t,j,k,o","6,t,j,k,o",,,,,,,,,,"_,_",,,,,
-907,901,"6,a","6,m",,,,,,,,,,"_,_",,,,,
+tag_origin,tag_destination,subfield_single_from,subfield_single_to,order,subfield_combined_from_1,subfield_combined_to_1,symbol_1 ,subfield_combined_from_2,subfield_combined_to_2,symbol_2,subfield_combined_from_3,subfield_combined_to_3,symbol_3,New_indecator,Position_from,Position_to,Map_if_no_this_tag_existed,Map_if_no_this_tag_subfield_existed, Keep_one_if_multiple_available
+100,700,"6,e","6,e","6,a,e","a,b,c,d,q",a,,,,,,,,"1,_",,,,,
+110,710,"6,e","6,e","6,a,e","a,b",a,,,,,,,,"2,_",,,,,
+111,711,6,6,,"a,c,d,e,f,n,p,t",a,,,,,,,,"_,_",,,,,
+242,246,6,6,,"a,b,p,n",a,,,,,,,,,,,,,
+245,245,"6,a","6,a","6,a,b,p","n,p",p,,,,,"b,f,k",b,,"_,_",,,,,
+246,246,6,6,,"a,b,p,n",a,,,,,,,,"_,_",,,,,
+250,250,"6,a","6,a",,,,,,,,,,,"_,_",,,,,
+255,255,"6,a,b,c","6,a,b,c",,,,,,,,,,,"_,_",,,,,
+260,260,"6,a,b,c","6,a,b,c",,,,,,,,,,,"_,_",,,,,
+264,260,"6,a,b,c","6,a,b,c",,,,,,,,,,,"_,_",,,260,,1
+300,300,"6,b,c","6,b,c","6,a,b,c","3,a",a,,,,,,,,"_,_",,,,,
+351,505,6,6,,"a,b",a,,,,,,,,"_,_",,,,,
+490,490,6,6,,"a,v",a,,,,,,,,"_,_",,,,,
+500,500,"6,a","6,a",,,,,,,,,,,"_,_",,,,,
+502,502,6,6,,"a,b,c,d,g,o",a,,,,,,,,"_,_",,,,,
+505,505,6,6,,"a,g,r,t",a,,,,,,,,"_,_",,,,,
+507,255,"6,a","6,a",,,,,,,,,,,"_,_",,,,255__a,
+520,520,"6,a","6,a",,,,,,,,,,,"_,_",,,,,
+522,522,"6,a","6,a",,,,,,,,,,,"_,_",,,,,
+524,524,"6,a","6,a",,,,,,,,,,,"_,_",,,,,
+536,536,"6,a","6,a",,,,,,,,,,,"_,_",,,,,
+541,541,6,6,,"c,a,d",a,,,,,,,,"_,_",,,,,
+545,545,"6,a","6,a",,,,,,,,,,,"_,_",,,,,
+546,546,"6,a","6,a",,,,,,,,,,,"_,_",,,,,
+600,600,6,6,,"a,b,c,d,f,j,k,l,m,n,o,p,q,r,s,t",a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
+610,610,6,6,,"a,b,c,d,f,j,k,l,m,n,o,p,q,r,s,t",a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
+611,611,6,6,,"a,b,c,d,f,j,k,l,m,n,o,p,q,r,s,t",a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
+630,630,6,6,,"a,b,c,d,f,j,k,l,m,n,o,p,q,r,s,t",a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
+650,650,6,6,,"a,b,c",a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
+651,651,6,6,,a,a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
+655,655,"6,2","6,2",,a,a,,"x,y,z,v",a,a--a,,,,"_,_",,,,,
+700,700,"6,e","6,e","6,a,e","a,b,c,d,q",a,,,,,,,,"1,_",,,,,
+710,710,"6,e","6,e","6,a,e","a,b",a,,,,,,,,"2,_",,,,,
+711,711,6,6,,"a,c,d,e,f,n,p,t",a,,,,,,,,"_,_",,,,,
+720,700,"6,a,e","6,a,e",,,,,,,,,,,"1,_",,,,,
+752,651,6,6,,,,,"a,b,c,d,f,g",a,a--a,,,,"_,_",,,,,
+773,773,"6,t,j,k,o","6,t,j,k,o",,,,,,,,,,,"_,_",,,,,
+907,901,"6,a","6,m",,,,,,,,,,,"_,_",,,,,

data/lib/berkeley_library/tind/mapping/field_catalog.rb

@@ -47,7 +47,8 @@ module BerkeleyLibrary
         def prepare_catalog(record)
           clean_fields = clean_subfields(record.fields)
           check_abnormal_formated_subfield6(clean_fields)
-          allocate_fields(clean_fields)
+          final_fields_to_map = fields_to_map(clean_fields)
+          allocate_fields(final_fields_to_map)
           remove_fields_with_subject_fast
         end
 
@@ -115,16 +116,6 @@ module BerkeleyLibrary
         # If tag is listed in csv_mapper.one_occurrence_tags
         # Check pre_existed field of this tag
         # make sure to keep the first datafield for an one_occurrence_tag defined in csv mapping file
-        # def no_pre_existed_field?(tag)
-        #   # no one-occurrence defined in csv
-        #   return true unless one_occurrence_tags.include? tag
-
-        #   # Checking the exsisting regular fields include the one-occurrence field defined in the csv
-        #   return false if @alma_field_tags.compact.include? tag
-
-        #   true
-        # end
-
         def no_pre_existed_field?(tag)
           # no one-occurrence defined in csv
           return true unless one_occurrence_tags.include? tag

data/lib/berkeley_library/tind/mapping/field_catalog_util.rb

@@ -1,7 +1,10 @@
+require 'berkeley_library/tind/mapping/alma_base'
+
 module BerkeleyLibrary
   module TIND
     module Mapping
       module FieldCatalogUtil
+        include AlmaBase
 
         # Excluding fields: subfield2 = 'fast' and tag or refered tag(880 fields) started with '6':
         def exluding_fields_with_fast_subject(fields)
@@ -17,14 +20,56 @@ module BerkeleyLibrary
 
             rule = rules[Util.tag_symbol(tag)]
 
-            assing_field(rule, f, datafields_hash)
+            assign_field(rule, f, datafields_hash)
           end
 
           datafields_hash
         end
 
+        # Defining a list of fields from Alma to be mapped to TIND fields based on
+        # collection configuration:
+        # 1) BerkeleyLibrary::TIND::Mapping::AlmaBase.including_origin_tags
+        # 2) BerkeleyLibrary::TIND::Mapping::AlmaBase.excluding_origin_tags
+        def fields_to_map(fields)
+          including_defined = !BerkeleyLibrary::TIND::Mapping::AlmaBase.including_origin_tags.empty?
+          excluding_defined = !BerkeleyLibrary::TIND::Mapping::AlmaBase.excluding_origin_tags.empty?
+          return [] if including_defined && excluding_defined # not allow to define both including and excluding tags
+          return fields unless including_defined || excluding_defined # Neither including nor excluding tags are defined
+          return fields_included(fields) if including_defined # including tags defined
+          return fields_exclued(fields) if excluding_defined  # excluding tags defined
+        end
+
         private
 
+        def fields_included(fields)
+          fields.select { |f| inclduing?(f) }
+        end
+
+        def inclduing?(f)
+          return true if %w[001 008].include? f.tag # always keeping 001, 008 field since it include almid
+
+          tag = origin_mapping_tag(f)
+          BerkeleyLibrary::TIND::Mapping::AlmaBase.including_origin_tags.include? tag
+        end
+
+        def fields_exclued(fields)
+          new_fields = []
+          exclude_tags = BerkeleyLibrary::TIND::Mapping::AlmaBase.excluding_origin_tags
+          fields.each do |f|
+            tag = tag(f, exclude_tags)
+            new_fields << f unless exclude_tags.include? tag
+          end
+          new_fields
+        end
+
+        # 1. exluding tags have '880' :  all 880 fields will be excluded
+        # 2. excluding tags have no '880', then excluding 880 fields whoses refered tag located in excluding tags
+        def tag(field, exclude_tags)
+          return field.tag if exclude_tags.include? '880' #  Case: excluding all 880 fields
+
+          origin_mapping_tag(field)
+        end
+
         def excluding_field?(f)
           return false unless field_6xx?(f)
           return false unless subfield2_fast(f)
@@ -46,10 +91,11 @@ module BerkeleyLibrary
         end
 
         # f is either from field whose tag having a match in csv mapping file - 'from tag' column
-        def assing_field(rule, f, datafields_hash)
+        def assign_field(rule, f, datafields_hash)
           if rule.pre_existed_tag then datafields_hash[:pre_tag] << f
           elsif rule.pre_existed_tag_subfield then datafields_hash[:pre_tag_subfield] << f
-          else  datafields_hash[:normal] << f
+          else
+            datafields_hash[:normal] << f
           end
         end
 

data/lib/berkeley_library/tind/mapping/single_rule.rb

@@ -26,6 +26,7 @@ module BerkeleyLibrary
         attr_reader :single_rule_hash
         attr_reader :single_rule_subfield_excluded_hash
         attr_reader :combined_rules
+        attr_reader :subfields_order
 
         def initialize(row)
           @tag_origin = row[:tag_origin]
@@ -36,6 +37,7 @@ module BerkeleyLibrary
           @single_rule_hash = single_map_dic(row[:subfield_single_from], row[:subfield_single_to])
           @single_rule_subfield_excluded_hash = single_map_subfield_excluded_dic
           @combined_rules = rules_with_same_subfield_name(row)
+          @subfields_order = order(row[:order])
         end
 
         # 1. Return an array of combined rules, an item in the array
@@ -51,6 +53,10 @@ module BerkeleyLibrary
 
         private
 
+        def order(str)
+          str.nil? ? nil : str.split(',')
+        end
+
         # return an array of tag and subfield name, example '255__a' => ['255','a']
         def existed_tag_subfield(str)
           str.nil? ? nil : str.split('__')

data/lib/berkeley_library/tind/mapping/tind_field_from_single_map.rb

@@ -39,6 +39,7 @@ module BerkeleyLibrary
           @single_mapping = nil
           @ready_to_mapping = ready_to_mapping?
 
+          @codes = subfield_codes(@from_datafield)
           @to_subfields = all_subfields
         end
 
@@ -82,7 +83,18 @@ module BerkeleyLibrary
         end
 
         def all_subfields
-          @ready_to_mapping ? (subfields_from_single_map + subfields_from_combined_map) : []
+          return [] unless @ready_to_mapping
+
+          subfields = subfields_from_single_map + subfields_from_combined_map
+          codes = @mapping_rule.subfields_order || @codes
+
+          return subfields unless subfields.length > 1
+
+          Util.order_subfields(subfields, codes)
+        end
+
+        def subfield_codes(f)
+          f.subfields.map(&:code).uniq
         end
 
         # 1.subfields mapped with single rule, mapping one subfield to another subfield

data/lib/berkeley_library/tind/mapping/tind_record_util.rb

@@ -0,0 +1,135 @@
+require 'marc'
+
+module BerkeleyLibrary
+  module TIND
+    module Mapping
+      module TindRecordUtil
+
+        class << self
+          include TindRecordUtil
+        end
+
+        # 1) tag_subfield_hash: a hash to add a new, or update an existing subfield to a field in a TIND Marc record
+        #    If a subfield existed, it will replace the subfield, otherwise, add a new subfield
+        #    when 'a' => nil, it will skip add/update to subfield,
+        #    It can be useed in a case: only need to add/update subfields of specific records in a collection
+        #    This is an example: tag_subfield_hash = { '245' => { 'b' => 'subtitle', 'a' => 'title' }, '336' => { 'a' => nil } }
+        # 2) fields_removal_list: an array including fields' informat: tag, indicators - "[tag, inicator1, indicator2]".
+        #    This list is to remove fields in a record.
+        #    An example fields_removal_list = [%w[856 4 1], %w[041 _ _]].
+        #    '_' means an empty indicator ''
+        # 3) How to use it:
+        #   a.  add/update subfields of existed fields in record: TindRecordUtil.update_record(record, tag_subfield_hash)
+        #   b.  remove a list of fields in the record: TindRecordUtil.update_record(record, nil, fields_removal_list)
+        #   c.  both a. and b. : TindRecordUtil.update_record(record, tag_subfield_hash, fields_removal_list)
+        def update_record(record, tag_subfield_hash, fields_removal_list = nil)
+          return record unless valid_hash?(tag_subfield_hash) || valid_hash?(fields_removal_list)
+
+          fields = record.fields
+          final_fields = tag_subfield_hash ? subfields_to_existed_fields(fields, tag_subfield_hash) : fields
+          remove_fields(final_fields, fields_removal_list) if fields_removal_list
+          new_record(final_fields)
+        end
+
+        private
+
+        def subfields_to_existed_fields(fields, tag_subfield_hash)
+          updated_fields = []
+          tags = tag_subfield_hash.keys
+          fields.each do |field|
+            tag = field.tag
+            need_change_subfield = tags.include? tag
+            updated_fields << (need_change_subfield ? field_changed_subfields(field, tag_subfield_hash[tag]) : field)
+          end
+          fields
+        end
+
+        # example: fields_removal_list = [%w[856 4 1]]
+        def remove_fields(fields, fields_removal_list)
+          fields.reject! { |f| field_in_removal_list?(f, fields_removal_list) }
+        end
+
+        def new_record(fields)
+          record = ::MARC::Record.new
+          fields.each { |f| record.append(f) }
+          record
+        end
+
+        # subfield_hash example  { 'b' => 'subtitle', 'a' => 'title' }
+        def field_changed_subfields(field, subfield_hash)
+          tag = field.tag
+          indicators = [field.indicator1, field.indicator2]
+          subfields = changed_subfields(field, subfield_hash)
+          new_datafield(tag, indicators, subfields)
+        end
+
+        # example subfield_hash = { 'p' =>  'subtitle'}
+        def changed_subfields(field, subfield_hash)
+          subfields = field.subfields
+          codes = subfields.map(&:code)
+          warning_duplicated_subfield_code(codes)
+
+          keys = subfield_hash.keys
+
+          keys_no_related_codes = keys - codes
+          keys_with_related_codes = keys - keys_no_related_codes
+
+          updated_subfields(subfields, keys_with_related_codes, subfield_hash)
+
+          subfields.concat new_subfields(field, keys_no_related_codes, subfield_hash)
+          subfields
+        end
+
+        # example subfield_hash = { 'p' =>  'subtitle'}
+        def updated_subfields(subfields, existed_codes, subfield_hash)
+          subfields.each do |subfield|
+            code = subfield.code
+            next unless existed_codes.include? code
+
+            val = subfield_hash[code]
+            next unless val
+
+            subfield.value = val
+          end
+        end
+
+        def new_subfields(_field, new_codes, subfield_hash)
+          subfields = []
+          subfield_hash.each do |key, val|
+            next unless val
+
+            subfields << ::MARC::Subfield.new(key, val) if new_codes.include? key
+          end
+          subfields
+        end
+
+        def field_in_removal_list?(f, fields_removal_list)
+          ls = [f.tag, clr(f.indicator1), clr(f.indicator2)]
+          fields_removal_list.include? ls
+        end
+
+        def clr(str)
+          str.strip.empty? ? '_' : str.strip
+        end
+
+        def new_datafield(tag, indicator, subfields)
+          datafield = ::MARC::DataField.new(tag, indicator[0], indicator[1])
+          subfields.each { |sf| datafield.append(sf) }
+          datafield
+        end
+
+        # suppose there are no duplicated subfield codes in a field
+        # giving warning for investigation if finding any dublicated subfields in a field
+        def warning_duplicated_subfield_code(codes)
+          duplicated_codes = codes.select { |code| codes.count(code) > 1 }.uniq
+          puts "Warning: duplicated subfields #{duplicated_codes.join(' ; ')}" unless duplicated_codes.empty?
+        end
+
+        def valid_hash?(hash)
+          hash && !hash.empty?
+        end
+
+      end
+    end
+  end
+end

data/lib/berkeley_library/tind/mapping/util.rb

@@ -1,10 +1,12 @@
 require 'csv'
 require 'marc'
+require 'berkeley_library/tind/mapping/alma_base'
 
 module BerkeleyLibrary
   module TIND
     module Mapping
       module Util
+        include AlmaBase
 
         class << self
 
@@ -78,6 +80,23 @@ module BerkeleyLibrary
             all_from_xml(xml).first
           end
 
+          def collection_config_correct?
+            no_including = BerkeleyLibrary::TIND::Mapping::AlmaBase.including_origin_tags.empty?
+            no_excluding = BerkeleyLibrary::TIND::Mapping::AlmaBase.excluding_origin_tags.empty?
+            no_including || no_excluding
+          end
+
+          # subfield util
+          def order_subfields(subfields, codes)
+            found_subfields = []
+            codes.each do |code|
+              sfs = subfields.select { |subfield| subfield.code == code }
+              found_subfields.concat sfs
+            end
+            not_found_subfields = subfields - found_subfields
+            found_subfields.concat not_found_subfields
+          end
+
           private
 
           def clr_row(row)

data/lib/berkeley_library/tind/module_info.rb

@@ -7,7 +7,7 @@ module BerkeleyLibrary
       SUMMARY = 'TIND DA utilities for the UC Berkeley Library'.freeze
       DESCRIPTION = 'UC Berkeley Library utility gem for working with the TIND DA digital archive.'.freeze
       LICENSE = 'MIT'.freeze
-      VERSION = '0.6.0'.freeze
+      VERSION = '0.7.0'.freeze
       HOMEPAGE = 'https://github.com/BerkeleyLibrary/tind'.freeze
     end
   end

data/spec/berkeley_library/tind/mapping/alma_multiple_tind_spec.rb

@@ -5,7 +5,7 @@ module BerkeleyLibrary
     module Mapping
       describe AlmaMultipleTIND do
         let(:additona_245_field) { [Util.datafield('245', [' ', ' '], [Util.subfield('a', 'fake 245 a')])] }
-        let(:marc_obj) { (::MARC::Record.new).append(additona_245_field) }
+        let(:marc_obj) { ::MARC::Record.new.append(additona_245_field) }
 
         it ' get tind record' do
           allow_any_instance_of(BerkeleyLibrary::TIND::Mapping::AlmaMultipleTIND).to receive(:alma_record_from).with('991085821143406532').and_return(marc_obj)

data/spec/berkeley_library/tind/mapping/alma_single_tind_spec.rb

@@ -5,7 +5,7 @@ module BerkeleyLibrary
     module Mapping
       describe AlmaSingleTIND do
         let(:additona_245_field) { [Util.datafield('245', [' ', ' '], [Util.subfield('a', 'fake 245 a')])] }
-        let(:marc_obj) { (::MARC::Record.new).append(additona_245_field) }
+        let(:marc_obj) { ::MARC::Record.new.append(additona_245_field) }
 
         before { BerkeleyLibrary::Alma::Config.default! }
         after { BerkeleyLibrary::Alma::Config.send(:clear!) }

data/spec/berkeley_library/tind/mapping/field_catalog_util_spec.rb

@@ -31,6 +31,11 @@ module BerkeleyLibrary
         let(:pre_tag) { ['264', '264'] }
         let(:pre_tag_subfield) { ['507'] }
 
+        after do
+          BerkeleyLibrary::TIND::Mapping::AlmaBase.including_origin_tags = []
+          BerkeleyLibrary::TIND::Mapping::AlmaBase.excluding_origin_tags = []
+        end
+
         it 'excluding fast subject field' do
           fields = qualified_alm_record.fields.select { |f| ['650', '245'].include? f.tag }
           expect(fields.length).to eq 3
@@ -51,6 +56,49 @@ module BerkeleyLibrary
           expect(group[:pre_tag_subfield].map(&:tag)).to eq pre_tag_subfield
         end
 
+        context 'Defining list of fields mapping from Alma to TIND' do
+          it 'no including, excluding defined from config, return all Alma fields for mapping' do
+            selected_field_tags = %w[255 507 245 246 260 300]
+            fields = qualified_alm_record.fields.select { |f| selected_field_tags.include? f.tag }
+            expect(fields_to_map(fields).map(&:tag)).to eq %w[255 507 245 246 260 300 300]
+          end
+
+          it 'both including and excluding have tags, return empty: not allow to define both including and excluding at the same time' do
+            BerkeleyLibrary::TIND::Mapping::AlmaBase.including_origin_tags = %w[254 650]
+            BerkeleyLibrary::TIND::Mapping::AlmaBase.excluding_origin_tags = %w[507 255 650 880]
+
+            selected_field_tags = %w[255 507 245 246 260 300]
+            fields = qualified_alm_record.fields.select { |f| selected_field_tags.include? f.tag }
+            expect(fields_to_map(fields).map(&:tag)).to eq []
+          end
+
+          it 'only including is defined: keeping fields defined in BerkeleyLibrary::TIND::Mapping::AlmaBase.including_origin_tags' do
+            selected_field_tags = regular_field_tags
+            selected_field_tags << '880'
+            selected_field_tags << '001'
+            fields = qualified_alm_record.fields.select { |f| selected_field_tags.include? f.tag }
+            BerkeleyLibrary::TIND::Mapping::AlmaBase.including_origin_tags = %w[255 650]
+            expect(fields_to_map(fields).map(&:tag)).to eq %w[001 255 650 650 880]  # return: Two 650 fields, one 880 field with subfield6 = '650'
+          end
+
+          context 'only excluding origin tags are defined ' do
+            it 'excluding has 880, all 880 fields will be excluded.' do
+              selected_field_tags = %w[001 880 245 507 255 650 630 700 264]
+              fields = qualified_alm_record.fields.select { |f| selected_field_tags.include? f.tag }
+              BerkeleyLibrary::TIND::Mapping::AlmaBase.excluding_origin_tags = %w[507 255 650 880]
+              final_field_tags = %w[001 245 630 700 264 264] # no 880 fields kept
+              expect(fields_to_map(fields).map(&:tag)).to eq final_field_tags
+            end
+
+            it 'excluding has no 880, only 880 whose refered tag located in excluding list will be skipped ' do
+              selected_field_tags = %w[001 880 245 507 255 650 630 700 264]
+              fields = qualified_alm_record.fields.select { |f| selected_field_tags.include? f.tag }
+              BerkeleyLibrary::TIND::Mapping::AlmaBase.excluding_origin_tags = %w[507 255 650]
+              final_field_tags = %w[001 245 880 880 880 880 630 880 700 880 880 880 880 880 880 880 264 264]
+              expect(fields_to_map(fields).map(&:tag)).to eq final_field_tags
+            end
+          end
+        end
       end
     end
   end

data/spec/berkeley_library/tind/mapping/match_tind_field_spec.rb

@@ -12,10 +12,9 @@ module BerkeleyLibrary
         let(:tind_marc) { TindMarc.new(qualified_alm_record) }
 
         let(:data_fields) { tind_marc.field_catalog.data_fields_880_group[:normal].concat tind_marc.field_catalog.data_fields_group[:normal] }
-        let(:no_880_matching_count) { 4 }
+        let(:no_880_matching_count) { 5 }
 
         it 'get 880 un-matched fields' do
-          # puts tind_marc.send(:un_matched_fields_880, data_fields, '991032577079706532').inspect
           expect(tind_marc.send(:un_matched_fields_880, data_fields, '991032577079706532').length).to eq no_880_matching_count
         end
 

data/spec/berkeley_library/tind/mapping/tind_field_from_single_map_spec.rb

@@ -143,6 +143,23 @@ module BerkeleyLibrary
           end
         end
 
+        describe '9.1 - 710: subfields ordered on mapping file order' do
+          let(:tindfield_from_single_map) { TindFieldFromSingleMap.new(qualified_alma_obj.field('710'), false) }
+          it 'get subfield code ordered' do
+            codes = tindfield_from_single_map.to_datafield.subfields.map(&:code)
+            expect(codes).to eq %w[6 a e]
+          end
+        end
+
+        describe '9.2 subfield order - 255: subfields ordered on original subfields' do
+          let(:tindfield_from_single_map) { TindFieldFromSingleMap.new(qualified_alma_obj.field('255'), false) }
+
+          it 'get subfield code ordered' do
+            codes = tindfield_from_single_map.to_datafield.subfields.map(&:code)
+            expect(codes).to eq %w[a c b 6]
+          end
+        end
+
       end
 
     end

data/spec/berkeley_library/tind/mapping/tind_record_util_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'marc'
+
+module BerkeleyLibrary
+  module TIND
+    module Mapping
+      describe TindRecordUtil do
+        let(:qualified_alma_obj) { Alma.new('spec/data/mapping/record.xml') }
+        let(:qualified_alm_record) { qualified_alma_obj.record }
+        let(:tind_marc) { TindMarc.new(qualified_alm_record).tind_record }
+
+        it 'Remove fields from record' do
+          fields_removal_list = [%w[245 _ _], %w[700 1 _], %w[880 _ _]]  # '_' means empty indicator
+          results = %w[255 246 260 300 300 490 630 650 710 903 041 269 255 880 880 880] # some 880's inicator is not empty
+          new_record = TindRecordUtil.update_record(tind_marc, nil, fields_removal_list)
+          expect(new_record.fields.map(&:tag)).to eq results
+        end
+
+        it 'add/update sufields from record' do
+          tag_subfield_dic = { '245' => { 'b' => 'subtitle', 'a' => 'title', 'd' => 'fake' }, '255' => { 'a' => nil } }
+          new_record = TindRecordUtil.update_record(tind_marc, tag_subfield_dic, nil)
+          expect(new_record['245']['a']).to eq 'title'
+          expect(new_record['245']['b']).to eq 'subtitle'
+          expect(new_record['245']['d']).to eq 'fake'
+          expect(new_record['255']['a']).to eq 'fake_255_a'
+        end
+      end
+    end
+  end
+end

data/spec/data/api/pre_assigned_response.json

@@ -0,0 +1,15 @@
+{
+    "data": {
+      "url": "https://test_bucket.s3.amazonaws.com/",
+      "fields": {
+        "x-amz-algorithm": "AWS4-HMAC-SHA256",
+        "key": "711aca11-0de1-4110-ac73-8989",
+        "acl": "private",
+        "x-amz-signature": "ac8a1f0ed10e24a694fcaf266beca03687a20b46",
+        "x-amz-date": "20220729T204134Z",
+        "policy": "eyJjb25kaXRpbbs5r69kIjogInByaXZhdGUir5y1w9XQiOiAidGluZC10ZXN0YnVja2V0LWJl",
+        "x-amz-credential": "AKIA5NL2DYQQ3DIWY6Pe960bes66"
+      }
+    },
+    "bucket": "testbucket"
+  }

data/spec/data/api/result_file.csv

@@ -0,0 +1,3 @@
+mmsid,filename,object_key,etag,md5,timestamp
+99100123,a.jpg,a123b123a,b698k56a,matched,06/12/2022
+99100123,b.jpg,a123b123b,b698k54b,matched,06/12/2022

data/spec/data/api/upload_file.json

@@ -0,0 +1 @@
+{}

data/spec/data/api/upload_response.json

@@ -0,0 +1,13 @@
+
+{
+  "code": 204,
+  "headers": {
+    "x_amz_id_2": "R8141+vOxVvEY7i8RuRTlLJE9DePeQ0hpZv0NYvSIvcO/e8OhrnO+Z3Yw=",
+    "x_amz_request_id": "H2EDK70DW0Y2D",
+    "date": "Fri, 29 Jul 2022 22:22:08 GMT",
+    "etag": "\"99914b932bd37a50b983c5e7c90ae93b\"",
+    "location": "https://testbucket.s3.amazonaws.com/b59a3d00-950e-45d2-af1c-746b8fde5977",
+    "server": "AmazonS3"
+  },
+  "body":""
+}

data/spec/data/mapping/record.xml

@@ -50,6 +50,9 @@
           </datafield> -->
           <datafield ind1=" " ind2=" " tag="255">
              <subfield code="a">fake_255_a</subfield>
+              <subfield code="c">fake_255_c</subfield>
+               <subfield code="b">fake_255_b</subfield>
+                <subfield code="6">fake_255_6</subfield>
           </datafield>
 
           <datafield ind1=" " ind2=" " tag="507">
@@ -165,14 +168,14 @@
             <subfield code="e">xue.</subfield>
             <subfield code="a">Sun, Xingyan,</subfield>
             <subfield code="d">1753-1818,</subfield>
-           
+
           </datafield>
           <datafield ind1="1" ind2=" " tag="880">
             <subfield code="6">700-06/$1</subfield>
             <subfield code="e">學.</subfield>
             <subfield code="a">孫星衍,</subfield>
             <subfield code="d">1753-1818,</subfield>
-            
+
           </datafield>
           <datafield ind1="9" ind2=" " tag="710">
             <subfield code="6">880-07</subfield>
@@ -260,4 +263,4 @@
     <xb:exact>true</xb:exact>
     <xb:responseDate>2022-01-27T19:08:03-0800</xb:responseDate>
   </extraResponseData>
-</searchRetrieveResponse>
+</searchRetrieveResponse>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berkeley_library-tind
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - David Moles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkeley_library-alma
@@ -65,6 +65,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,6 +75,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement
@@ -451,6 +457,7 @@ files:
 - lib/berkeley_library/tind/mapping/tind_field_from_single_map.rb
 - lib/berkeley_library/tind/mapping/tind_field_util.rb
 - lib/berkeley_library/tind/mapping/tind_marc.rb
+- lib/berkeley_library/tind/mapping/tind_record_util.rb
 - lib/berkeley_library/tind/mapping/tind_subfield_util.rb
 - lib/berkeley_library/tind/mapping/util.rb
 - lib/berkeley_library/tind/marc.rb
@@ -458,7 +465,6 @@ files:
 - lib/berkeley_library/tind/marc/xml_reader.rb
 - lib/berkeley_library/tind/marc/xml_writer.rb
 - lib/berkeley_library/tind/module_info.rb
-- lib/berkeley_library/util/files.rb
 - lib/berkeley_library/util/ods/spreadsheet.rb
 - lib/berkeley_library/util/ods/xml/content_doc.rb
 - lib/berkeley_library/util/ods/xml/document_node.rb
@@ -543,6 +549,7 @@ files:
 - spec/berkeley_library/tind/mapping/tind_field_spec.rb
 - spec/berkeley_library/tind/mapping/tind_field_util_spec.rb
 - spec/berkeley_library/tind/mapping/tind_marc_spec.rb
+- spec/berkeley_library/tind/mapping/tind_record_util_spec.rb
 - spec/berkeley_library/tind/mapping/tind_subfield_util_spec.rb
 - spec/berkeley_library/tind/mapping/util_spec.rb
 - spec/berkeley_library/tind/marc/xml_reader_spec.rb
@@ -556,6 +563,10 @@ files:
 - spec/berkeley_library/util/ods/xml/style/family_spec.rb
 - spec/berkeley_library/util/ods/xml/table/table_row_spec.rb
 - spec/berkeley_library/util/ods/xml/table/table_spec.rb
+- spec/data/api/pre_assigned_response.json
+- spec/data/api/result_file.csv
+- spec/data/api/upload_file.json
+- spec/data/api/upload_response.json
 - spec/data/collection-names.txt
 - spec/data/collections.json
 - spec/data/disjoint-records.xml
@@ -605,83 +616,4 @@ rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: TIND DA utilities for the UC Berkeley Library
-test_files:
-- spec/.rubocop.yml
-- spec/berkeley_library/tind/api/api_exception_spec.rb
-- spec/berkeley_library/tind/api/api_spec.rb
-- spec/berkeley_library/tind/api/collection_spec.rb
-- spec/berkeley_library/tind/api/date_range_spec.rb
-- spec/berkeley_library/tind/api/format_spec.rb
-- spec/berkeley_library/tind/api/search_spec.rb
-- spec/berkeley_library/tind/config_spec.rb
-- spec/berkeley_library/tind/export/column_group_spec.rb
-- spec/berkeley_library/tind/export/column_spec.rb
-- spec/berkeley_library/tind/export/config_spec.rb
-- spec/berkeley_library/tind/export/export_command_spec.rb
-- spec/berkeley_library/tind/export/export_format_spec.rb
-- spec/berkeley_library/tind/export/export_matcher.rb
-- spec/berkeley_library/tind/export/export_spec.rb
-- spec/berkeley_library/tind/export/exporter_spec.rb
-- spec/berkeley_library/tind/export/row_spec.rb
-- spec/berkeley_library/tind/export/table_spec.rb
-- spec/berkeley_library/tind/mapping/additional_datafield_process_spec.rb
-- spec/berkeley_library/tind/mapping/alma_base_spec.rb
-- spec/berkeley_library/tind/mapping/alma_multiple_tind_spec.rb
-- spec/berkeley_library/tind/mapping/alma_single_tind_spec.rb
-- spec/berkeley_library/tind/mapping/alma_spec.rb
-- spec/berkeley_library/tind/mapping/config_spec.rb
-- spec/berkeley_library/tind/mapping/csv_mapper_spec.rb
-- spec/berkeley_library/tind/mapping/csv_multiple_mapper_spec.rb
-- spec/berkeley_library/tind/mapping/external_tind_field_spec.rb
-- spec/berkeley_library/tind/mapping/field_catalog_spec.rb
-- spec/berkeley_library/tind/mapping/field_catalog_util_spec.rb
-- spec/berkeley_library/tind/mapping/match_tind_field_spec.rb
-- spec/berkeley_library/tind/mapping/misc_spec.rb
-- spec/berkeley_library/tind/mapping/multiple_rule_spec.rb
-- spec/berkeley_library/tind/mapping/single_rule_spec.rb
-- spec/berkeley_library/tind/mapping/tind_control_subfield_spec.rb
-- spec/berkeley_library/tind/mapping/tind_field_from_leader_spec.rb
-- spec/berkeley_library/tind/mapping/tind_field_from_multiple_map_spec.rb
-- spec/berkeley_library/tind/mapping/tind_field_from_single_map_spec.rb
-- spec/berkeley_library/tind/mapping/tind_field_spec.rb
-- spec/berkeley_library/tind/mapping/tind_field_util_spec.rb
-- spec/berkeley_library/tind/mapping/tind_marc_spec.rb
-- spec/berkeley_library/tind/mapping/tind_subfield_util_spec.rb
-- spec/berkeley_library/tind/mapping/util_spec.rb
-- spec/berkeley_library/tind/marc/xml_reader_spec.rb
-- spec/berkeley_library/tind/marc/xml_writer_spec.rb
-- spec/berkeley_library/util/ods/spreadsheet_spec.rb
-- spec/berkeley_library/util/ods/xml/content_doc_spec.rb
-- spec/berkeley_library/util/ods/xml/manifest/file_entry_spec.rb
-- spec/berkeley_library/util/ods/xml/manifest/manifest_spec.rb
-- spec/berkeley_library/util/ods/xml/office/document_content_spec.rb
-- spec/berkeley_library/util/ods/xml/style/automatic_styles_spec.rb
-- spec/berkeley_library/util/ods/xml/style/family_spec.rb
-- spec/berkeley_library/util/ods/xml/table/table_row_spec.rb
-- spec/berkeley_library/util/ods/xml/table/table_spec.rb
-- spec/data/collection-names.txt
-- spec/data/collections.json
-- spec/data/disjoint-records.xml
-- spec/data/issue-4.xml
-- spec/data/mapping/991032333019706532-sru.xml
-- spec/data/mapping/one_to_multiple_mapping.csv
-- spec/data/mapping/one_to_one_mapping.csv
-- spec/data/mapping/record.xml
-- spec/data/mapping/record_not_qualified.xml
-- spec/data/new-records.xml
-- spec/data/record-184453.xml
-- spec/data/record-184458.xml
-- spec/data/record-187888.xml
-- spec/data/records-api-search-cjk-p1.xml
-- spec/data/records-api-search-cjk-p2.xml
-- spec/data/records-api-search-p1.xml
-- spec/data/records-api-search-p2.xml
-- spec/data/records-api-search-p3.xml
-- spec/data/records-api-search-p4.xml
-- spec/data/records-api-search-p5.xml
-- spec/data/records-api-search-p6.xml
-- spec/data/records-api-search-p7.xml
-- spec/data/records-api-search.xml
-- spec/data/records-manual-search.xml
-- spec/spec_helper.rb
-- test/profile/table_from_records_profile.rb
+test_files: []

data/lib/berkeley_library/util/files.rb

@@ -1,38 +0,0 @@
-module BerkeleyLibrary
-  module Util
-    # TODO: Move this to `berkeley_library-util`
-    module Files
-      class << self
-        include Files
-      end
-
-      def file_exists?(path)
-        (path.respond_to?(:exist?) && path.exist?) ||
-          (path.respond_to?(:to_str) && File.exist?(path))
-      end
-
-      def parent_exists?(path)
-        path.respond_to?(:parent) && path.parent.exist? ||
-          path.respond_to?(:to_str) && Pathname.new(path).parent.exist?
-      end
-
-      # Returns true if `obj` is close enough to an IO object for Nokogiri
-      # to parse as one.
-      #
-      # @param obj [Object] the object that might be an IO
-      # @see https://github.com/sparklemotion/nokogiri/blob/v1.11.1/lib/nokogiri/xml/sax/parser.rb#L81 Nokogiri::XML::SAX::Parser#parse
-      def reader_like?(obj)
-        obj.respond_to?(:read) && obj.respond_to?(:close)
-      end
-
-      # Returns true if `obj` is close enough to an IO object for Nokogiri
-      # to write to.
-      #
-      # @param obj [Object] the object that might be an IO
-      def writer_like?(obj)
-        obj.respond_to?(:write) && obj.respond_to?(:close)
-      end
-
-    end
-  end
-end