Use config 'outputDirectory' in FileMode #1093
Conversation
| @@ -103,7 +103,7 @@ def run_and_get_results(w_list, parameters='', output_dir=None, | |||
| c = mashup.getAliasByName(key).component | |||
| params.append((c.vttype, c.vtid, value)) | |||
|
|
|||
| if output_dir is not None and controller.current_pipeline is not None: | |||
| if output_dir is not None and controller.current_pipeline is not None: # used | |||
There was a problem hiding this comment.
Here, having outputDirectory set means the workflow XML gets written to it
remram44
force-pushed
the
output-modules-use-global-dir
branch
from
445bccb
to
e4cae9b
Compare
| @@ -553,7 +553,7 @@ def noninteractiveMode(self): | |||
| extra_info = None | |||
| if self.temp_configuration.check('outputDirectory'): | |||
| extra_info = \ | |||
| {'pathDumpCells': self.temp_configuration.outputDirectory} | |||
| {'pathDumpCells': self.temp_configuration.outputDirectory} # carried over to pathDumpCells | |||
There was a problem hiding this comment.
outputDirectory gets set as pathDumpCells which triggers a lot more stuff
remram44
force-pushed
the
output-modules-use-global-dir
branch
from
e4cae9b
to
78a62b3
Compare
| @@ -569,7 +569,7 @@ def noninteractiveMode(self): | |||
|
|
|||
| extra_info = None | |||
| if output_dir: | |||
| extra_info = {'pathDumpCells': output_dir} | |||
| extra_info = {'pathDumpCells': output_dir} # carried over to pathDumpCells | |||
There was a problem hiding this comment.
outputDirectory gets set as pathDumpCells which triggers a lot more stuff
remram44
force-pushed
the
output-modules-use-global-dir
branch
from
78a62b3
to
5447fe0
Compare
| @@ -579,7 +579,7 @@ def noninteractiveMode(self): | |||
| errs.extend(vistrails.core.console_mode.run( | |||
| w_list, | |||
| self.temp_configuration.check('parameters') or '', | |||
| output_dir if self.temp_configuration.check('withWorkflowInfo') else None, | |||
| output_dir if self.temp_configuration.check('withWorkflowInfo') else None, # this is actually ignored | |||
There was a problem hiding this comment.
Does the withWorkflowInfo functionality work at all? This parameter is ignored since 5b639bf as far as I can tell...
There was a problem hiding this comment.
No, this should be removed. Also, the output_dir argument should be removed from console_mode.run, but we need to make sure nothing depends on the old argument order.
remram44
force-pushed
the
output-modules-use-global-dir
branch
3 times, most recently
from
af2e5ea
to
4274cda
Compare
|
Making progress 😄 The last thing is the |
remram44
force-pushed
the
output-modules-use-global-dir
branch
from
af2e5ea
to
50d5245
Compare
|
Yes, but it does not work in batch mode because the spreadsheet is not used. pathDumpCells is set internally when generating thumbnails for the spreadsheet, so there should be no need to set it from the command-line anymore. |
If file.dir is not set or is relative, the global 'outputDirectory' setting will be used.
remram44
force-pushed
the
output-modules-use-global-dir
branch
2 times, most recently
from
bbad6c3
to
7538a49
Compare
|
This should be it? |
Mentioned in yesterday's meeting: 'outputDirectory' setting should be used.
Additionally, it looks like 'outputDirectory' is more than the default output path: if it is set, VisTrails is running in some kind of batch mode? See condition in run.py.
'outputDirectory' is not documented in configuration.py (neither is 'graphsAsPdf').
Should go in v2.2.