Skip to content

Remove tailing _oai from oai set specs and characterization term tweaks #3656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CGillen wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Remove tailing _oai from oai set specs and characterization term tweaks #3656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aab5baf
Improve characterization term handling a little bit
CGillen Jun 5, 2026
eca2245
Remove tailing _oai from OAI set ids
CGillen Jun 5, 2026
1518d70
Lint
CGillen Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions app/models/file_set.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,10 @@ def oembed?
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)
Expand Down
1 change: 1 addition & 0 deletions app/models/oai_set.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { |set| set.spec = set.spec.sub('_oai', '') }
sets.empty? ? nil : sets
end
end
Expand Down
7 changes: 5 additions & 2 deletions app/presenters/hyrax/file_set_presenter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -49,6 +51,7 @@ def self.characterization_terms
]
end
delegate(*characterization_terms, to: :solr_document)
alias filename file_name

def workflow
nil
Expand Down