whitelist validation-non-resource-uris, minor fixes

2 files changed, 5 insertions, 2 deletions

diff --git a/validation/validation_service.rb b/validation/validation_service.rb
index fa638cf..2208116 100755
--- a/validation/validation_service.rb
+++ b/validation/validation_service.rb
@@ -156,6 +156,7 @@ module Validation
         #prediction_dataset_uri = model.predict_dataset(self.test_dataset_uri, OpenTox::SubTask.create(task, 0, 50))
         prediction_dataset_uri = model.run(
           {:dataset_uri => self.test_dataset_uri, :subjectid => self.subjectid},
+          "text/uri-list",
           OpenTox::SubTask.create(task, 0, 50))
       end
 #      self.attributes = { :prediction_dataset_uri => prediction_dataset_uri,
diff --git a/validation/validation_test.rb b/validation/validation_test.rb
index 603b270..c368747 100755
--- a/validation/validation_test.rb
+++ b/validation/validation_test.rb
@@ -140,7 +140,7 @@ class ValidationTest < Test::Unit::TestCase
       
       #puts OpenTox::Authorization.list_policy_uris(SUBJECTID).inspect
 
-      run_test("14a",nil,nil,false) #,{:dataset_uri=>"http://local-ot/dataset/45", :prediction_feature => "http://local-ot/dataset/45/feature/Hamster%20Carcinogenicity"})
+      run_test("15a",nil,nil,false) #,{:dataset_uri=>"http://local-ot/dataset/45", :prediction_feature => "http://local-ot/dataset/45/feature/Hamster%20Carcinogenicity"})
       
       #get "/12123123123123123"
       #get "/chain"
@@ -176,7 +176,7 @@ class ValidationTest < Test::Unit::TestCase
       #do_test_examples_ortona
       
     ensure
-      OpenTox::Authorization.logout(SUBJECTID) if AA_SERVER
+      #OpenTox::Authorization.logout(SUBJECTID) if AA_SERVER
     end
   end
 
@@ -206,10 +206,12 @@ class ValidationTest < Test::Unit::TestCase
           ex.check_requirements
           ex.validate
           LOGGER.debug "validation done '"+ex.validation_uri.to_s+"'"
+          puts ex.validation_uri+"?subjectid="+CGI.escape(SUBJECTID)  if SUBJECTID and !delete
         end
         ex.report_uri = report_uri
         unless ex.report_uri
           ex.report
+          puts ex.report_uri+"?subjectid="+CGI.escape(SUBJECTID)  if SUBJECTID and !delete
         end
         ##ex.verify_yaml
         ##ex.compare_yaml_vs_rdf