From aab5baf38f1eb9e841201c28fb28146833848dfe Mon Sep 17 00:00:00 2001
From: Corey Gillen <corey.gillen@oregonstate.edu>
Date: Fri, 5 Jun 2026 15:00:41 -0700
Subject: [PATCH 1/3] Improve characterization term handling a little bit

---
 app/models/file_set.rb                     | 13 ++++---------
 app/presenters/hyrax/file_set_presenter.rb |  7 +++++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/models/file_set.rb b/app/models/file_set.rb
index 81e469819..6c10d0c5e 100644
--- a/app/models/file_set.rb
+++ b/app/models/file_set.rb
@@ -33,16 +33,11 @@ class FileSet < ActiveFedora::Base
   def oembed?
     !oembed_url.nil? && !oembed_url.empty?
   end
-
   def self.characterization_terms
-    %i[
-      format_label file_size well_formed valid date_created fits_version
-      exif_version original_checksum byte_order compression height width color_space
-      profile_name profile_version orientation color_map image_producer capture_device
-      scanning_software gps_timestamp latitude longitude file_title creator page_count
-      language word_count character_count line_count character_set markup_basis markup_language
-      paragraph_count table_count graphics_count bit_depth channels data_format frame_rate
-      bit_rate duration sample_rate offset aspect_ratio
+    Hyrax::FileSetPresenter.characterization_terms - %i[
+      last_modified file_format
+    ] + %i[
+      date_modified
     ]
   end
   delegate(*characterization_terms, to: :characterization_proxy)
diff --git a/app/presenters/hyrax/file_set_presenter.rb b/app/presenters/hyrax/file_set_presenter.rb
index f22544774..0012549c3 100644
--- a/app/presenters/hyrax/file_set_presenter.rb
+++ b/app/presenters/hyrax/file_set_presenter.rb
@@ -39,8 +39,10 @@ def initialize(solr_document, current_ability, request = nil)
 
     def self.characterization_terms
       %i[
-        format_label file_size well_formed valid date_created fits_version
-        exif_version original_checksum byte_order compression height width color_space
+        file_format file_name mime_type alpha_channels
+        last_modified date_created
+        format_label file_size well_formed
+        original_checksum byte_order compression height width color_space
         profile_name profile_version orientation color_map image_producer capture_device
         scanning_software gps_timestamp latitude longitude file_title creator page_count
         language word_count character_count line_count character_set markup_basis markup_language
@@ -49,6 +51,7 @@ def self.characterization_terms
       ]
     end
     delegate(*characterization_terms, to: :solr_document)
+    alias filename file_name
 
     def workflow
       nil

From eca22459d4efb4ab3e2bced2df71abf8ebcd8d8d Mon Sep 17 00:00:00 2001
From: Corey Gillen <corey.gillen@oregonstate.edu>
Date: Fri, 5 Jun 2026 15:15:29 -0700
Subject: [PATCH 2/3] Remove tailing _oai from OAI set ids

---
 app/models/oai_set.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/oai_set.rb b/app/models/oai_set.rb
index e8c9a9ff5..2a520522a 100644
--- a/app/models/oai_set.rb
+++ b/app/models/oai_set.rb
@@ -38,6 +38,7 @@ def sets_from_facets(facets)
         sets.concat(terms.each_slice(2).map { |t| new(t.first) })
       end
       sets = sets.reject { |set| set.name.nil? }
+      sets.each do |set| set.spec = set.spec.sub('_oai', '') end
       sets.empty? ? nil : sets
     end
   end

From 1518d705a8eb429e13ca895b6adbd839e4a3da19 Mon Sep 17 00:00:00 2001
From: Corey Gillen <corey.gillen@oregonstate.edu>
Date: Fri, 5 Jun 2026 15:17:58 -0700
Subject: [PATCH 3/3] Lint

---
 app/models/file_set.rb | 1 +
 app/models/oai_set.rb  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/file_set.rb b/app/models/file_set.rb
index 6c10d0c5e..9c914ece1 100644
--- a/app/models/file_set.rb
+++ b/app/models/file_set.rb
@@ -33,6 +33,7 @@ class FileSet < ActiveFedora::Base
   def oembed?
     !oembed_url.nil? && !oembed_url.empty?
   end
+
   def self.characterization_terms
     Hyrax::FileSetPresenter.characterization_terms - %i[
       last_modified file_format
diff --git a/app/models/oai_set.rb b/app/models/oai_set.rb
index 2a520522a..a75daa102 100644
--- a/app/models/oai_set.rb
+++ b/app/models/oai_set.rb
@@ -38,7 +38,7 @@ def sets_from_facets(facets)
         sets.concat(terms.each_slice(2).map { |t| new(t.first) })
       end
       sets = sets.reject { |set| set.name.nil? }
-      sets.each do |set| set.spec = set.spec.sub('_oai', '') end
+      sets.each { |set| set.spec = set.spec.sub('_oai', '') }
       sets.empty? ? nil : sets
     end
   end