Author: bugman Date: Thu Jan 7 14:40:30 2010 New Revision: 10128 URL: http://svn.gna.org/viewcvs/relax?rev=10128&view=rev Log: Fixes for the process_results() method. The result_string variable was accidentally deleted in the attempt to fix the STDOUT and STDERR problems. Modified: branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py Modified: branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py URL: http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py?rev=10128&r1=10127&r2=10128&view=diff ============================================================================== --- branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py (original) +++ branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py Thu Jan 7 14:40:30 2010 @@ -256,7 +256,16 @@ # rename confusing with processor process_results def process_results(self, results, processor, completed): + + # Disassemble the results list. param_vector, func, iter, fc, gc, hc, warning = results + + # Get the STDOUT and STDERR messages. + #FIXME: we need to interleave stdout and stderr + (stdout, stderr)= processor.get_stdio_capture() + result_string = stdout.getvalue() + stderr.getvalue() + stdout.truncate(0) + stderr.truncate(0) processor.return_object(MF_result_command(processor, self.memo_id, param_vector, func, iter, fc, gc, hc, warning, completed=False)) processor.return_object(Result_string(processor, result_string, completed=completed))