Merge pull request #6345 from samvera/valk_ch12n_opts

Pass our ch12n config to the ch12n service and enable fits_servlet
samvera · Oct 10, 2023 · 2063668 · 2063668
2 parents fd80a1f + 56ce64e
commit 2063668
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.dassie/.env b/.dassie/.env
@@ -1,6 +1,7 @@
 ANALYTICS_START_DATE=2021-08-21
 BUNDLE_GEMFILE=Gemfile.dassie
 BUNDLE_PATH=/app/bundle
+CH12N_TOOL=fits_servlet
 CHROME_HEADLESS_MODE=false
 DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
 DATABASE_TEST_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax_test?pool=5

diff --git a/.koppie/.env b/.koppie/.env
@@ -1,5 +1,6 @@
 BUNDLE_GEMFILE=Gemfile.koppie
 BUNDLE_PATH=/app/bundle
+CH12N_TOOL=fits_servlet
 CHROME_HEADLESS_MODE=false
 DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
 DATABASE_TEST_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax_test?pool=5

diff --git a/app/services/hyrax/listeners/file_metadata_listener.rb b/app/services/hyrax/listeners/file_metadata_listener.rb
@@ -52,7 +52,7 @@ def on_file_uploaded(event)
 
         Hyrax.config
              .characterization_service
-             .run(metadata: event[:metadata], file: event[:metadata].file)
+             .run(metadata: event[:metadata], file: event[:metadata].file, **Hyrax.config.characterization_options)
       end
     end
   end