diff options
author | mguetlein <martin.guetlein@gmail.com> | 2011-05-04 15:27:01 +0200 |
---|---|---|
committer | mguetlein <martin.guetlein@gmail.com> | 2011-05-04 15:27:01 +0200 |
commit | 612db56ce522a632414158917c2462fe40c242dc (patch) | |
tree | 199fd892bedfeb6e92dd51fa5cba4d090dceb6ac /lib/overwrite.rb | |
parent | c4d63fc2430caaed39e230e14db7e043642fbd50 (diff) |
use task-status-code from task-service (to fix inconsistent task status codes)
Diffstat (limited to 'lib/overwrite.rb')
-rw-r--r-- | lib/overwrite.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/overwrite.rb b/lib/overwrite.rb index fbe775d..fffcb14 100644 --- a/lib/overwrite.rb +++ b/lib/overwrite.rb @@ -39,20 +39,24 @@ end class Sinatra::Base def return_task( task ) - code = task.running? ? 202 : 200 + raise "http_code == nil" unless task.http_code!=nil case request.env['HTTP_ACCEPT'] when /rdf/ response['Content-Type'] = "application/rdf+xml" - halt code,task.to_rdfxml + halt task.http_code,task.to_rdfxml when /yaml/ response['Content-Type'] = "application/x-yaml" - halt code,task.to_yaml # PENDING differs from task-webservice + halt task.http_code,task.to_yaml # PENDING differs from task-webservice when /html/ response['Content-Type'] = "text/html" - halt code,OpenTox.text_to_html(task.to_yaml, @subjectid) + halt task.http_code,OpenTox.text_to_html(task.to_yaml, @subjectid) else # default /uri-list/ response['Content-Type'] = "text/uri-list" - halt code,task.uri+"\n" + if task.completed? + halt task.http_code,task.resultURI+"\n" + else + halt task.http_code,task.uri+"\n" + end end end end |