Commit ceb12636 authored by aknecht2's avatar aknecht2
Browse files

Removed unnecessary print statements. Correctly generate sites from config.

parent 3d2f093e
......@@ -340,8 +340,7 @@ class Workflow(object):
# NEED TO DETERMINE HOW TO READ IN THIS INFO
for namespace in self.config["profile"]:
for key in self.config["profile"][namespace]:
val = ":".join(self.config["profile"][namespace][key]) if "path" in key.lower() else self.config["profile"][namespace][key]
sites += """\n\t<profile namespace="%s" key="%s">%s</profile> """ % (namespace, key, val)
sites += """\n\t<profile namespace="%s" key="%s">%s</profile> """ % (namespace, key, self.config["profile"][namespace][key])
sites += "</site></sitecatalog>"
sites = sites.replace("\n", "")
wh.write("\n".join([line for line in xml.dom.minidom.parseString(sites).toprettyxml().split('\n') if line.strip()]))
......
......@@ -84,9 +84,6 @@ class WorkflowJob(object):
def _check_files(self, input_files, additional_inputs, output_files):
valid_files = True
for ftype, flist in zip(["inputs", "additional_inputs", "outputs"], [input_files, additional_inputs, output_files]):
print "base: %s \n" % (self.base[self.jobname],)
print "ftype: %s \n" % (ftype,)
print "flist: %s \n" % (flist,)
if self.base[self.jobname][ftype] is not None:
if (len(flist) == len(self.base[self.jobname][ftype])):
for i, f in enumerate(flist):
......
......@@ -105,14 +105,11 @@ class WorkflowModule(object):
return
def _traverse_jobs(self, data, dax, master_jobs, master_files, prefix, markers, input_files, additional_files):
print "[TRAVERSE CALL]"
print "prefix = %s, markers = %s, input_files = %s, additional_files = %s." % (prefix, markers, input_files, additional_files)
for item in data:
for key in item.keys():
if key in self.workflow_jobs:
## GENERATE JOB HERE!!! ###
job_info = item[key]
print "JOB INFO: %s" % (job_info,)
job_inputs = []
job_additional = []
for ftype, fdict, joblist in zip(["inputs", "additional_inputs"], [input_files, additional_files], [job_inputs, job_additional]):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment