Merge branch 'pc_unified_from_jl' into development

1 files changed, 5 insertions, 0 deletions

diff --git a/application.rb b/application.rb
index 257d9a0..4df696c 100644
--- a/application.rb
+++ b/application.rb
@@ -2,6 +2,7 @@ require 'rubygems'
 gem "opentox-ruby", "~> 3"
 require 'opentox-ruby'
 require 'profiler'
+require 'rjb'
 
 set :lock, true
 
@@ -48,6 +49,9 @@ helpers do
     when /json/
       dataset.load_json(input_data)
 
+    when "text/csv"
+      dataset.load_csv(input_data, @subjectid)
+
     when /application\/rdf\+xml/
       dataset.load_rdfxml(input_data, @subjectid)
          
@@ -353,6 +357,7 @@ post '/:id' do
   halt 202,task.uri.to_s+"\n"
 end
 
+
 # Deletes datasets that have been created by a crossvalidatoin that does not exist anymore
 # (This can happen if a crossvalidation fails unexpectedly)
 delete '/cleanup' do