diff options
author | mr <mr@mrautenberg.de> | 2011-01-18 11:03:11 +0100 |
---|---|---|
committer | mr <mr@mrautenberg.de> | 2011-01-18 11:03:11 +0100 |
commit | 4100a87f3784006687a2c8787b57936c96218f79 (patch) | |
tree | b34af8d5418499e4c8701f6449b3a26df98a9e1a | |
parent | fae87bece86eb78ac36d7d1a315affa01506d84a (diff) |
get subjectid from api-wrapper helper
-rw-r--r-- | fminer.rb | 20 | ||||
-rw-r--r-- | lazar.rb | 9 |
2 files changed, 11 insertions, 18 deletions
@@ -67,8 +67,6 @@ end # @return [text/uri-list] Task URI post '/fminer/bbrc/?' do - subjectid = params[:subjectid] ? params[:subjectid] : nil - subjectid = CGI.unescape(request.env["HTTP_SUBJECTID"]) if !subjectid and request.env["HTTP_SUBJECTID"] # TODO: is this thread safe?? #@@bbrc = Bbrc::Bbrc.new minfreq = 5 unless minfreq = params[:min_frequency] @@ -82,12 +80,12 @@ post '/fminer/bbrc/?' do halt 404, "Please submit a prediction_feature." unless params[:prediction_feature] and !params[:prediction_feature].nil? prediction_feature = params[:prediction_feature] - training_dataset = OpenTox::Dataset.find "#{params[:dataset_uri]}", subjectid + training_dataset = OpenTox::Dataset.find "#{params[:dataset_uri]}", @subjectid halt 404, "No feature #{params[:prediction_feature]} in dataset #{params[:dataset_uri]}" unless training_dataset.features and training_dataset.features.include?(params[:prediction_feature]) task = OpenTox::Task.create("Mining BBRC features", url_for('/fminer',:full)) do - feature_dataset = OpenTox::Dataset.new(nil, subjectid) + feature_dataset = OpenTox::Dataset.new(nil, @subjectid) feature_dataset.add_metadata({ DC.title => "BBRC representatives for " + training_dataset.metadata[DC.title].to_s, DC.creator => url_for('/fminer/bbrc',:full), @@ -97,7 +95,7 @@ post '/fminer/bbrc/?' do { DC.title => "prediction_feature", OT.paramValue => params[:prediction_feature] } ] }) - feature_dataset.save(subjectid) + feature_dataset.save(@subjectid) id = 1 # fminer start id is not 0 compounds = [] @@ -204,7 +202,7 @@ post '/fminer/bbrc/?' do ids.each { |id| feature_dataset.add(compounds[id], feature_uri, true)} end end - feature_dataset.save(subjectid) + feature_dataset.save(@subjectid) feature_dataset.uri end response['Content-Type'] = 'text/uri-list' @@ -223,8 +221,6 @@ post '/fminer/bbrc/?' do # - hops Maximum number of hops # @return [text/uri-list] Task URI post '/fminer/last/?' do - subjectid = params[:subjectid] ? params[:subjectid] : nil - subjectid = CGI.unescape(request.env["HTTP_SUBJECTID"]) if !subjectid and request.env["HTTP_SUBJECTID"] #@@last = Last::Last.new minfreq = 5 unless minfreq = params[:min_frequency] @@last.SetMinfreq(minfreq) @@ -236,9 +232,9 @@ post '/fminer/last/?' do halt 404, "Please submit a prediction_feature." unless params[:prediction_feature] and !params[:prediction_feature].nil? prediction_feature = params[:prediction_feature] - training_dataset = OpenTox::Dataset.new "#{params[:dataset_uri]}", subjectid + training_dataset = OpenTox::Dataset.new "#{params[:dataset_uri]}", @subjectid - training_dataset.load_all(subjectid) + training_dataset.load_all(@subjectid) halt 404, "No feature #{params[:prediction_feature]} in dataset #{params[:dataset_uri]}" unless training_dataset.features and training_dataset.features.include?(params[:prediction_feature]) task = OpenTox::Task.create("Mining LAST features", url_for('/fminer',:full)) do @@ -253,7 +249,7 @@ post '/fminer/last/?' do { DC.title => "prediction_feature", OT.paramValue => params[:prediction_feature] } ] }) - feature_dataset.save(subjectid) + feature_dataset.save(@subjectid) id = 1 # fminer start id is not 0 compounds = [] @@ -349,7 +345,7 @@ post '/fminer/last/?' do end ids.each { |id| feature_dataset.add(compounds[id], feature_uri, true)} end - feature_dataset.save(subjectid) + feature_dataset.save(@subjectid) feature_dataset.uri end response['Content-Type'] = 'text/uri-list' @@ -29,14 +29,11 @@ end # @ return [text/uri-list] Task URI post '/lazar/?' do - subjectid = params[:subjectid] ? params[:subjectid] : nil - subjectid = CGI.unescape(request.env["HTTP_SUBJECTID"]) if !subjectid and request.env["HTTP_SUBJECTID"] - halt 404, "No dataset_uri parameter." unless params[:dataset_uri] dataset_uri = params[:dataset_uri] halt 404, "Dataset #{dataset_uri} not found." unless training_activities = OpenTox::Dataset.new(dataset_uri) - training_activities.load_all(subjectid) + training_activities.load_all(@subjectid) prediction_feature = params[:prediction_feature] unless prediction_feature # try to read prediction_feature from dataset @@ -75,7 +72,7 @@ post '/lazar/?' do training_features = OpenTox::Dataset.new(feature_dataset_uri) end - training_features.load_all(subjectid) + training_features.load_all(@subjectid) halt 404, "Dataset #{feature_dataset_uri} not found." if training_features.nil? # sorted features for index lookups @@ -141,7 +138,7 @@ post '/lazar/?' do {DC.title => "feature_generation_uri", OT.paramValue => feature_generation_uri} ] - model_uri = lazar.save(subjectid) + model_uri = lazar.save(@subjectid) LOGGER.info model_uri + " created #{Time.now}" model_uri end |