update serach facilities, minor test fixes

4 files changed, 43 insertions, 49 deletions

diff --git a/lib/data_mapper_util.rb b/lib/data_mapper_util.rb
index 25d9d61..23f52f5 100644
--- a/lib/data_mapper_util.rb
+++ b/lib/data_mapper_util.rb
@@ -8,53 +8,30 @@ module Lib
       prop_names = model.properties.collect{|p| p.name.to_s if p.is_a?DataMapper::Property::Object}
       params.keys.each do |k|
         key = k.to_s
-        unless prop_names.include?(key)
-          key = key.from_rdf_format
+        if (key == "subjectid")
+          params.delete(k)
+        else
           unless prop_names.include?(key)
-            key = key+"_uri"
+            key = key.from_rdf_format
             unless prop_names.include?(key)
-              key = key+"s"
+              key = key+"_uri"
               unless prop_names.include?(key)
-                raise OpenTox::BadRequestError.new "no attribute found: '"+k.to_s+"'"
+                key = key+"s"
+                unless prop_names.include?(key)
+                  raise OpenTox::BadRequestError.new "no attribute found: '"+k.to_s+"'"
+                end
               end
             end
           end
+          params[key.to_sym] = params.delete(k)
         end
-        params[key.to_sym] = params.delete(k)
       end
       params
     end
     
-#    def self.all(model, filter_params)
-#      prop_names = model.properties.collect{|p| p.name.to_s if p.is_a?DataMapper::Property::Object}
-#      puts prop_names.inspect
-#      
-#      filter_params.keys.each do |k|
-#        key = k.to_s
-#        unless prop_names.include?(key)
-#          key = key.from_rdf_format
-#          unless prop_names.include?(key)
-#            key = key+"_uri"
-#            unless prop_names.include?(key)
-#              key = key+"s"
-#              unless prop_names.include?(key)
-#                err = "no attribute found: '"+k.to_s+"'"
-#                if $sinatra
-#                  $sinatra.halt 400,err
-#                else
-#                  raise err
-#                end
-#              end
-#            end
-#          end
-#        end
-#        filter_params[key.to_sym] = filter_params.delete(k)
-#      end
-#      puts filter_params.inspect
-#      
-#      #model.all(filter_params)
-#      model.all(:model_uris.like => "%")
-#    end
+    def self.all(model, filter_params)
+      model.all(check_params(model,filter_params))
+    end
     
   end 
 end
\ No newline at end of file
diff --git a/test/test_examples_util.rb b/test/test_examples_util.rb
index 492b497..8344594 100755
--- a/test/test_examples_util.rb
+++ b/test/test_examples_util.rb
@@ -294,8 +294,8 @@ module ValidationExamples
     
     def report
       begin
-        @report_uri = Util.validation_post '/report/'+report_type,{:validation_uris => @validation_uri}, @subjectid
-        Util.validation_get "/report/"+report_uri.split("/")[-2]+"/"+report_uri.split("/")[-1], @subjectid
+        @report_uri = Util.validation_post '/report/'+report_type,{:validation_uris => @validation_uri}, @subjectid if @validation_uri
+        Util.validation_get "/report/"+report_uri.split("/")[-2]+"/"+report_uri.split("/")[-1], @subjectid if @report_uri
       rescue => ex
         puts "could not create report: "+ex.message
         raise ex
diff --git a/validation/validation_application.rb b/validation/validation_application.rb
index 7819114..b2bb400 100755
--- a/validation/validation_application.rb
+++ b/validation/validation_application.rb
@@ -9,7 +9,9 @@ require 'validation/validation_service.rb'
 
 get '/crossvalidation/?' do
   LOGGER.info "list all crossvalidations"
-  uri_list = Validation::Crossvalidation.all.collect{ |cv| cv.crossvalidation_uri }.join("\n")+"\n"
+  #uri_list = Validation::Crossvalidation.all.collect{ |cv| cv.crossvalidation_uri }.join("\n")+"\n"
+  uri_list = Lib::DataMapperUtil.all(Validation::Crossvalidation,params).collect{ |cv| cv.crossvalidation_uri }.join("\n")+"\n"
+  
   #uri_list = Validation::Crossvalidation.find_like(params).collect{ |cv| cv.crossvalidation_uri }.join("\n")+"\n"
   if request.env['HTTP_ACCEPT'] =~ /text\/html/
     related_links = 
@@ -207,7 +209,9 @@ get '/?' do
   
   LOGGER.info "list all validations, params: "+params.inspect
   #uri_list = Validation::Validation.find_like(params).collect{ |v| v.validation_uri }.join("\n")+"\n"
-  uri_list = Validation::Validation.all.collect{ |v| v.validation_uri }.join("\n")+"\n"
+  #uri_list = Validation::Validation.all(params).collect{ |v| v.validation_uri }.join("\n")+"\n"
+  uri_list = Lib::DataMapperUtil.all(Validation::Validation,params).collect{ |v| v.validation_uri }.join("\n")+"\n"
+  
   
   if request.env['HTTP_ACCEPT'] =~ /text\/html/
     related_links = 
@@ -260,7 +264,9 @@ get '/test_set_validation' do
   LOGGER.info "list all test-set-validations, params: "+params.inspect
   
   #uri_list = Validation::Validation.find( :all, :conditions => { :validation_type => "test_set_validation" } ).collect{ |v| v.validation_uri }.join("\n")+"\n"
-  uri_list = Validation::Validation.all( :validation_type => "test_set_validation" ).collect{ |v| v.validation_uri }.join("\n")+"\n"
+  #uri_list = Validation::Validation.all( :validation_type => "test_set_validation" ).collect{ |v| v.validation_uri }.join("\n")+"\n"
+  params[:validation_type] = "test_set_validation"
+  uri_list = Lib::DataMapperUtil.all(Validation::Validation,params).collect{ |v| v.validation_uri }.join("\n")+"\n"
   
   if request.env['HTTP_ACCEPT'] =~ /text\/html/
     related_links = 
@@ -303,7 +309,10 @@ end
 get '/training_test_validation' do
   LOGGER.info "list all training-test-validations, params: "+params.inspect
   #uri_list = Validation::Validation.find( :all, :conditions => { :validation_type => "training_test_validation" } ).collect{ |v| v.validation_uri }.join("\n")+"\n"
-  uri_list = Validation::Validation.all( :validation_type => "training_test_validation" ).collect{ |v| v.validation_uri }.join("\n")+"\n"
+  #uri_list = Validation::Validation.all( :validation_type => "training_test_validation" ).collect{ |v| v.validation_uri }.join("\n")+"\n"
+  params[:validation_type] = "training_test_validation"
+  uri_list = Lib::DataMapperUtil.all(Validation::Validation,params).collect{ |v| v.validation_uri }.join("\n")+"\n"
+  
   if request.env['HTTP_ACCEPT'] =~ /text\/html/
     related_links = 
       "All validations:    "+url_for("/",:full)+"\n"+
@@ -350,7 +359,10 @@ end
 get '/bootstrapping' do
   LOGGER.info "list all bootstrapping-validations, params: "+params.inspect
   #uri_list = Validation::Validation.find( :all, :conditions => { :validation_type => "bootstrapping" } ).collect{ |v| v.validation_uri }.join("\n")+"\n"
-  uri_list = Validation::Validation.all( :validation_type => "bootstrapping" ).collect{ |v| v.validation_uri }.join("\n")+"\n"
+  #uri_list = Validation::Validation.all( :validation_type => "bootstrapping" ).collect{ |v| v.validation_uri }.join("\n")+"\n"
+  params[:validation_type] = "bootstrapping"
+  uri_list = Lib::DataMapperUtil.all(Validation::Validation,params).collect{ |v| v.validation_uri }.join("\n")+"\n"
+  
   if request.env['HTTP_ACCEPT'] =~ /text\/html/
     related_links = 
       "All validations:    "+url_for("/",:full)+"\n"+
@@ -401,7 +413,10 @@ end
 get '/training_test_split' do
   LOGGER.info "list all training-test-split-validations, params: "+params.inspect
   #uri_list = Validation::Validation.find( :all, :conditions => { :validation_type => "training_test_split" } ).collect{ |v| v.validation_uri }.join("\n")+"\n"
-  uri_list = Validation::Validation.all( :validation_type => "training_test_split" ).collect{ |v| v.validation_uri }.join("\n")+"\n"
+  #uri_list = Validation::Validation.all( :validation_type => "training_test_split" ).collect{ |v| v.validation_uri }.join("\n")+"\n"
+  params[:validation_type] = "training_test_split"
+  uri_list = Lib::DataMapperUtil.all(Validation::Validation,params).collect{ |v| v.validation_uri }.join("\n")+"\n"
+  
   if request.env['HTTP_ACCEPT'] =~ /text\/html/
     related_links = 
       "All validations:    "+url_for("/",:full)+"\n"+
diff --git a/validation/validation_test.rb b/validation/validation_test.rb
index b77f32f..26f12e7 100755
--- a/validation/validation_test.rb
+++ b/validation/validation_test.rb
@@ -20,8 +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 = "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
@@ -140,7 +142,7 @@ class ValidationTest < Test::Unit::TestCase
       
       #puts OpenTox::Authorization.list_policy_uris(SUBJECTID).inspect
 
-      run_test("1b",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"
@@ -207,12 +209,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
+          puts ex.validation_uri+"?subjectid="+CGI.escape(SUBJECTID) if SUBJECTID and !delete and ex.validation_uri
         end
         ex.report_uri = report_uri
         unless ex.report_uri
           ex.report
-          puts ex.report_uri+"?subjectid="+CGI.escape(SUBJECTID)  if SUBJECTID and !delete
+          puts ex.report_uri+"?subjectid="+CGI.escape(SUBJECTID)  if SUBJECTID and !delete and ex.report_uri
         end
         ##ex.verify_yaml
         ##ex.compare_yaml_vs_rdf