diff options
| author | mguetlein <martin.guetlein@gmail.com> | 2013-08-09 08:57:58 +0200 |
|---|---|---|
| committer | mguetlein <martin.guetlein@gmail.com> | 2013-08-09 08:57:58 +0200 |
| commit | c1e06d27e9c7ae5fb95130a45e99abba9efc5c06 (patch) | |
| tree | 16977a57f127b9772a9a72e350390520c56861bb | |
| parent | c9498b7c1ce419cd534cb0f9005762561f2b33ec (diff) | |
adjust setting of accept once again (as we apparently do exact string comparisons later)
| -rw-r--r-- | lib/opentox.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/opentox.rb b/lib/opentox.rb index aeea589..4143414 100644 --- a/lib/opentox.rb +++ b/lib/opentox.rb @@ -30,10 +30,12 @@ module OpenTox before do @uri = uri(request.env['PATH_INFO']) # prevent /algorithm/algorithm in algorithm service get_subjectid if respond_to? :get_subjectid - - request.env['HTTP_ACCEPT'] += ";text/html" if request.env["HTTP_USER_AGENT"]=~/MSIE/ # fix for IE - request.env['HTTP_ACCEPT'] = request.params["media"] if request.params["media"] # allow to set accept type in url via ?media=<type> - request.env['HTTP_ACCEPT'] = "text/turtle" if request.env['HTTP_ACCEPT'] =~ /\*\/\*/ #set default to turtle + # fix for IE, and set accept to 'text/html' as we do exact-matching later (sth. like text/html,application/xhtml+xml,*/* is not supported) + request.env['HTTP_ACCEPT'] = "text/html" if request.env["HTTP_USER_AGENT"]=~/MSIE/ or request.env['HTTP_ACCEPT']=~/text\/html/ + # support set accept via url by adding ?media=<type> to the url + request.env['HTTP_ACCEPT'] = request.params["media"] if request.params["media"] + # default is turtle + request.env['HTTP_ACCEPT'] = "text/turtle" if request.env['HTTP_ACCEPT'].size==0 or request.env['HTTP_ACCEPT']=~/\*\/\*/ @accept = request.env['HTTP_ACCEPT'] request.content_type ? response['Content-Type'] = request.content_type : response['Content-Type'] = request.env['HTTP_ACCEPT'] |