diff options
author | mr <mr@mrautenberg.de> | 2010-07-30 16:23:09 +0200 |
---|---|---|
committer | mr <mr@mrautenberg.de> | 2010-07-30 16:23:09 +0200 |
commit | 3de9e162beeb5f88d68505b560bc4dea7737e5f8 (patch) | |
tree | 9dd8519637e750c214f99ff8deb217ee0874ee60 /lazar.rb | |
parent | 91acc6de3edf5c36b2f29c3c5659d4748302457c (diff) |
Authorization minor changes => testing
Diffstat (limited to 'lazar.rb')
-rwxr-xr-x | lazar.rb | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -291,11 +291,10 @@ end post '/?' do # create model halt 400, "MIME type \"#{request.content_type}\" not supported." unless request.content_type.match(/yaml/) - model = Lazar.new - model.token_id = params["token_id"] if params["token_id"] - LOGGER.debug "mr create model post /model/? with token_id: #{model.token_id}" - #model.token_id = request.env["HTTP_TOKEN_ID"] if request.env["HTTP_TOKEN_ID"] + model = Lazar.new model.save + model.token_id = params[:token_id] if params[:token_id] + model.token_id = request.env["HTTP_TOKEN_ID"] if !model.token_id and request.env["HTTP_TOKEN_ID"] model.uri = url_for("/#{model.id}", :full) model.yaml = request.env["rack.input"].read model.save @@ -311,6 +310,7 @@ post '/:id/?' do # create prediction @prediction = OpenTox::Dataset.new @prediction.creator = lazar.uri @prediction.token_id = params[:token_id] + @prediction.token_id = request.env["HTTP_TOKEN_ID"] if !@prediction.token_id and request.env["HTTP_TOKEN_ID"] dependent_variable = YAML.load(lazar.yaml).dependentVariables @prediction.title = URI.decode(dependent_variable.split(/#/).last) case dependent_variable @@ -357,7 +357,6 @@ post '/:id/?' do # create prediction end haml :prediction end - elsif dataset_uri response['Content-Type'] = 'text/uri-list' task_uri = OpenTox::Task.as_task do |