summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2011-01-19 14:13:14 +0100
committermguetlein <martin.guetlein@gmail.com>2011-01-19 14:13:14 +0100
commite70b3178489abbdb13cb11518a7cbbe1c19adf00 (patch)
tree4571d39b4f616c7300ddc553ea637141079d21c0
parent95a0c849f593936ef7d92226330d7193cd83b1f8 (diff)
do not try to save dataset unless no id given
-rw-r--r--application.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/application.rb b/application.rb
index 802cb88..57e064f 100644
--- a/application.rb
+++ b/application.rb
@@ -11,7 +11,6 @@ class Dataset
property :created_at, DateTime
attr_accessor :subjectid
- @subjectid = nil
after :save, :check_policy
@@ -94,7 +93,7 @@ class Dataset
private
def check_policy
- OpenTox::Authorization.check_policy(uri, subjectid)
+ OpenTox::Authorization.check_policy(uri, subjectid) if id
end
end
@@ -201,7 +200,7 @@ get %r{/(\d+)/feature/(.*)$} do |id,feature|
#feature_uri = url_for("/#{params[:id]}/feature/#{URI.encode(params[:feature_name])}",:full) # work around racks internal uri decoding
#dataset = YAML.load(Dataset.get(params[:id]).yaml)
- feature_uri = url_for("/#{id}/feature/#{URI.encode(feature)}",:full) # work around racks internal uri decoding
+ feature_uri = url_for("/#{id}/feature/#{URI.encode(feature)}",:full) # work around racks internal uri decoding
dataset = YAML.load(Dataset.get(id).yaml)
metadata = dataset.features[feature_uri]
@@ -309,6 +308,7 @@ end
# Delete a dataset
# @return [text/plain] Status message
delete '/:id' do
+ LOGGER.debug "deleting dataset with id "+params[:id].to_s
begin
dataset = Dataset.get(params[:id])
uri = dataset.uri