diff options
| author | Christoph Helma <helma@in-silico.ch> | 2010-06-29 12:21:56 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2010-06-29 12:21:56 +0200 |
| commit | 80cb52f477870bd78b0f92e69650872da56fb1a5 (patch) | |
| tree | b6c97028d23ebd10ccb550211e5eab8648832301 /helper.rb | |
| parent | 01121930d390e849d9102ff0da58236460ca1409 (diff) | |
| parent | b27d0f1e805f2c85194b851cea44c156469df6e6 (diff) | |
Merge branch 'master' into development
Conflicts:
application.rb
Diffstat (limited to 'helper.rb')
| -rw-r--r-- | helper.rb | 24 |
1 files changed, 11 insertions, 13 deletions
@@ -16,21 +16,19 @@ helpers do model.uri = RestClient.get(File.join(model.task_uri, 'resultURI')).body model.save end - unless @@config[:services]["opentox-model"].match(/localhost/) - if !model.validation_uri and model.validation_status == "Completed" - begin - model.validation_uri = RestClient.get(File.join(model.validation_task_uri, 'resultURI')).body - LOGGER.debug "Validation URI: #{model.validation_uri}" - model.validation_report_task_uri = RestClient.post(File.join(@@config[:services]["opentox-validation"],"/report/crossvalidation"), :validation_uris => model.validation_uri).body - LOGGER.debug "Validation Report Task URI: #{model.validation_report_task_uri}" - model.save - rescue - end - end - if model.validation_report_task_uri and !model.validation_report_uri and model.validation_report_status == 'Completed' - model.validation_report_uri = RestClient.get(File.join(model.validation_report_task_uri, 'resultURI')).body + if !model.validation_uri and model.validation_status == "Completed" + begin + model.validation_uri = RestClient.get(File.join(model.validation_task_uri, 'resultURI')).body + LOGGER.debug "Validation URI: #{model.validation_uri}" + model.validation_report_task_uri = RestClient.post(File.join(@@config[:services]["opentox-validation"],"/report/crossvalidation"), :validation_uris => model.validation_uri).body + LOGGER.debug "Validation Report Task URI: #{model.validation_report_task_uri}" + model.save + rescue end end + if model.validation_report_task_uri and !model.validation_report_uri and model.validation_report_status == 'Completed' + model.validation_report_uri = RestClient.get(File.join(model.validation_report_task_uri, 'resultURI')).body + end end end |