diff options
Diffstat (limited to 'fminer.rb')
| -rw-r--r-- | fminer.rb | 23 |
1 files changed, 9 insertions, 14 deletions
@@ -66,7 +66,7 @@ end # - min_chisq_significance Significance threshold (between 0 and 1) # @return [text/uri-list] Task URI post '/fminer/bbrc/?' do - + # TODO: is this thread safe?? #@@bbrc = Bbrc::Bbrc.new minfreq = 5 unless minfreq = params[:min_frequency] @@ -80,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]}" + 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 + 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), @@ -95,9 +95,7 @@ post '/fminer/bbrc/?' do { DC.title => "prediction_feature", OT.paramValue => params[:prediction_feature] } ] }) - subjectid = params[:subjectid] if params[:subjectid] - subjectid = CGI.unescape(request.env["HTTP_SUBJECTID"]) if !subjectid and request.env["HTTP_SUBJECTID"] - 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,7 +221,6 @@ post '/fminer/bbrc/?' do # - hops Maximum number of hops # @return [text/uri-list] Task URI post '/fminer/last/?' do - #@@last = Last::Last.new minfreq = 5 unless minfreq = params[:min_frequency] @@last.SetMinfreq(minfreq) @@ -235,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]}" + training_dataset = OpenTox::Dataset.new "#{params[:dataset_uri]}", @subjectid - training_dataset.load_all + 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 @@ -252,9 +249,7 @@ post '/fminer/last/?' do { DC.title => "prediction_feature", OT.paramValue => params[:prediction_feature] } ] }) - subjectid = params[:subjectid] if params[:subjectid] - subjectid = CGI.unescape(request.env["HTTP_SUBJECTID"]) if !subjectid and request.env["HTTP_SUBJECTID"] - feature_dataset.save(subjectid) + feature_dataset.save(@subjectid) id = 1 # fminer start id is not 0 compounds = [] @@ -350,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' |