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

3 files changed, 8 insertions, 6 deletions

diff --git a/reach_reports/reach_application.rb b/reach_reports/reach_application.rb
index aa64ea2..c0e89b5 100755
--- a/reach_reports/reach_application.rb
+++ b/reach_reports/reach_application.rb
@@ -18,14 +18,14 @@ def mysql_lite_retry( n_times=15 )
   end
   yield # try a last time
 end
-  
+
 require 'reach_reports/reach_persistance.rb'
 require 'reach_reports/reach_service.rb'
 
 require "lib/format_util.rb"
 
 def extract_type(params)
-  halt 400, "illegal type, neither QMRF nor QPRF: "+params[:type] unless params[:type] && params[:type] =~ /(?i)Q(M|P)RF/
+  raise OpenTox::BadRequestError.new "illegal type, neither QMRF nor QPRF: "+params[:type] unless params[:type] && params[:type] =~ /(?i)Q(M|P)RF/
   params.delete("type")
 end
 
@@ -100,7 +100,7 @@ get '/reach_report/:type/:id' do
 
   case request.env['HTTP_ACCEPT'].to_s
   when "application/rdf+xml"
-    halt 400, "application/rdf+xml not yet supported"
+    raise OpenTox::BadRequestError.new "application/rdf+xml not yet supported"
     owl = OpenTox::Owl.create(type+"Report",rep.report_uri)
     owl.set_data( rep.get_content.keys_to_rdf_format )
     owl.rdf
@@ -121,7 +121,7 @@ get '/reach_report/:type/:id' do
     content_type "application/x-yaml"
     rep.to_yaml
   else
-    halt 400, "MIME type '"+request.env['HTTP_ACCEPT'].to_s+"' not supported, valid Accept-Headers are \"application/rdf+xml\", \"application/x-yaml\", \"application/qmrf-xml\"."
+    raise OpenTox::BadRequestError.new "MIME type '"+request.env['HTTP_ACCEPT'].to_s+"' not supported, valid Accept-Headers are \"application/rdf+xml\", \"application/x-yaml\", \"application/qmrf-xml\"."
   end
 end
 
@@ -132,7 +132,7 @@ post '/reach_report/:type/:id' do
   rep = ReachReports.get_report(type, params[:id])
 
   input = request.env["rack.input"].read
-  halt 400, "no xml data specified" unless input && input.to_s.size>0
+  raise OpenTox::BadRequestError.new "no xml data specified" unless input && input.to_s.size>0
   LOGGER.debug "size of posted data: "+input.to_s.size.to_s
   
   ReachReports::QmrfReport.from_xml(rep,input)
diff --git a/reach_reports/reach_persistance.rb b/reach_reports/reach_persistance.rb
index 147ee84..1226d95 100755
--- a/reach_reports/reach_persistance.rb
+++ b/reach_reports/reach_persistance.rb
@@ -1210,6 +1210,7 @@ module ReachReports
       model.auto_upgrade!
       model.raise_on_save_failure = true
     end
+
   end
   
 end
\ No newline at end of file
diff --git a/reach_reports/reach_service.rb b/reach_reports/reach_service.rb
index 916a7a4..fa4c0d7 100755
--- a/reach_reports/reach_service.rb
+++ b/reach_reports/reach_service.rb
@@ -279,6 +279,7 @@ module ReachReports
       end
     end
     task.progress(90) if task
+
     mysql_lite_retry do 
       r.save
     end
@@ -289,7 +290,7 @@ module ReachReports
 #    
 #    report_content = get_report(type, id).get_content
 #    keys.each do |k|
-#      $sinatra.halt 400, type+" unknown report property '#{key}'" unless report_content.is_a?(Hash) and report_content.has_key?(k)
+#      $sinatra.raise OpenTox::BadRequestError.new type+" unknown report property '#{key}'" unless report_content.is_a?(Hash) and report_content.has_key?(k)
 #      report_content = report_content[k]
 #    end
 #    report_content