Merge pull request #141 from scientist-softserv/add-bulkrax-metadata-…

…to-cdl-resource_redux pull in changes to cdl without the submodule to gemfile.lock changes
scientist-softserv · Sep 20, 2024 · ade5dba · ade5dba
2 parents 1eb8eab + 49a9b61
commit ade5dba
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/app/forms/cdl_resource_form.rb b/app/forms/cdl_resource_form.rb
@@ -6,10 +6,12 @@
 # @see https://github.com/samvera/hyrax/wiki/Hyrax-Valkyrie-Usage-Guide#forms
 # @see https://github.com/samvera/valkyrie/wiki/ChangeSets-and-Dirty-Tracking
 class CdlResourceForm < Hyrax::Forms::ResourceForm(CdlResource)
+  # Commented out basic_metadata because these terms were added to cdl_resource so we can customize it.
   # include Hyrax::FormFields(:basic_metadata)
   include Hyrax::FormFields(:cdl_resource)
   include Hyrax::FormFields(:with_pdf_viewer)
   include Hyrax::FormFields(:with_video_embed)
+  include Hyrax::FormFields(:bulkrax_metadata)
 
   # Define custom form fields using the Valkyrie::ChangeSet interface
   #

diff --git a/app/indexers/cdl_resource_indexer.rb b/app/indexers/cdl_resource_indexer.rb
@@ -3,8 +3,12 @@
 # Generated via
 #  `rails generate hyrax:work_resource CdlResource`
 class CdlResourceIndexer < Hyrax::ValkyrieWorkIndexer
-  include Hyrax::Indexer(:basic_metadata)
+  # Commented out basic_metadata because these terms were added to cdl_resource so we can customize it.
+  # include Hyrax::Indexer(:basic_metadata)
   include Hyrax::Indexer(:cdl_resource)
+  include Hyrax::Indexer(:bulkrax_metadata)
+  include Hyrax::Indexer(:with_pdf_viewer)
+  include Hyrax::Indexer(:with_video_embed)
 
   include HykuIndexing
 

diff --git a/lib/tasks/bulkrax.rake b/lib/tasks/bulkrax.rake
@@ -8,10 +8,10 @@ namespace :bulkrax do
       switch!(account)
 
       begin
-        Bulkrax::Exporter.all.each do |e|
+        Bulkrax::Exporter.find_each do |e|
           e.update(parser_klass: 'Bulkrax::CsvParser') if e.parser_klass == 'Bulkrax::OerCsvParser' || e.parser_klass == 'Bulkrax::EtdCsvParser'
         end
-        Bulkrax::Importer.all.each do |e|
+        Bulkrax::Importer.find_each do |e|
           e.update(parser_klass: 'Bulkrax::CsvParser') if e.parser_klass == 'Bulkrax::OerCsvParser' || e.parser_klass == 'Bulkrax::EtdCsvParser'
         end
         puts "=============== finished updating #{account.name} ============"