summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Vorgrimmler <vorgrimmlerdavid@gmx.de>2012-06-20 14:35:48 +0200
committerDavid Vorgrimmler <vorgrimmlerdavid@gmx.de>2012-06-20 14:35:48 +0200
commitc04e4b8ccad8b14fa0176d1f2b1fb5c305c96849 (patch)
tree775eaf8869eae0cd58cd8946c92b08b18cf38675
parenta052eaac2cb5fb16102cbfadace38982e3e45263 (diff)
Added subjectids.
-rw-r--r--pc.rb4
1 files 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"