diff options
| -rw-r--r-- | application.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/application.rb b/application.rb index c64d5ce..8c52ecb 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"), |