Merge pull request #13 from UNC-Libraries/discard-subfields-lacking-c…

…odes

subfield_arry discards subfields with no subfield code

lib/sierra_postgres_utilities/helpers/varfields.rb

@@ -87,13 +87,14 @@ def extract_subfields(field_content, desired_subfields, trim_punct: false,
       def subfield_arry(field_content, implicit_sfa: true)
         field_content = add_explicit_sf_a(field_content) if implicit_sfa
         arry = field_content.split('|')
+
+        # delete anything prior to the first subfield delimiter (which often
+        #   but not always means deleting an empty string), then delete
+        #   any/other empty strings
         arry.shift
-        # if field_content is literally "|" (no subfield code), arry will be empty
-        # array; doing arry[1..-1].map... (without shifting) would throw an error
-        # when arry is empty.
+        arry.delete(''.freeze)
         arry.map { |x| [x[0], x[1..-1]] }
       end
-
     end
   end
 end

lib/sierra_postgres_utilities/sierradb.rb

@@ -186,7 +186,7 @@ def self.write_xlsx(outfile, results, headers)
       worksheet.Range("A#{i}:#{end_col}#{i}").value = result.values
     end
     # save and close excel
-    outfilepath = File.join(Dir.pwd, outfile).gsub(/\//, '\\\\')
+    outfilepath = outfile.gsub(/\//, '\\\\')
     File.delete(outfilepath) if File.exist?(outfilepath)
     workbook.saveas(outfilepath)
     excel.quit

spec/helpers/varfields_spec.rb

@@ -121,10 +121,15 @@ class SpecDummy
       end
     end
 
-    it 'returns empty array if field_content is literal "|"' do
-      expect(dummy.subfield_arry('|')).to eq([])
-    end
-
+    context 'when subfield lacks subfield code' do
+      it 'discards that subfield' do
+        expect(dummy.subfield_arry('|adata||balso data')).
+          to eq([['a', 'data'], ['b', 'also data']])
+      end
 
+      it 'returns empty array if no subfields left' do
+        expect(dummy.subfield_arry('|')).to eq([])
+      end
+    end
   end
 end