diff options
| author | Christoph Helma <helma@in-silico.ch> | 2013-01-23 12:34:36 +0100 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2013-01-23 12:34:36 +0100 |
| commit | ef71e086d355ccfcd48961cf00dbbd1c7c6b6d51 (patch) | |
| tree | 453b0b3506d8f0638c4b6d7b1cb8f9a2065adc66 | |
| parent | 29fcbe3990952d61565eafd45d3f00ed9d4f297c (diff) | |
begin/rescue blocks removed
| -rw-r--r-- | application.rb | 1 | ||||
| -rw-r--r-- | webapp/dataset.rb | 50 |
2 files changed, 23 insertions, 28 deletions
diff --git a/application.rb b/application.rb index dd6a62d..f106aef 100644 --- a/application.rb +++ b/application.rb @@ -3,6 +3,7 @@ # Author: Christoph Helma, Andreas Maunz require 'roo' +require 'opentox-server' require './compound.rb' # Library code diff --git a/webapp/dataset.rb b/webapp/dataset.rb index 5bf8799..6b16d02 100644 --- a/webapp/dataset.rb +++ b/webapp/dataset.rb @@ -90,34 +90,28 @@ module OpenTox } ) do |task| - begin - 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"}) - 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) - unless result_ds.features.size>0 # features present already? - result_ds.features = single_cmpd_ds.features # AM: features - result_ds.parameters = ["pc_type", "lib", "descriptor"].collect{ |key| # AM: parameters - val = single_cmpd_ds.find_parameter_value(key) - { DC.title => key, OT.paramValue => (val.nil? ? "" : val) } - } - result_ds[DC.title] = single_cmpd_ds[DC.title] - result_ds[DC.creator] = to("/dataset/#{dataset}/pc",:full) - result_ds[OT.hasSource] = to("/dataset/#{dataset}/pc",:full) - end - result_ds << [ cmpd ] + single_cmpd_ds.data_entries[0] - } - result_ds.put @subjectid - $logger.debug result_ds.uri - result_ds.uri - - rescue => e - $logger.debug "#{e.class}: #{e.message}" - $logger.debug "Backtrace:\n\t#{e.backtrace.join("\n\t")}" - end + 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"}) + 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) + unless result_ds.features.size>0 # features present already? + result_ds.features = single_cmpd_ds.features # AM: features + result_ds.parameters = ["pc_type", "lib", "descriptor"].collect{ |key| # AM: parameters + val = single_cmpd_ds.find_parameter_value(key) + { DC.title => key, OT.paramValue => (val.nil? ? "" : val) } + } + result_ds[DC.title] = single_cmpd_ds[DC.title] + result_ds[DC.creator] = to("/dataset/#{dataset}/pc",:full) + result_ds[OT.hasSource] = to("/dataset/#{dataset}/pc",:full) + end + result_ds << [ cmpd ] + single_cmpd_ds.data_entries[0] + } + result_ds.put @subjectid + $logger.debug result_ds.uri + result_ds.uri end response['Content-Type'] = 'text/uri-list' |