summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormr <mr@mrautenberg.de>2011-01-18 11:06:26 +0100
committermr <mr@mrautenberg.de>2011-01-18 11:06:26 +0100
commitfe6be7ddb591cee17f3e10a9ccb962cfb34e3fb9 (patch)
tree8b73b582ca71310114d1ff811b4b412a8b6c264d
parent164678b50d1237882e483b35dc237ce0495096e7 (diff)
get subjectid from api-wrapper helper
-rw-r--r--application.rb13
1 files changed, 5 insertions, 8 deletions
diff --git a/application.rb b/application.rb
index 23a7197..3c21d3b 100644
--- a/application.rb
+++ b/application.rb
@@ -20,7 +20,7 @@ class Dataset
data = request.env["rack.input"].read
content_type = request.content_type
content_type = "application/rdf+xml" if content_type.nil?
- dataset = OpenTox::Dataset.new
+ dataset = OpenTox::Dataset.new(nil, params[:subjectid])
case content_type
@@ -138,7 +138,7 @@ get '/:id' do
end
end
- dataset = OpenTox::Dataset.new(nil, params[:subjectid])
+ dataset = OpenTox::Dataset.new(nil, @subjectid)
dataset.load_yaml(Dataset.get(params[:id]).yaml)
halt 404, "Dataset #{params[:id]} empty." if dataset.nil? # not sure how an empty dataset can be returned, but if this happens stale processes keep runing at 100% cpu
@@ -258,8 +258,7 @@ end
post '/?' do
@dataset = Dataset.create
response['Content-Type'] = 'text/uri-list'
- @dataset.subjectid = params[:subjectid] if params[:subjectid]
- @dataset.subjectid = request.env['HTTP_SUBJECTID'] if !@dataset.subjectid and request.env['HTTP_SUBJECTID']
+ @dataset.subjectid = @subjectid
@dataset.update(:uri => url_for("/#{@dataset.id}", :full))
token_present = params.member?("subjectid") ? 1 : 0
@@ -308,11 +307,9 @@ delete '/:id' do
uri = dataset.uri
FileUtils.rm Dir["public/#{params[:id]}.*"]
dataset.destroy!
- subjectid = params[:subjectid] ? params[:subjectid] : nil
- subjectid = request.env['HTTP_SUBJECTID'] if !subjectid and request.env['HTTP_SUBJECTID']
- if subjectid and !Dataset.get(params[:id]) and uri
+ if @subjectid and !Dataset.get(params[:id]) and uri
begin
- res = OpenTox::Authorization.delete_policies_from_uri(uri, subjectid)
+ res = OpenTox::Authorization.delete_policies_from_uri(uri, @subjectid)
LOGGER.debug "Policy deleted for Dataset URI: #{uri} with result: #{res}"
rescue
LOGGER.warn "Policy delete error for Dataset URI: #{uri}"