summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2011-07-28 17:36:04 +0000
committerChristoph Helma <helma@in-silico.ch>2011-07-28 17:36:04 +0000
commitca56d6e8b039350b872dbe52a6c933d2471937ae (patch)
tree2c689205ac170d89e6258bd87c822c66697ccec4
parentacd586185ace0cf7bfc477951fb06fce4c88f385 (diff)
parentcd4335fe69d002ff22407a50a599b805790cbb04 (diff)
Merge branch 'feature/sdf-import' into development
-rw-r--r--application.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/application.rb b/application.rb
index cdbaef2..223a207 100644
--- a/application.rb
+++ b/application.rb
@@ -22,6 +22,7 @@ helpers do
raise "store subject-id in dataset-object, not in params" if params.has_key?(:subjectid) and @subjectid==nil
content_type = "application/rdf+xml" if content_type.nil?
+ #dataset = OpenTox::Dataset.new(@uri, @subjectid)
dataset = OpenTox::Dataset.new(nil, @subjectid)
case content_type
@@ -31,11 +32,17 @@ helpers do
when /application\/rdf\+xml/
dataset.load_rdfxml(input_data)
+
+ when "chemical/x-mdl-sdfile"
+ dataset.load_sdf(input_data)
when /multipart\/form-data/ , "application/x-www-form-urlencoded" # file uploads
case params[:file][:type]
+ when "chemical/x-mdl-sdfile"
+ dataset.load_sdf(input_data)
+
when /yaml/
dataset.load_yaml(params[:file][:tempfile].read)
@@ -43,7 +50,7 @@ helpers do
dataset.load_rdfxml_file(params[:file][:tempfile])
when "text/csv"
- dataset = OpenTox::Dataset.new @uri
+ #dataset = OpenTox::Dataset.new @uri
dataset.load_csv(params[:file][:tempfile].read)
dataset.add_metadata({
DC.title => File.basename(params[:file][:filename],".csv"),