Merge branch 'development' of github.com:opentox/validation into development

3 files changed, 3 insertions, 3 deletions

diff --git a/report/report_application.rb b/report/report_application.rb
index f7780c3..8f74bd9 100755
--- a/report/report_application.rb
+++ b/report/report_application.rb
@@ -7,7 +7,7 @@ end
 
 def get_docbook_resource(filepath)
   perform do |rs|
-    halt 404,"not found: "+filepath unless File.exist?(filepath)
+    raise OpenTox::NotFoundError.new"not found: "+filepath unless File.exist?(filepath)
     types = MIME::Types.type_for(filepath)
     content_type(types[0].content_type) if types and types.size>0 and types[0]
     result = body(File.new(filepath))
diff --git a/report/report_persistance.rb b/report/report_persistance.rb
index 78ae47b..e02387f 100755
--- a/report/report_persistance.rb
+++ b/report/report_persistance.rb
@@ -315,7 +315,7 @@ end
 #            unless prop_names.include?(key)
 #              err = "no attribute found: '"+k.to_s+"'"
 #              if $sinatra
-#                $sinatra.halt 400,err
+#                $sinatra.raise OpenTox::BadRequestError.newerr
 #              else
 #                raise err
 #              end
diff --git a/report/statistical_test.rb b/report/statistical_test.rb
index bee6241..9461cac 100644
--- a/report/statistical_test.rb
+++ b/report/statistical_test.rb
@@ -78,7 +78,7 @@ module Reports
     def self.quit_r
       LIB::StatisticalTest.quit_r
     end
-    
+
   end
 
 end