From 998b23aac1efbc246376242bbf06aec1ac865bec Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 11 May 2015 16:07:17 +0100 Subject: Use a relative path in call to pdftohtml. pdftohtml will use the file path as the basis for generating the image links in the generated HTML, so we want them to be relative, not absolute. Ruby 1.9 tempfile.path will generate an absolute path when given the current directory as the tmpdir, whilst 2.0 and 1.8 will use a relative one. --- lib/attachment_to_html/adapters/pdf.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/attachment_to_html') diff --git a/lib/attachment_to_html/adapters/pdf.rb b/lib/attachment_to_html/adapters/pdf.rb index 3183d1fd0..4543b2d79 100644 --- a/lib/attachment_to_html/adapters/pdf.rb +++ b/lib/attachment_to_html/adapters/pdf.rb @@ -70,10 +70,10 @@ module AttachmentToHTML @converted ||= Dir.chdir(tmpdir) do tempfile = create_tempfile(text) - html = AlaveteliExternalCommand.run("pdftohtml", "-nodrm", "-zoom", "1.0", "-stdout", "-enc", "UTF-8", - "-noframes", tempfile.path, :timeout => 30, :binary_output => false + "-noframes", "./#{File.basename(tempfile.path)}", + :timeout => 30, :binary_output => false ) cleanup_tempfile(tempfile) -- cgit v1.2.3