771fba8e48f91c79bf72ec7281d7db8541327fcc wong Thu Oct 27 15:56:01 2011 -0700 cleaned up output a little diff --git python/lib/ucscgenomics/mkChangeNotes.py python/lib/ucscgenomics/mkChangeNotes.py index 8aa66b2..3c21bb8 100644 --- python/lib/ucscgenomics/mkChangeNotes.py +++ python/lib/ucscgenomics/mkChangeNotes.py @@ -287,55 +287,58 @@ title = "gbdb files" elif title == "download": title = title + " files" caps = title.upper() if all: output.append("\n") output.append("%s:" % caps) output.append("New: %s" % len(new)) output.append("Untouched: %s" % len(untouched)) output.append("%s: %s" % (removeline, len(revoked))) output.append("New + Untouched: %s" % len(new | untouched)) output.append("%s: %s" % (totaline, len(all))) intersect = new & revoked if intersect: output.append("") - output.append("The following exist in both new and revoked %s:" % title) + output.append("These %s objects exist in both new and revoked %s:" % (len(intersect), title)) for i in intersect: output.append("%s" % i) if all and not summary: output.append("") output.append("New %s (%s):" % (title.title(), len(new))) output.extend(self.__printIter(new, path)) output.append("") output.append("Untouched %s (%s):" % (title.title(), len(untouched))) output.extend(self.__printIter(untouched, path)) output.append("") output.append("%s %s (%s):" % (removeline, title.title(), len(revoked))) output.extend(self.__printIter(revoked, path)) return output def __qaHeader(self, output, newTableSet, filesNoRevoke, newGbdbSet, newSupp, additionalList, revokedTables, revokedFiles, revokedGbdbs, pushFiles, pushGbdbs, args, c): output = [] tableSize = self.__getTableSize() output.append("mkChangeNotes v2") - if (args['releaseOld'] == "solo"): - output.append("%s %s Release %s" % (args['database'], args['composite'], args['releaseNew'])) - else: - output.append("%s %s Release %s vs Release %s" % (args['database'], args['composite'], args['releaseNew'], args['releaseOld'])) + title = "%s %s Release %s" % (args['database'], args['composite'], args['releaseNew']) + if args['releaseOld'] != "solo": + title = title + " vs Release %s" % args['releaseOld'] + if args['summary']: + title = "Summary for " + title + output.append(title) + output.append("") output.append("QA Count Summaries for Release %s:" % args['releaseNew']) output.append("Tables: %d" % int(len(newTableSet))) output.append("Files: %d" % int(len(filesNoRevoke))) output.append("Gbdbs: %d" % int(len(newGbdbSet))) output.append("Supplemental: %d" % int(len(newSupp))) output.append("Other: %d" % int(len(additionalList))) output.append("") output.append("REVOKED:") output.append("Tables: %s" % len(revokedTables)) output.append("Files: %s" % len(revokedFiles)) output.append("Gbdbs: %s" % len(revokedGbdbs)) output.append("") output.append("Sizes of New:")