Index contentMetadata mimetypes regardless of whether the file is she…

…lved or not

lib/dor/datastreams/content_metadata_ds.rb

@@ -95,9 +95,10 @@ def to_solr(solr_doc = {}, *args)
           counts['content_file'] += 1
           preserved_size += file['size'].to_i if file['preserve'] == 'yes'
           shelved_size += file['size'].to_i if file['shelve'] == 'yes'
-          next unless file['shelve'] == 'yes'
-          counts['shelved_file'] += 1
-          first_shelved_image ||= file['id'] if file['id'] =~ /jp2$/
+          if file['shelve'] == 'yes'
+            counts['shelved_file'] += 1
+            first_shelved_image ||= file['id'] if file['id'] =~ /jp2$/
+          end
           mime_types << file['mimetype']
         end
       end

spec/datastreams/content_metadata_ds_spec.rb

@@ -200,7 +200,7 @@
     it 'should generate required fields' do
       expected = {
         'content_type_ssim'               => 'map',
-        'content_file_mimetypes_ssim'     => ['image/jp2'],
+        'content_file_mimetypes_ssim'     => ['image/jp2', 'image/gif', 'image/tiff'],
         'shelved_content_file_count_itsi' => 1,
         'resource_count_itsi'             => 1,
         'content_file_count_itsi'         => 3,