add api-wrapper version, remove try_agains

2 files changed, 11 insertions, 14 deletions

diff --git a/application.rb b/application.rb
index 1ec0109..ca2a7ac 100644
--- a/application.rb
+++ b/application.rb
@@ -1,5 +1,6 @@
-
-[ 'rubygems', 'sinatra', 'sinatra/url_for', 'opentox-ruby-api-wrapper', 'logger' ].each do |lib|
+require 'rubygems'
+gem 'opentox-ruby-api-wrapper', '= 1.4.4.4'
+[ 'sinatra', 'sinatra/url_for', 'opentox-ruby-api-wrapper', 'logger' ].each do |lib|
   require lib
 end
 
diff --git a/validation/validation_service.rb b/validation/validation_service.rb
index 1d79fb5..1b6678b 100644
--- a/validation/validation_service.rb
+++ b/validation/validation_service.rb
@@ -40,13 +40,11 @@ module Validation
       $sinatra.halt 500,"do not set uri manually" if params[:uri]
       super params
       # hack to overcome datamapper bug: save to set id
-      OpenTox::Utils.try_again do
-        unless save
-          raise "error saving validation "+errors.inspect
-        end
-        reload
-        raise "internal error, validation-id not set "+to_yaml if @id==nil
+      unless save
+        raise "error saving validation "+errors.inspect
       end
+      reload
+      raise "internal error, validation-id not set "+to_yaml if @id==nil
       update :uri => $sinatra.url_for("/"+@id.to_s, :full)
     end
     
@@ -161,13 +159,11 @@ module Validation
       $sinatra.halt 500,"do not set uri manually" if params[:uri]
       super params
       
-      OpenTox::Utils.try_again do
-        unless save
-          raise "error saving crossvalidation "+errors.inspect
-        end
-        reload
-        raise "internal error, crossvalidation-id not set" if @id==nil
+      unless save
+        raise "error saving crossvalidation "+errors.inspect
       end
+      reload
+      raise "internal error, crossvalidation-id not set" if @id==nil
       update :uri => $sinatra.url_for("/crossvalidation/"+@id.to_s, :full)
     end