summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2010-11-24 11:48:32 +0100
committerChristoph Helma <helma@in-silico.ch>2010-11-24 11:48:32 +0100
commit524b59bca0bebde1efdf0ad4a92528ccd51f81f1 (patch)
treea46ed16aa69af22545958356f1fbb00855d9af36
parent3583682a8c9921aea86bd53ed80153ae1d5fb02d (diff)
status 503 for rejected tasks
-rw-r--r--fminer.rb2
-rw-r--r--lazar.rb3
2 files changed, 4 insertions, 1 deletions
diff --git a/fminer.rb b/fminer.rb
index 0f06584..06d66fb 100644
--- a/fminer.rb
+++ b/fminer.rb
@@ -206,6 +206,7 @@ post '/fminer/bbrc/?' do
feature_dataset.uri
end
response['Content-Type'] = 'text/uri-list'
+ halt 503,task.uri+"\n" if task.status == "Cancelled"
halt 202,task.uri.to_s+"\n"
end
#end
@@ -348,5 +349,6 @@ post '/fminer/last/?' do
feature_dataset.uri
end
response['Content-Type'] = 'text/uri-list'
+ halt 503,task.uri+"\n" if task.status == "Cancelled"
halt 202,task.uri.to_s+"\n"
end
diff --git a/lazar.rb b/lazar.rb
index ee83da3..dffe47b 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -47,7 +47,6 @@ post '/lazar/?' do
halt 404, "No feature #{prediction_feature} in dataset #{params[:dataset_uri]}. (features: "+
training_activities.features.inspect+")" unless training_activities.features and training_activities.features.include?(prediction_feature)
- response['Content-Type'] = 'text/uri-list'
task = OpenTox::Task.create("Create lazar model",url_for('/lazar',:full)) do |task|
lazar = OpenTox::Model::Lazar.new
@@ -143,6 +142,8 @@ post '/lazar/?' do
LOGGER.info model_uri + " created #{Time.now}"
model_uri
end
+ response['Content-Type'] = 'text/uri-list'
+ halt 503,task.uri+"\n" if task.status == "Cancelled"
halt 202,task.uri
end