From 09619bd8c5d7474993c918e0b5ef274105c255c7 Mon Sep 17 00:00:00 2001 From: Alex Dolski Date: Fri, 22 Dec 2023 10:44:02 -0600 Subject: [PATCH] Re-enable libreoffice in derivative_pdf_url() --- app/util/derivative_generator.rb | 3 +-- test/util/derivative_generator_test.rb | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/util/derivative_generator.rb b/app/util/derivative_generator.rb index fa6be1e1..36d7b8fe 100644 --- a/app/util/derivative_generator.rb +++ b/app/util/derivative_generator.rb @@ -100,8 +100,7 @@ def derivative_pdf_url key = derivative_pdf_key unless store.object_exists?(key: key) - # TODO: update libreoffice and remove this conditional - self.generate_pdf_derivative if format.derivative_generator != "libreoffice" + self.generate_pdf_derivative end store.presigned_download_url(key: key, expires_in: expiry) end diff --git a/test/util/derivative_generator_test.rb b/test/util/derivative_generator_test.rb index 7914bfa4..64bdaf22 100644 --- a/test/util/derivative_generator_test.rb +++ b/test/util/derivative_generator_test.rb @@ -93,7 +93,6 @@ class DerivativeGeneratorTest < ActiveSupport::TestCase test "derivative_pdf_url() returns the URL of a PDF for a bitstream that can be converted into PDF" do - skip # TODO: unskip this when openoffice is enabled again @bitstream = bitstreams(:southwest_unit1_collection1_item1_doc) @generator = DerivativeGenerator.new(@bitstream) url = @generator.derivative_pdf_url