summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2011-07-28 12:23:58 +0000
committerChristoph Helma <helma@in-silico.ch>2011-07-28 12:23:58 +0000
commitcd4335fe69d002ff22407a50a599b805790cbb04 (patch)
tree2c689205ac170d89e6258bd87c822c66697ccec4
parent0067f6f05b28709e5c34ab064fc4002b4eaaa552 (diff)
parentacd586185ace0cf7bfc477951fb06fce4c88f385 (diff)
Merge branch 'development' into feature/sdf-import
-rw-r--r--application.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/application.rb b/application.rb
index 8c52ecb..223a207 100644
--- a/application.rb
+++ b/application.rb
@@ -175,10 +175,14 @@ get '/:id' do
response['Content-Type'] = 'application/ms-excel'
File.open(file).read
- when /chemical\/x-mdl-sdfile/
+ when /sdfile/
response['Content-Type'] = 'chemical/x-mdl-sdfile'
YAML.load_file(@yaml_file).to_sdf
+ when /uri-list/
+ response['Content-Type'] = 'text/uri-list'
+ YAML.load_file(@yaml_file).to_urilist
+
else
raise OpenTox::NotFoundError.new "Content-type #{@accept} not supported."
end