render https in reports

4 files changed, 26 insertions, 9 deletions

diff --git a/lib/ot_predictions.rb b/lib/ot_predictions.rb
index b0e9720..0b40e97 100755
--- a/lib/ot_predictions.rb
+++ b/lib/ot_predictions.rb
@@ -59,7 +59,7 @@ module Lib
         test_dataset.load_all(subjectid)
         @compounds = test_dataset.compounds
         LOGGER.debug "test dataset size: "+@compounds.size.to_s
-        raise "test dataset is empty" unless @compounds.size>0
+        raise "test dataset is empty "+test_dataset_uri.to_s unless @compounds.size>0
         class_values = feature_type=="classification" ? OpenTox::Feature.new(prediction_feature).domain : nil
         
         actual_values = []
diff --git a/report/xml_report.rb b/report/xml_report.rb
index 5f2709e..4b9a11a 100755
--- a/report/xml_report.rb
+++ b/report/xml_report.rb
@@ -168,7 +168,7 @@ module Reports
         row = Element.new("row")
         table_head_values.each do |v|
           entry = Element.new("entry")
-          if auto_link_urls && v.to_s =~ /^http:\/\//
+          if auto_link_urls && v.to_s =~ /^http(s?):\/\//
             add_url(entry, v.to_s)
           else
             entry.text = v.to_s
@@ -186,7 +186,7 @@ module Reports
           entry = Element.new("entry")
           if auto_link_urls && v.to_s =~ /depict/ || v.to_s =~ /image$/ #PENDING 
             add_image(entry, v.to_s)
-          elsif auto_link_urls && v.to_s =~ /^http:\/\//
+          elsif auto_link_urls && v.to_s =~ /^http(s?):\/\//
            add_url(entry, v.to_s, v.to_s)
           else
            entry.text = v.to_s
diff --git a/test/test_examples.rb b/test/test_examples.rb
index e7a07ca..ebb5b9f 100755
--- a/test/test_examples.rb
+++ b/test/test_examples.rb
@@ -368,6 +368,17 @@ module ValidationExamples
     end
   end
   
+  ########################################################################################################
+  
+  class TumModel < ModelValidation
+    def initialize
+      @model_uri = "http://opentox-dev.informatik.tu-muenchen.de:8080/OpenTox-sec/sec/model/TUMOpenToxModel_M5P_5"
+      @test_dataset_uri = "http://apps.ideaconsult.net:8080/ambit2/dataset/99488"
+    end
+  end  
+  
+  
+  
    ########################################################################################################
    
   class HamsterTrainingTest < TrainingTestValidation
@@ -497,7 +508,9 @@ module ValidationExamples
       
       "17" => [ LazarRepdoseCrossValidation, MajorityRepdoseCrossValidation ],
       "17a" => [ LazarRepdoseCrossValidation ],
-      "17b" => [ MajorityRepdoseCrossValidation ],  
+      "17b" => [ MajorityRepdoseCrossValidation ],
+      
+      "18a" =>  [ TumModel ],
     }
   
   def self.list
diff --git a/validation/validation_test.rb b/validation/validation_test.rb
index 22d766f..e98a4d1 100755
--- a/validation/validation_test.rb
+++ b/validation/validation_test.rb
@@ -20,10 +20,10 @@ LOGGER.datetime_format = "%Y-%m-%d %H:%M:%S "
 LOGGER.formatter = Logger::Formatter.new
 
 if AA_SERVER
-  TEST_USER = "mgtest"
-  TEST_PW = "mgpasswd"
-#  TEST_USER = "guest"
-#  TEST_PW = "guest"
+  #TEST_USER = "mgtest"
+  #TEST_PW = "mgpasswd"
+  TEST_USER = "guest"
+  TEST_PW = "guest"
   SUBJECTID = OpenTox::Authorization.authenticate(TEST_USER,TEST_PW)
   raise "could not log in" unless SUBJECTID
   puts "logged in: "+SUBJECTID.to_s
@@ -152,7 +152,11 @@ class ValidationTest < Test::Unit::TestCase
 #      puts val
 #      get "/"+val.split("/")[-1]
       
-      run_test("1a") #,:validation_uri=>"http://local-ot/validation/119") #,"http://local-ot/validation/28")#,"http://local-ot/validation/394");
+#      d = OpenTox::Dataset.find("https://ambit.uni-plovdiv.bg:8443/ambit2/dataset/R545",SUBJECTID)
+#      puts d.compounds.inspect
+#      exit
+      
+      run_test("5a",:validation_uri=>"http://local-ot/validation/253") #,"http://local-ot/validation/28")#,"http://local-ot/validation/394");
       
       #run_test("3b",:validation_uri=>"http://local-ot/validation/crossvalidation/45") #,{:dataset_uri => "http://local-ot/dataset/773", :prediction_feature => "http://local-ot/dataset/773/feature/Hamster%20Carcinogenicity"})