set enm code to online version

3 files changed, 19 insertions, 9 deletions

diff --git a/lib/dataset.rb b/lib/dataset.rb
index a48b23f..ac57347 100644
--- a/lib/dataset.rb
+++ b/lib/dataset.rb
@@ -22,8 +22,14 @@ get "/dataset/:id/?" do
   resource_not_found_error "Dataset with id: #{params[:id]} not found." unless dataset
   case @accept
   when "application/json"
-    dataset.data_entries.each do |k, v|
-      dataset.data_entries[k][:URI] = uri("/substance/#{k}")
+    if dataset.data_entries.class == Array
+      dataset.data_entries.each do |k|
+        #todo: fix
+      end
+    else
+      dataset.data_entries.each do |k, v|
+        dataset.data_entries["#{k}"][:URI] = uri("/substance/#{k}")
+      end
     end
     dataset[:URI] = uri("/dataset/#{dataset.id}")
     dataset[:substances] = uri("/dataset/#{dataset.id}/substances")
diff --git a/lib/report.rb b/lib/report.rb
index b313839..71c2045 100644
--- a/lib/report.rb
+++ b/lib/report.rb
@@ -83,13 +83,13 @@ get "/report/:id/?" do
   report.value "algorithm_type", "#{model_type}"
 
   # Explicit algorithm 4.2
-  report.change_catalog :algorithms_catalog, :algorithms_catalog_1, {:definition => "see Helma 2016 and lazar.in-silico.ch, submitted version: #{lazar_commit}", :description => "Neighbor algorithm: #{model.neighbor_algorithm.gsub('_',' ').titleize}#{(model.neighbor_algorithm_parameters[:min_sim] ? ' with similarity > ' + model.neighbor_algorithm_parameters[:min_sim].to_s : '')}"}
-  report.ref_catalog :algorithm_explicit, :algorithms_catalog, :algorithms_catalog_1
+  #report.change_catalog :algorithms_catalog, :algorithms_catalog_1, {:definition => "see Helma 2016 and lazar.in-silico.ch, submitted version: #{lazar_commit}", :description => "Neighbor algorithm: #{model.neighbor_algorithm.gsub('_',' ').titleize}#{(model.neighbor_algorithm_parameters[:min_sim] ? ' with similarity > ' + model.neighbor_algorithm_parameters[:min_sim].to_s : '')}"}
+  #report.ref_catalog :algorithm_explicit, :algorithms_catalog, :algorithms_catalog_1
   report.change_catalog :algorithms_catalog, :algorithms_catalog_3, {:definition => "see Helma 2016 and lazar.in-silico.ch, submitted version: #{lazar_commit}", :description => "modified k-nearest neighbor #{model_type}"}
   report.ref_catalog :algorithm_explicit, :algorithms_catalog, :algorithms_catalog_3
-  if model.prediction_algorithm_parameters
-    pred_algorithm_params = (model.prediction_algorithm_parameters[:method] == "rf" ? "random forest" : model.prediction_algorithm_parameters[:method])
-  end
+  #if model.prediction_algorithm_parameters
+  #  pred_algorithm_params = (model.prediction_algorithm_parameters[:method] == "rf" ? "random forest" : model.prediction_algorithm_parameters[:method])
+  #end
   report.change_catalog :algorithms_catalog, :algorithms_catalog_2, {:definition => "see Helma 2016 and lazar.in-silico.ch, submitted version: #{lazar_commit}", :description => "Prediction algorithm: #{model.prediction_algorithm.gsub('OpenTox::Algorithm::','').gsub('_',' ').gsub('.', ' with ')} #{(pred_algorithm_params ? pred_algorithm_params : '')}"}
   report.ref_catalog :algorithm_explicit, :algorithms_catalog, :algorithms_catalog_2
 
diff --git a/unicorn.rb b/unicorn.rb
index f90ca3f..1bcb5cc 100644
--- a/unicorn.rb
+++ b/unicorn.rb
@@ -1,2 +1,6 @@
-worker_processes 4
-timeout 6000
\ No newline at end of file
+timeout 6000
+listen 8089
+log_dir = "#{ENV['HOME']}"
+log_file = File.join log_dir, "lazar-rest.log"
+stderr_path log_file
+stdout_path log_file