Merge branch 'release_1.79'

IUBLibTech · Jan 29, 2018 · f4ffebd · f4ffebd
2 parents a932c3f + c68cfdd
commit f4ffebd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/helpers/physical_objects_helper.rb b/app/helpers/physical_objects_helper.rb
@@ -35,7 +35,7 @@ def PhysicalObjectsHelper.parse_xml(xml)
     results = {}
     batch_lookups = { 'Batch identifier' => 'identifier', 'Batch description' => 'description' }
     bin_lookups = { 'Bin barcode' => 'mdpiBarcode', 'Bin identifier' => 'identifier' }
-    po_lookups = { 'Format' => 'format', 'MDPI barcode' => 'mdpiBarcode', 'IUCAT barcode' => 'iucatBarcode', 'Unit' => 'unit', 'Gauge' => 'gauge', 'Frame rate' => 'frameRate', 'Sound' => 'sound', 'Clean' => 'clean', 'Resolution' => 'resolution', 'Color space' => 'colorSpace', 'Mold' => 'mold', 'AD strip' => 'conditions/adStrip', 'Return to' => 'returnTo', 'Anamorphic' => 'anamorphic', 'Conservation actions' => 'conservationActions', 'Track count' => 'trackCount', 'Format duration' => 'duration', 'Footage' => 'footage', 'Title' => 'title', 'Collection name' => 'collectionName', 'Title control number' => 'iucatTitleControlNumber', 'Film title' => 'titleId', 'Return on original reel' => 'returnOnOriginalReel'
+    po_lookups = { 'Format' => 'format', 'MDPI barcode' => 'mdpiBarcode', 'IUCAT barcode' => 'iucatBarcode', 'Unit' => 'unit', 'Gauge' => 'gauge', 'Frame rate' => 'frameRate', 'Sound' => 'sound', 'Clean' => 'clean', 'Resolution' => 'resolution', 'Color space' => 'colorSpace', 'Mold' => 'mold', 'AD strip' => 'conditions/adStrip', 'Return to' => 'returnTo', 'Anamorphic' => 'anamorphic', 'Conservation actions' => 'conservationActions', 'Track count' => 'trackCount', 'Format duration' => 'duration', 'Footage' => 'footage', 'Title' => 'title', 'Collection name' => 'collectionName', 'Title control number' => 'iucatTitleControlNumber', 'Film title' => 'titleId', 'Return on original reel' => 'returnOnOriginalReel', 'Catalog key' => 'catalogKey'
      }
     multivalued_fieldsets = {
       'Aspect ratio' => {

diff --git a/spec/fixtures/filmdb.xml b/spec/fixtures/filmdb.xml
@@ -19,6 +19,7 @@
           <format>Film</format>
           <unit>B-IULMIA</unit>
           <title>La Roue</title>
+          <catalogKey>Sample catalog key</catalogKey>
           <titleId>123</titleId>
           <alternativeTitle/>
           <collectionName/>