Supporting lookup

2 files changed, 6 insertions, 1 deletions

diff --git a/lazar.rb b/lazar.rb
index 1fe28f8..a79d406 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -108,7 +108,8 @@ post '/lazar/?' do
     propositionalized = (lazar.prediction_algorithm=="Neighbors.weighted_majority_vote" ? false : true)
    
     # PC type
-    pc_type = params[:pc_type] unless params[:pc_type].nil?
+    pc_type = params[:pc_type] if params[:pc_type]
+    lib = params[:lib] if params[:lib]
 
     # Min train performance
     min_train_performance = params[:min_train_performance].to_f if params[:min_train_performance]
@@ -136,6 +137,7 @@ post '/lazar/?' do
         lazar.similarity_algorithm = "Similarity.cosine"
         min_sim = 0.4 unless params[:min_sim]
         raise OpenTox::NotFoundError.new "No pc_type parameter." unless params[:pc_type]
+        raise OpenTox::NotFoundError.new "No lib parameter." unless params[:lib]
       end
 
     # Create Features
@@ -241,6 +243,7 @@ post '/lazar/?' do
       {DC.title => "feature_generation_uri", OT.paramValue => feature_generation_uri},
       {DC.title => "propositionalized", OT.paramValue => propositionalized},
       {DC.title => "pc_type", OT.paramValue => pc_type},
+      {DC.title => "lib", OT.paramValue => lib},
       {DC.title => "nr_hits", OT.paramValue => nr_hits},
       {DC.title => "min_sim", OT.paramValue => min_sim},
       {DC.title => "min_train_performance", OT.paramValue => min_train_performance},
diff --git a/pc.rb b/pc.rb
index 94b2407..be64dc8 100644
--- a/pc.rb
+++ b/pc.rb
@@ -82,6 +82,8 @@ post '/pc' do
     byteArray = Rjb::import('java.io.ByteArrayOutputStream'); printStream = Rjb::import('java.io.PrintStream'); 
     out = byteArray.new() ; Rjb::import('java.lang.System').out = printStream.new(out) # joelib is too verbose
     s = Rjb::import('JoelibFc') # import main class
+
+    LOGGER.debug "Running PC with pc_type '#{params[:pc_type]}' and lib '#{params[:lib]}'"
     OpenTox::Algorithm.pc_descriptors( { :dataset_uri => params[:dataset_uri], :pc_type => params[:pc_type], :rjb => s, :add_uri => true, :task => task, :lib => params[:lib] } )
   end
   raise OpenTox::ServiceUnavailableError.newtask.uri+"\n" if task.status == "Cancelled"