diff options
author | mguetlein <martin.guetlein@gmail.com> | 2011-01-20 11:33:07 +0100 |
---|---|---|
committer | mguetlein <martin.guetlein@gmail.com> | 2011-01-20 11:33:07 +0100 |
commit | c4d553732ff4cfa3a4de4d439c5e174ca0e57b53 (patch) | |
tree | 60cbb03a27cdcc834a18098d7229b2df248fce1c /validation | |
parent | 7b06ce45180a5b2c0dd0095cd1a60ec974b46aa5 (diff) |
adjust to rdf method name, add new error handling support
Diffstat (limited to 'validation')
-rwxr-xr-x | validation/validation_application.rb | 13 | ||||
-rwxr-xr-x | validation/validation_format.rb | 4 | ||||
-rwxr-xr-x | validation/validation_test.rb | 27 |
3 files changed, 28 insertions, 16 deletions
diff --git a/validation/validation_application.rb b/validation/validation_application.rb index 5d521a8..7819114 100755 --- a/validation/validation_application.rb +++ b/validation/validation_application.rb @@ -521,13 +521,14 @@ end get '/:id' do LOGGER.info "get validation with id "+params[:id].to_s+" '"+request.env['HTTP_ACCEPT'].to_s+"'" - begin +# begin #validation = Validation::Validation.find(params[:id]) - validation = Validation::Validation.get(params[:id]) - rescue ActiveRecord::RecordNotFound => ex - halt 404, "Validation '#{params[:id]}' not found." - end - +# rescue ActiveRecord::RecordNotFound => ex +# halt 404, "Validation '#{params[:id]}' not found." +# end + validation = Validation::Validation.get(params[:id]) + raise OpenTox::NotFoundError.new "Validation '#{params[:id]}' not found." unless validation + case request.env['HTTP_ACCEPT'].to_s when "application/rdf+xml" content_type "application/rdf+xml" diff --git a/validation/validation_format.rb b/validation/validation_format.rb index 4f46100..e72e7ec 100755 --- a/validation/validation_format.rb +++ b/validation/validation_format.rb @@ -64,7 +64,7 @@ module Validation def to_rdf s = OpenTox::Serializer::Owl.new - s.add_val(validation_uri,OT.Validation,get_content_as_hash.keys_to_rdf_format.keys_to_owl_uris) + s.add_resource(validation_uri,OT.Validation,get_content_as_hash.keys_to_rdf_format.keys_to_owl_uris) s.to_rdfxml end @@ -93,7 +93,7 @@ module Validation def to_rdf s = OpenTox::Serializer::Owl.new - s.add_val(crossvalidation_uri,OT.Crossvalidation,get_content_as_hash.keys_to_rdf_format.keys_to_owl_uris) + s.add_resource(crossvalidation_uri,OT.Crossvalidation,get_content_as_hash.keys_to_rdf_format.keys_to_owl_uris) s.to_rdfxml end diff --git a/validation/validation_test.rb b/validation/validation_test.rb index f7c94ee..3138252 100755 --- a/validation/validation_test.rb +++ b/validation/validation_test.rb @@ -54,8 +54,8 @@ class ValidationTest < Test::Unit::TestCase $test_case = self #get "/1",nil,'HTTP_ACCEPT' => "text/html" - -# get "/crossvalidation/1",nil,'HTTP_ACCEPT' => "application/x-yaml" +# +# get "/234234232341",nil,'HTTP_ACCEPT' => "application/x-yaml" # puts last_response.body ## # get "/crossvalidation/1",nil,'HTTP_ACCEPT' => "application/rdf+xml" @@ -132,7 +132,13 @@ class ValidationTest < Test::Unit::TestCase #puts OpenTox::Authorization.list_policy_uris(SUBJECTID).inspect - run_test("3b",nil,nil,true) + #run_test("1b",nil,nil,false,{:dataset_uri=>"http://local-ot/dataset/45", :prediction_feature => "http://local-ot/dataset/45/feature/Hamster%20Carcinogenicity"}) + + #get "/12123123123123123" + get "/chain" + #get "/examples" + puts last_response.body + #delete "/1",:subjectid=>SUBJECTID #run_test("7b","http://local-ot/validation/21") @@ -162,7 +168,7 @@ class ValidationTest < Test::Unit::TestCase Sinatra::Application end - def run_test(select=nil, validation_uri=nil, report_uri=nil, delete=false) + def run_test(select=nil, validation_uri=nil, report_uri=nil, delete=false, overwrite={}) if AA_SERVER && delete policies_before = OpenTox::Authorization.list_policy_uris(SUBJECTID) @@ -173,17 +179,22 @@ class ValidationTest < Test::Unit::TestCase validationExamples.each do |vv| vv.each do |v| ex = v.new + ex.validation_uri = validation_uri + overwrite.each do |k,v| + ex.send(k.to_s+"=",v) + end + unless ex.validation_uri ex.upload_files ex.check_requirements ex.validate LOGGER.debug "validation done '"+ex.validation_uri.to_s+"'" end - ex.report_uri = report_uri - unless ex.report_uri - ex.report - end +# ex.report_uri = report_uri +# unless ex.report_uri +# ex.report +# end ##ex.verify_yaml ##ex.compare_yaml_vs_rdf ex.delete if delete |