diff options
| author | mr <mr@mrautenberg.de> | 2011-05-23 13:39:56 +0200 |
|---|---|---|
| committer | mr <mr@mrautenberg.de> | 2011-05-23 13:39:56 +0200 |
| commit | 916f715ee52049a0968bc04df5aa6ca0a9a6881d (patch) | |
| tree | 99bbf52ad3b7495114ffe50194b8f9c606f5f248 /report/report_application.rb | |
| parent | 96d500e9691eedbfdd57ec35a2572b59641377f3 (diff) | |
| parent | eb5f8b5da9b247d62abc8a7b9eb2e44fe46a1c79 (diff) | |
Merge branch 'release/2.0.0'v2.0.0
Diffstat (limited to 'report/report_application.rb')
| -rwxr-xr-x | report/report_application.rb | 2 |
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 |