summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.de>2009-12-20 20:36:09 +0100
committerChristoph Helma <helma@in-silico.de>2009-12-20 20:36:09 +0100
commit67ca064a4d63077514c2cc72f32ebac837234075 (patch)
tree0d7e3df212b6602280523e88c66f9a36b9e33e02
parenta56967d71995e6196fd1f9b457dbc081ea4fe1d4 (diff)
or construction for parameter checks (does not work at univac) modified to unless
-rw-r--r--fminer.rb4
m---------libfminer0
2 files changed, 2 insertions, 2 deletions
diff --git a/fminer.rb b/fminer.rb
index 69f5cd8..55ca9c3 100644
--- a/fminer.rb
+++ b/fminer.rb
@@ -14,8 +14,8 @@ post '/fminer/?' do
#task.start
- feature_uri = params[:feature_uri] or halt 404, "Please submit a feature_uri parameter."
- training_dataset = OpenTox::Dataset.find params[:dataset_uri] or halt 404, "Dataset '#{params[:dataset_uri]} not found."
+ halt 404, "Please submit a feature_uri parameter." unless feature_uri = params[:feature_uri]
+ halt 404, "Dataset '#{params[:dataset_uri]} not found." unless training_dataset = OpenTox::Dataset.find params[:dataset_uri]
feature_dataset = OpenTox::Dataset.new
title = "BBRC representatives for " + training_dataset.title
feature_dataset.title = title
diff --git a/libfminer b/libfminer
-Subproject 83a9f493152aec756589ddda5a6cd612a6e26ad
+Subproject 115dd17f11d32abc551c15a48a6afb11497f68b