diff options
| author | Christoph Helma <helma@in-silico.ch> | 2013-02-14 21:19:48 +0100 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2013-02-14 21:19:48 +0100 |
| commit | 41f64af34d2ec9fc57364b1beaf2be2ffaaa1a35 (patch) | |
| tree | 5b65fe752ccfab521c5c2483aad52a8ffe9a30c3 | |
| parent | 2a88a2adac9f5517c67743b9855f00944ad540ea (diff) | |
descriptor file loaded from compound service
| -rw-r--r-- | application.rb | 6 | ||||
| -rw-r--r-- | webapp/dataset.rb | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/application.rb b/application.rb index cfeb069..4df9b06 100644 --- a/application.rb +++ b/application.rb @@ -8,9 +8,9 @@ require './compound.rb' # Library code $logger.debug "Dataset booting: #{$dataset.collect{|k,v| "#{k}: '#{v}'"} }" -Dir['./lib/compound/*.rb'].each { |f| require f } # Libs -Dir['./lib/*.rb'].each { |f| require f } # Libs -Dir['./webapp/*.rb'].each { |f| require f } # Webapps +Dir['./lib/compound/*.rb'].each { |f| require f; also_reload f } # Libs +Dir['./lib/*.rb'].each { |f| require f; also_reload f } # Libs +Dir['./webapp/*.rb'].each { |f| require f; also_reload f } # Webapps #require 'profiler' diff --git a/webapp/dataset.rb b/webapp/dataset.rb index f8033fa..3ee6c04 100644 --- a/webapp/dataset.rb +++ b/webapp/dataset.rb @@ -11,7 +11,6 @@ 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 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) @@ -22,7 +21,6 @@ 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 RestClientWrapper.get(File.join($compound[:uri],"pc_descriptors.yaml")) alg_params = [ { DC.description => "Dataset URI", @@ -95,7 +93,7 @@ module OpenTox result_ds = OpenTox::Dataset.new(nil,@subjectid) ds=OpenTox::Dataset.find("#{$dataset[:uri]}/#{dataset}",@subjectid) ds.compounds.each { |cmpd| - ds_string = RestClient.post("#{$compound[:uri]}/#{cmpd.inchi}/pc", params, {:accept => "application/rdf+xml"}) + ds_string = RestClientWrapper.post("#{$compound[:uri]}/#{cmpd.inchi}/pc", params, {:accept => "application/rdf+xml"}) single_cmpd_ds = OpenTox::Dataset.new(OpenTox::Dataset.uri_from_rdf(ds_string),@subjectid) single_cmpd_ds.parse_rdfxml(ds_string) single_cmpd_ds.get(true) |