validation tests ok

3 files changed, 7 insertions, 6 deletions

diff --git a/report/report_application.rb b/report/report_application.rb
index 1273463..a4d3d1f 100755
--- a/report/report_application.rb
+++ b/report/report_application.rb
@@ -145,6 +145,7 @@ class Validation::Application < OpenTox::Service
     bad_request_error "validation_uris missing" unless params[:validation_uris].to_s.size>0
     task = OpenTox::Task.run("Create report",to("/validation/report/"+params[:type], :full)) do |task| #,params
       perform do |rs|
+        puts rs.inspect
         rs.create_report(params[:type],params[:validation_uris]?params[:validation_uris].split(/\n|,/):nil,
           params[:identifier]?params[:identifier].split(/\n|,/):nil,params,@subjectid,task)
       end
diff --git a/report/report_persistance.rb b/report/report_persistance.rb
index 6832b0f..a0f16d5 100755
--- a/report/report_persistance.rb
+++ b/report/report_persistance.rb
@@ -234,7 +234,7 @@ module Reports
     
     def to_rdf
       s = OpenTox::Serializer::Owl.new
-      s.add_resource(report_uri,OT.Report,get_content_as_hash.keys_to_rdf_format.keys_to_owl_uris)
+      s.add_resource(report_uri,RDF::OT.Report,get_content_as_hash.keys_to_rdf_format.keys_to_owl_uris)
       s.to_rdfxml
     end
   end
diff --git a/report/validation_access.rb b/report/validation_access.rb
index fe2c401..c6f6d2f 100755
--- a/report/validation_access.rb
+++ b/report/validation_access.rb
@@ -177,7 +177,7 @@ class Reports::ValidationDB
       uri = OpenTox::RestClientWrapper.post(feat_gen,{:subjectid => subjectid,
         :feature_dataset_uri=>training_feature_dataset_uri(validation,subjectid),
         :dataset_uri=>validation.test_dataset_uri})
-      @@tmp_resources << OpenTox.wait_for_task(uri)
+      @@tmp_resources << wait_for_task(uri)
     end
     uri
   end
@@ -219,8 +219,8 @@ class Reports::ValidationDB
   
   def feature_type( validation, subjectid=nil )
     m = OpenTox::Model.new(validation.model_uri,subjectid)
-    m.get
-    m.feature_type(subjectid)
+    #m.get
+    m.feature_type
     #get_model(validation).classification?
   end
   
@@ -229,7 +229,7 @@ class Reports::ValidationDB
     model = OpenTox::Model.new(validation.model_uri,subjectid)
     model.get
     resource_not_found_error "model not found '"+validation.model_uri+"'" unless model
-    model.predicted_variable(subjectid)
+    model.predicted_variable
   end
   
   def predicted_confidence(validation, subjectid=nil)
@@ -237,7 +237,7 @@ class Reports::ValidationDB
     model = OpenTox::Model.new(validation.model_uri,subjectid)
     model.get
     resource_not_found_error "model not found '"+validation.model_uri+"'" unless model
-    model.predicted_confidence(subjectid)
+    model.predicted_confidence
   end
   
 #  private