diff options
| author | francis <francis> | 2009-09-22 19:16:35 +0000 |
|---|---|---|
| committer | francis <francis> | 2009-09-22 19:16:35 +0000 |
| commit | cd0104057508c353dcf6f4907fe6066cf26281e9 (patch) | |
| tree | 127b69298a7c775169e63a7290eca060fb362ac8 | |
| parent | 284ba4a44952441283bb516637b5d998508d72e2 (diff) | |
Don't need that hack any more with -nodrm.
| -rw-r--r-- | app/models/incoming_message.rb | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 45089e0a7..f18a8b57f 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -19,7 +19,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: incoming_message.rb,v 1.226 2009-09-22 18:28:39 francis Exp $ +# $Id: incoming_message.rb,v 1.227 2009-09-22 19:16:35 francis Exp $ # TODO # Move some of the (e.g. quoting) functions here into rblib, as they feel @@ -321,17 +321,6 @@ class FOIAttachment IO.popen("/usr/bin/pdftohtml -nodrm -zoom 1.0 -stdout -enc UTF-8 -noframes " + tempfile.path + "", "r") do |child| html = child.read() end - - # if pdftohtml failed (size zero is only way to detect this, as doesn't return error codes) - # try converting to postscript and back, to strip problems such as this error: - # "Error: Copying of text from this document is not allowed" - if html.size == 0 - system("/usr/bin/pdf2ps " + tempfile.path + " " + tempfile.path + ".ps") - system("/usr/bin/ps2pdf " + tempfile.path + ".ps " + tempfile.path) - IO.popen("/usr/bin/pdftohtml -nodrm -zoom 1.0 -stdout -enc UTF-8 -noframes " + tempfile.path + "", "r") do |child| - html = child.read() - end - end else raise "No HTML conversion available for type " + self.content_type end |