summaryrefslogtreecommitdiff
path: root/application.rb
diff options
context:
space:
mode:
authormr <mr@mrautenberg.de>2011-04-19 16:14:38 +0200
committermr <mr@mrautenberg.de>2011-04-19 16:14:38 +0200
commitf86342d29cdc6e18b51a79712b3064eded7b4e67 (patch)
treea772de61127b3a77f7f4ecc2b526f8fde33205b6 /application.rb
parent5e5f945bf54bacf5b4e6d64feef4632216e778a7 (diff)
subjectid in several places
Diffstat (limited to 'application.rb')
-rw-r--r--application.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/application.rb b/application.rb
index 24b7a56..99a84c6 100644
--- a/application.rb
+++ b/application.rb
@@ -190,7 +190,7 @@ post '/feature' do
session[:dataset] = params[:dataset]
@features = []
OpenTox::Dataset.new(params[:dataset]).load_features.each do |uri,metadata|
- @features << OpenTox::Feature.find(uri) if metadata[OWL.sameAs].match(/#{session[:echa]}/)
+ @features << OpenTox::Feature.find(uri, @subjectid) if metadata[OWL.sameAs].match(/#{session[:echa]}/)
end
haml :feature
end
@@ -356,7 +356,7 @@ post '/predict/?' do # post chemical name to model
}
else
predicted_feature = prediction_dataset.metadata[OT.dependentVariables]
- prediction = OpenTox::Feature.find(predicted_feature)
+ prediction = OpenTox::Feature.find(predicted_feature, subjectid)
if prediction.metadata[OT.error]
@predictions << {
:title => model.name,
@@ -382,7 +382,7 @@ post "/lazar/?" do # get detailed prediction
@page = params[:page].to_i if params[:page]
@model_uri = params[:model_uri]
lazar = OpenTox::Model::Lazar.new @model_uri
- prediction_dataset_uri = lazar.run(:compound_uri => params[:compound_uri], :subjectid => params[:subjectid])
+ prediction_dataset_uri = lazar.run(:compound_uri => params[:compound_uri], :subjectid => session[:subjectid])
@prediction = OpenTox::LazarPrediction.find(prediction_dataset_uri, session[:subjectid])
@compound = OpenTox::Compound.new(params[:compound_uri])
haml :lazar