Merge pull request #1038 from sul-dlss/remove-objectId

sul-dlss · Nov 10, 2023 · 2d43489 · 2d43489
2 parents 079c10b + 21b472b
commit 2d43489
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/models/purl.rb b/app/models/purl.rb
@@ -59,7 +59,7 @@ def files_from_xml(druid)
 
     doc.xpath('//contentMetadata/resource').each do |resource|
       resource.xpath('file|externalFile').each do |attr|
-        file = StacksFile.new(id: attr['objectId'] || druid, file_name: attr['fileId'] || attr['id'])
+        file = StacksFile.new(id: druid, file_name: attr['id'])
         yield file
       end
     end

diff --git a/spec/models/purl_spec.rb b/spec/models/purl_spec.rb
@@ -34,7 +34,7 @@
               </resource>
               <resource id="kn112rm5773_2" sequence="2" type="image">
                 <label>Virtual image</label>
-                <file objectId="def" fileId="123.jp2" mimetype="image/jp2" size="3832255">
+                <file id="123.jp2" mimetype="image/jp2" size="3832255">
                   <imageData width="4850" height="4180"/>
                 </file>
               </resource>
@@ -46,7 +46,7 @@
 
       actual = described_class.files('abc').map { |file| "#{file.id}/#{file.file_name}" }
 
-      expect(actual).to match_array ['abc/26855.jp2', 'def/123.jp2']
+      expect(actual).to match_array ['abc/26855.jp2', 'abc/123.jp2']
     end
   end