fix validation_type for example

2 files changed, 5 insertions, 6 deletions

diff --git a/lib/validation_db.rb b/lib/validation_db.rb
index cb3ece7..9a9c927 100644
--- a/lib/validation_db.rb
+++ b/lib/validation_db.rb
@@ -56,6 +56,8 @@ module Lib
     alias_attribute :date, :created_at
     
     def validation_uri
+      self.save! if self.id==nil
+      raise "internal error, validation-id not set "+to_yaml if self.id==nil
       $sinatra.url_for("/"+self.id.to_s, :full)
     end
     
@@ -81,6 +83,8 @@ module Lib
     alias_attribute :date, :created_at
     
     def crossvalidation_uri
+      self.save! if self.id==nil
+      raise "internal error, crossvalidation-id not set" if self.id==nil
       $sinatra.url_for("/crossvalidation/"+self.id.to_s, :full) if self.id
     end
     
diff --git a/validation/validation_service.rb b/validation/validation_service.rb
index d549896..5150932 100644
--- a/validation/validation_service.rb
+++ b/validation/validation_service.rb
@@ -39,13 +39,10 @@ module Validation
       $sinatra.halt 500,"do not set id manually" if params[:id]
       params[:finished] = false
       super params
-      self.save!
-      raise "internal error, validation-id not set "+to_yaml if self.id==nil
     end
     
     def save!
-      # make sure that non-temporary validation objects have a valiation_type
-      # (a temporary validation object is created for crossvaldiation/statistics) 
+      # make sure that validation objects have a valiation_type
       $sinatra.halt 500,"validation_type missing" unless self.validation_type
       super
     end
@@ -182,8 +179,6 @@ module Validation
       params[:stratified] = false if params[:stratified]==nil
       params[:finished] = false
       super params
-      self.save!
-      raise "internal error, crossvalidation-id not set" if self.id==nil
     end
     
     def perform_cv ( prediction_feature, algorithm_params=nil, task=nil )