From 2dcf602090adbc8df84b9ef473d588b050e8ca0c Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.de>
Date: Fri, 19 Feb 2010 14:31:40 +0100
Subject: mime types added to response header

---
 application.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'application.rb')

diff --git a/application.rb b/application.rb
index 20f6185..3ec3bba 100644
--- a/application.rb
+++ b/application.rb
@@ -25,6 +25,7 @@ DataMapper.auto_upgrade!
 ## REST API
 
 get '/?' do
+	response['Content-Type'] = 'text/uri-list'
 	Dataset.all.collect{|d| d.uri}.join("\n")
 end
 
@@ -40,8 +41,10 @@ get '/:id/?' do
 	accept = 'application/rdf+xml' if accept == '*/*' or accept == '' or accept.nil?
 	case accept
 	when /rdf/ # redland sends text/rdf instead of application/rdf+xml
+		response['Content-Type'] = 'application/rdf+xml'
 		dataset.owl
 	when /yaml/
+		response['Content-Type'] = 'application/x-yaml'
 		OpenTox::Dataset.find(dataset.uri).to_yaml
 	else
 		halt 400, "Unsupported MIME type '#{accept}'"
@@ -92,6 +95,7 @@ post '/?' do
 	end
 	task.pid = pid
 	#status 303 # rest client tries to redirect
+	response['Content-Type'] = 'text/uri-list'
  	task.uri
 end
 
@@ -100,6 +104,7 @@ delete '/:id/?' do
 		dataset = Dataset.get(params[:id])
 		File.delete dataset.file
 		dataset.destroy!
+		response['Content-Type'] = 'text/plain'
 		"Dataset #{params[:id]} deleted."
 	rescue
 		halt 404, "Dataset #{params[:id]} does not exist."
@@ -113,7 +118,9 @@ delete '/?' do
 		rescue
 			LOGGER.error "Cannot delete dataset file '#{d.file}'"
 		end
-	 	d.destroy!
+	 	#d.destroy!
 	end
+  Dataset.auto_migrate!
+	response['Content-Type'] = 'text/plain'
 	"All datasets deleted."
 end
-- 
cgit v1.2.3