return training dataset from source

3 files changed, 4 insertions, 3 deletions

diff --git a/application.rb b/application.rb
index 87d676b..edbd289 100644
--- a/application.rb
+++ b/application.rb
@@ -94,7 +94,7 @@ get '/predict/modeldetails/:model' do
   model = OpenTox::Model::Validation.find params[:model]
   training_dataset = model.model.training_dataset
   data_entries = training_dataset.data_entries
-  crossvalidations = OpenTox::Validation::RepeatedCrossValidation.find(model.repeated_crossvalidation_id).crossvalidations
+  crossvalidations = model.crossvalidations
 
   return haml :model_details, :layout=> false, :locals => {:model => model, 
                                                            :crossvalidations => crossvalidations, 
@@ -122,7 +122,7 @@ end
 get '/predict/dataset/:name' do
   response['Content-Type'] = "text/csv"
   dataset = Dataset.find_by(:name=>params[:name])
-  csv = dataset.to_csv
+  csv = File.read dataset.source
   t = Tempfile.new
   t << csv
   name = params[:name] + ".csv"
diff --git a/lib/dataset.rb b/lib/dataset.rb
index 00685b8..51407ca 100644
--- a/lib/dataset.rb
+++ b/lib/dataset.rb
@@ -16,7 +16,7 @@ get "/api/dataset/:id/?" do
   halt 400, "Dataset with id: #{params[:id]} not found." unless dataset
   case @accept
   when "text/csv", "application/csv"
-    return dataset.to_csv
+    return File.read dataset.source
   else
     bad_request_error "Mime type #{@accept} is not supported."
   end
diff --git a/lib/model.rb b/lib/model.rb
index 9bf4f53..b26447d 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -20,6 +20,7 @@ end
 get "/api/model/:id/?" do
   model = Model::Validation.find params[:id]
   halt 400, "Model with id: #{params[:id]} not found." unless model
+  model["training_dataset"] = model.model.training_dataset.id.to_s
   return model.to_json
 end