unicorn.rb added. merge conflicts resolved

4 files changed, 42 insertions, 16 deletions

diff --git a/application.rb b/application.rb
index 1262b9e..6eb49e4 100644
--- a/application.rb
+++ b/application.rb
@@ -11,8 +11,25 @@ require_relative 'last-utils/lu.rb'
 # Library Code
 $logger.debug "Algorithm booting: #{$algorithm.collect{ |k,v| "#{k}: '#{v}'"} }"
 Dir['./lib/*.rb'].each { |f| require f; also_reload f } # Libs
-#Dir['./lib/descriptor.rb'].each { |f| require f; also_reload f } # Libs
-Dir['./*.rb'].each { |f| require_relative f; also_reload f } # Webapps
+=begin
+Dir['./*.rb'].each do |f|
+  unless f == "unicorn.rb"
+    require_relative f
+    also_reload f  # Webapps
+  end
+end
+=end
+
+[
+"descriptor.rb",
+"feature-selection.rb",
+"fminer.rb",
+"lazar.rb",
+"test.rb"
+].each do |f|
+    require_relative f
+    also_reload f  # Webapps
+end
 
 # Entry point
 module OpenTox
diff --git a/lazar.rb b/lazar.rb
index a9ef863..36b910a 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -30,7 +30,7 @@ module OpenTox
     # @return [text/uri-list] Task URI 
     post '/lazar/?' do 
       bad_request_error "Please provide a dataset_uri parameter." unless params[:dataset_uri]
-      resource_not_found_error "Dataset '#{params[:dataset_uri]}' not found." unless URI.accessible? params[:dataset_uri], @subjectid
+      #resource_not_found_error "Dataset '#{params[:dataset_uri]}' not found." unless URI.accessible? params[:dataset_uri], @subjectid # wrong URI class
       bad_request_error "Please provide a feature_generation_uri parameter." unless params[:feature_generation_uri]
       task = OpenTox::Task.run("Create lazar model", uri('/lazar'), @subjectid) do |task|
         #lazar = OpenTox::Model::Lazar.new(nil, @subjectid)
diff --git a/lib/lazar.rb b/lib/lazar.rb
index edfee43..98293d5 100644
--- a/lib/lazar.rb
+++ b/lib/lazar.rb
@@ -203,22 +203,20 @@ module OpenTox
           @parameters << {RDF::DC.title => "feature_dataset_uri", RDF::OT.paramValue => feature_dataset_uri}
           self[RDF::OT.featureDataset] = feature_dataset_uri
         end
+        if params[:feature_dataset_uri]
+          bad_request_error "Feature dataset #{params[:feature_dataset_uri]} does not exist." unless URI.accessible? params[:feature_dataset_uri], @subjectid
+          @parameters << {RDF::DC.title => "feature_dataset_uri", RDF::OT.paramValue => params[:feature_dataset_uri]}
+          self[RDF::OT.featureDataset] = params["feature_dataset_uri"]
+        else
+          # run feature generation algorithm
+          feature_dataset_uri = OpenTox::Algorithm.new(params[:feature_generation_uri], @subjectid).run(params)
+          @parameters << {RDF::DC.title => "feature_dataset_uri", RDF::OT.paramValue => feature_dataset_uri}
+          self[RDF::OT.featureDataset] = feature_dataset_uri
+        end
         put
         @uri
-
-<<<<<<< HEAD
-=======
-      if params[:feature_dataset_uri]
-        bad_request_error "Feature dataset #{params[:feature_dataset_uri]} does not exist." unless URI.accessible? params[:feature_dataset_uri], @subjectid
-        @parameters << {RDF::DC.title => "feature_dataset_uri", RDF::OT.paramValue => params[:feature_dataset_uri]}
-        self[RDF::OT.featureDataset] = params["feature_dataset_uri"]
-      else
-        # run feature generation algorithm
-        feature_dataset_uri = OpenTox::Algorithm.new(params[:feature_generation_uri], @subjectid).run(params)
-        @parameters << {RDF::DC.title => "feature_dataset_uri", RDF::OT.paramValue => feature_dataset_uri}
-        self[RDF::OT.featureDataset] = feature_dataset_uri
->>>>>>> ad386110267ecc3e0c5301769b4880a7e555a44e
       end
+
     end
 
   end
diff --git a/unicorn.rb b/unicorn.rb
new file mode 100644
index 0000000..e1d6aeb
--- /dev/null
+++ b/unicorn.rb
@@ -0,0 +1,11 @@
+service = File.dirname(File.expand_path(__FILE__)).split('/').last
+config_dir = "#{ENV['HOME']}/.opentox/config"
+log_dir = "#{ENV['HOME']}/.opentox/log"
+log_file = File.join log_dir, "#{service}.log"
+require File.join config_dir, service
+port = eval("$#{service}[:port]")
+listen port
+pid File.join(log_dir,"#{service}.pid")
+stderr_path log_file
+stdout_path log_file
+