summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrautenberg <rautenberg@in-silico.ch>2012-07-02 16:17:45 +0200
committerrautenberg <rautenberg@in-silico.ch>2012-07-02 16:17:45 +0200
commit2ad4aaab472a41969a56ca79e613044c45ede788 (patch)
tree4236c3b99d06f183210ddfed1b7da45dc6b9d241
parentec9256dc1b29a3203d6e987244d2aeacbd3dda1a (diff)
turn off policy creationmaster_lazar
-rw-r--r--application.rb20
1 files changed, 10 insertions, 10 deletions
diff --git a/application.rb b/application.rb
index e4f5044..fc4d9eb 100644
--- a/application.rb
+++ b/application.rb
@@ -305,12 +305,12 @@ post '/?' do
@json_file = "#{@@datadir}/#{@id}.json"
if params.size == 0 and input_data.size==0
File.open(@json_file,"w+"){|f| f.puts OpenTox::Dataset.new(@uri).to_json}
- OpenTox::Authorization.check_policy(@uri, @subjectid) if File.exists? @json_file
+ #OpenTox::Authorization.check_policy(@uri, @subjectid) if File.exists? @json_file
@uri
else
task = OpenTox::Task.create("Converting and saving dataset ", @uri) do
load_dataset @id, params, request.content_type, input_data
- OpenTox::Authorization.check_policy(@uri, @subjectid) if File.exists? @json_file
+ #OpenTox::Authorization.check_policy(@uri, @subjectid) if File.exists? @json_file
@uri
end
raise OpenTox::ServiceUnavailableError.newtask.uri+"\n" if task.status == "Cancelled"
@@ -346,14 +346,14 @@ delete '/:id' do
LOGGER.debug "deleting dataset with id #{@id}"
begin
FileUtils.rm Dir["#{@@datadir}/#{@id}.*"]
- if @subjectid and !File.exists? @json_file and @uri
- begin
- 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}"
- end
- end
+ #if @subjectid and !File.exists? @json_file and @uri
+ # begin
+ # #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}"
+ # end
+ #end
response['Content-Type'] = 'text/plain'
"Dataset #{@id} deleted."
rescue