diff options
Diffstat (limited to 'pc.rb')
| -rw-r--r-- | pc.rb | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -79,12 +79,16 @@ post '/pc/AllDescriptors' do task = OpenTox::Task.create("PC descriptor calculation for dataset ", @uri) do |task| Rjb.load(nil,["-Xmx64m"]) # start vm - 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 + byteArray = Rjb::import('java.io.ByteArrayOutputStream') + printStream = Rjb::import('java.io.PrintStream') + out = byteArray.new() + Rjb::import('java.lang.System').out = printStream.new(out) # suppress java output + Rjb::import('java.lang.System').err = printStream.new(out) # suppress java output s = Rjb::import('JoelibFc') # import main class + t = Rjb::import('ApplyCDKDescriptors') 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], :subjectid => @subjectid} ) + OpenTox::Algorithm.pc_descriptors( { :dataset_uri => params[:dataset_uri], :pc_type => params[:pc_type], :rjb => {:jl=>s, :cdk => t}, :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 +110,8 @@ 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, :subjectid => @subjectid} ) + t = Rjb::import('ApplyCDKDescriptors') + OpenTox::Algorithm.pc_descriptors( { :dataset_uri => params[:dataset_uri], :pc_type => params[:pc_type], :descriptor => params[:descriptor], :rjb => {:jl=>s, :cdk => t}, :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" |