diff options
| author | Christoph Helma <helma@in-silico.ch> | 2013-01-23 12:57:48 +0100 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2013-01-23 12:57:48 +0100 |
| commit | a5df97ffcc5dea6b6bd79ba18f38fae390685c7a (patch) | |
| tree | debe55d042d38eeae61e73f9f306472fdd63a607 | |
| parent | ef71e086d355ccfcd48961cf00dbbd1c7c6b6d51 (diff) | |
pc_descriptors.yaml obtained from compound service
| -rw-r--r-- | webapp/dataset.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/webapp/dataset.rb b/webapp/dataset.rb index 6b16d02..f8033fa 100644 --- a/webapp/dataset.rb +++ b/webapp/dataset.rb @@ -11,7 +11,8 @@ module OpenTox # @return [text/uri-list] URIs get '/dataset/*/pc' do dataset=params["captures"][0] - algorithms = YAML::load_file File.join(ENV['HOME'], ".opentox", "config", "pc_descriptors.yaml") + #algorithms = YAML::load_file File.join(ENV['HOME'], ".opentox", "config", "pc_descriptors.yaml") + algorithms = YAML::load_file RestClientWrapper.get(File.join($compound[:uri],"pc_descriptors.yaml")) list = (algorithms.keys.sort << "AllDescriptors").collect { |name| to("/dataset/#{dataset}/pc/#{name}",:full) }.join("\n") + "\n" format_output(list) end @@ -21,7 +22,8 @@ module OpenTox get '/dataset/*/pc/*' do dataset = params[:captures][0] params[:descriptor] = params[:captures][1] - descriptors = YAML::load_file File.join(ENV['HOME'], ".opentox", "config", "pc_descriptors.yaml") + #descriptors = YAML::load_file File.join(ENV['HOME'], ".opentox", "config", "pc_descriptors.yaml") + descriptors = YAML::load_file RestClientWrapper.get(File.join($compound[:uri],"pc_descriptors.yaml")) alg_params = [ { DC.description => "Dataset URI", OT.paramScope => "mandatory", |