From c04e4b8ccad8b14fa0176d1f2b1fb5c305c96849 Mon Sep 17 00:00:00 2001 From: David Vorgrimmler Date: Wed, 20 Jun 2012 14:35:48 +0200 Subject: Added subjectids. --- pc.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc.rb b/pc.rb index d8390f1..3718eeb 100644 --- a/pc.rb +++ b/pc.rb @@ -84,7 +84,7 @@ post '/pc/AllDescriptors' do 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] } ) + OpenTox::Algorithm.pc_descriptors( { :dataset_uri => params[:dataset_uri], :pc_type => params[:pc_type], :rjb => s, :add_uri => true, :task => task, :lib => params[:lib], :subjectid => @subjectid} ) end raise OpenTox::ServiceUnavailableError.newtask.uri+"\n" if task.status == "Cancelled" halt 202,task.uri.to_s+"\n" @@ -106,7 +106,7 @@ post '/pc/:descriptor' 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 - OpenTox::Algorithm.pc_descriptors( { :dataset_uri => params[:dataset_uri], :pc_type => params[:pc_type], :descriptor => params[:descriptor], :rjb => s, :add_uri => false, :task => task } ) + OpenTox::Algorithm.pc_descriptors( { :dataset_uri => params[:dataset_uri], :pc_type => params[:pc_type], :descriptor => params[:descriptor], :rjb => s, :add_uri => false, :task => task, :subjectid => @subjectid} ) end raise OpenTox::ServiceUnavailableError.newtask.uri+"\n" if task.status == "Cancelled" halt 202,task.uri.to_s+"\n" -- cgit v1.2.3