summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2011-05-06 19:47:16 +0200
committermguetlein <martin.guetlein@gmail.com>2011-05-06 19:47:16 +0200
commitcb24d25f3a0c07d400cc2eaf775adcd49e60c979 (patch)
treec34f342d3962c80df5eb0f93b816d3c22307102e
parent584fbc8ad71f9487909c2e19f80c84ac91d33d10 (diff)
fix report encoding problems
-rwxr-xr-xreport/report_application.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/report/report_application.rb b/report/report_application.rb
index 5a47063..258daa7 100755
--- a/report/report_application.rb
+++ b/report/report_application.rb
@@ -82,6 +82,8 @@ get '/report/:type/:id' do
report = rs.get_report(params[:type],params[:id],accept_header)
format = Reports::ReportFormat.get_format(accept_header)
content_type format
+ # default encoding is utf-8, html conversion produces iso-8859-1 encoding
+ content_type "text/html", 'charset' => 'ISO-8859-1' if format=="text/html"
#PENDING: get_report should return file or string, check for result.is_file instead of format
if format=="application/x-yaml" or format=="application/rdf+xml"
report