summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2010-11-30 12:43:04 +0100
committerChristoph Helma <helma@in-silico.ch>2010-11-30 12:43:04 +0100
commitd3190ba5fd87db05bdf3219dae00afaf31257718 (patch)
tree32a929a8512922522d3ed303616058713ace9310 /lib
parent8ff5d7de9683d9bbe6103dd42d10aefbf2f4a021 (diff)
Accept: text/uri-list for running algoritms
Diffstat (limited to 'lib')
-rw-r--r--lib/algorithm.rb2
-rw-r--r--lib/task.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/algorithm.rb b/lib/algorithm.rb
index a6fa4a7..a2f7786 100644
--- a/lib/algorithm.rb
+++ b/lib/algorithm.rb
@@ -15,7 +15,7 @@ module OpenTox
# @param [optional,Hash] params Algorithm parameters
# @return [String] URI of new resource (dataset, model, ...)
def run(params=nil)
- RestClientWrapper.post(@uri, params).to_s
+ RestClientWrapper.post(@uri, {:accept => 'text/uri-list'}, params).to_s
end
# Get OWL-DL representation in RDF/XML format
diff --git a/lib/task.rb b/lib/task.rb
index 5b59395..17f95e6 100644
--- a/lib/task.rb
+++ b/lib/task.rb
@@ -243,10 +243,10 @@ module OpenTox
"'" unless @metadata[OT.resultURI] and @metadata[OT.resultURI].to_s.uri? if completed?
if @http_code == 202
- raise "illegal task state, code is 202, but hasStatus is not Running: '"+@metadata[OT.hasStatus]+"'" unless running?
+ raise "#{@uri}: illegal task state, code is 202, but hasStatus is not Running: '"+@metadata[OT.hasStatus]+"'" unless running?
elsif @http_code == 201
- raise "illegal task state, code is 201, but hasStatus is not Completed: '"+@metadata[OT.hasStatus]+"'" unless completed?
- raise "illegal task state, code is 201, resultURI is no task-URI: '"+@metadata[OT.resultURI].to_s+
+ raise "#{@uri}: illegal task state, code is 201, but hasStatus is not Completed: '"+@metadata[OT.hasStatus]+"'" unless completed?
+ raise "#{@uri}: illegal task state, code is 201, resultURI is no task-URI: '"+@metadata[OT.resultURI].to_s+
"'" unless @metadata[OT.resultURI] and @metadata[OT.resultURI].to_s.uri?
end
rescue => ex