From 8289516429c610b3c4efcdbaa376fce7dc26bddf Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Fri, 23 May 2008 21:37:05 +0000 Subject: [PATCH] add --run-xml to runfolder so you can generate summary reports from a previously analyzed runfolder --- scripts/runfolder | 16 ++++++++++++---- setup.py | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/scripts/runfolder b/scripts/runfolder index 13c5cad..af89015 100644 --- a/scripts/runfolder +++ b/scripts/runfolder @@ -32,6 +32,7 @@ import optparse import sys from gaworkflow.pipeline import runfolder +from gaworkflow.pipeline.runfolder import ElementTree def make_parser(): usage = 'usage: %prog [options] runfolder_root_dir' @@ -45,22 +46,29 @@ def make_parser(): parser.add_option('-a', '--archive', dest='archive', action='store_true', default=False, help='generate run configuration archive') + parser.add_option('--run-xml', dest='run_xml', + default=None, + help='specify a run_.xml file for summary reports') + return parser def main(cmdlist=None): parser = make_parser() opt, args = parser.parse_args(cmdlist) - if len(args) == 0: - parser.error('need path to a runfolder') - logging.basicConfig() if opt.verbose: root_log = logging.getLogger() root_log.setLevel(logging.INFO) + runs = [] + if opt.run_xml: + tree = ElementTree.parse(opt.run_xml).getroot() + runs.append(runfolder.PipelineRun(xml=tree)) for run_dir in args: - runs = runfolder.get_runs(run_dir) + runs.extend(runfolder.get_runs(run_dir)) + + if len(runs) > 0: if opt.summary: print runfolder.summary_report(runs) if opt.archive: diff --git a/setup.py b/setup.py index 6f2bb53..2229ed6 100644 --- a/setup.py +++ b/setup.py @@ -11,11 +11,16 @@ setup( "gaworkflow.frontend.fctracker", "gaworkflow.frontend.eland_config" ], - scripts=['scripts/spoolwatcher', - 'scripts/copier', - 'scripts/runner', - 'scripts/retrieve_config', - 'scripts/configure_pipeline', - 'scripts/runfolder', - 'scripts/makebed'], + scripts=[ + 'scripts/configure_pipeline', + 'scripts/copier', + 'scripts/gerald2bed.py', + 'scripts/library.py', + 'scripts/makebed', + 'scripts/spoolwatcher', + 'scripts/rerun_eland.py', + 'scripts/retrieve_config', + 'scripts/runfolder', + 'scripts/runner', + ], ) -- 2.30.2