accept header for html requests is fixed in before-method, add line breaks to error trace

2 files changed, 6 insertions, 3 deletions

diff --git a/lib/file-store.rb b/lib/file-store.rb
index c3639a9..6e27a84 100644
--- a/lib/file-store.rb
+++ b/lib/file-store.rb
@@ -17,7 +17,7 @@ module OpenTox
       end
 
       def uri_list
-        Dir["./private/*.nt"].collect{|f| to(File.basename(f,".nt")}.join("\n"))
+        Dir["./private/*.nt"].collect{|f| to(File.basename(f,".nt"))}.join("\n")
       end
     end
 
diff --git a/lib/opentox.rb b/lib/opentox.rb
index 7b8ae13..011eccb 100644
--- a/lib/opentox.rb
+++ b/lib/opentox.rb
@@ -30,6 +30,8 @@ module OpenTox
       request.content_type ? response['Content-Type'] = request.content_type : response['Content-Type'] = request.env['HTTP_ACCEPT']
       parse_input if request.request_method =~ /POST|PUT/
       @accept = request.env['HTTP_ACCEPT']
+      @accept = "text/html" if @accept =~ /\*\/\*/ or request.env["HTTP_USER_AGENT"]=~/MSIE/
+      response['Content-Type'] = @accept
     end
 
     before "/#{SERVICE}/:id" do
@@ -60,8 +62,9 @@ module OpenTox
         body = error.report.to_turtle
       else
         response['Content-Type'] = "text/plain"
-        body = error.message
-        body += "\n#{error.backtrace}"
+        body = "#{error.message}\n"
+        body += "URI: #{error.uri}\n" if error.is_a?(RuntimeError)
+        body += error.backtrace.join("\n")
       end
       error.respond_to?(:http_code) ? code = error.http_code : code = 500
       halt code, body