diff options
Diffstat (limited to 'lazar.rb')
| -rw-r--r-- | lazar.rb | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -50,8 +50,8 @@ post '/lazar/?' do task = OpenTox::Task.create("Create lazar model",url_for('/lazar',:full)) do |task| lazar = OpenTox::Model::Lazar.new - lazar.token_id = params[:token_id] if params[:token_id] - lazar.token_id = request.env["HTTP_TOKEN_ID"] if !lazar.token_id and request.env["HTTP_TOKEN_ID"] + token_id = params[:token_id] if params[:token_id] + token_id = request.env["HTTP_TOKEN_ID"] if !token_id and request.env["HTTP_TOKEN_ID"] lazar.min_sim = params[:min_sim] if params[:min_sim] if params[:feature_dataset_uri] @@ -71,7 +71,7 @@ post '/lazar/?' do halt 404, "External feature generation services not yet supported" end feature_dataset_uri = OpenTox::Algorithm::Generic.new(feature_generation_uri).run(params).to_s - training_features = OpenTox::Dataset.new(feature_dataset_uri, lazar.token_id) + training_features = OpenTox::Dataset.new(feature_dataset_uri) end training_features.load_all @@ -140,7 +140,7 @@ post '/lazar/?' do {DC.title => "feature_generation_uri", OT.paramValue => feature_generation_uri} ] - model_uri = lazar.save + model_uri = lazar.save(token_id) LOGGER.info model_uri + " created #{Time.now}" model_uri end |