0717b9fc1c24d949bfa8267f4c4296a61e209aa2 wong Wed Dec 7 10:46:21 2011 -0800 added some attributes needed externally diff --git python/lib/ucscgenomics/mkChangeNotes.py python/lib/ucscgenomics/mkChangeNotes.py index 1046e7c..0c0b566 100644 --- python/lib/ucscgenomics/mkChangeNotes.py +++ python/lib/ucscgenomics/mkChangeNotes.py @@ -590,30 +590,32 @@ self.totalFiles = self.__cleanSpecialFiles(totalFiles) self.oldTotalFiles = self.__cleanSpecialFiles(oldTotalFiles) (self.oldTotalFiles, self.additionalList, self.oldAdditionalList, self.totalFiles) = self.__separateOutAdditional() #get the stuff you need to push self.pushTables = set(sorted((self.newTableSet - self.oldTableSet))) self.pushFiles = set(sorted((self.totalFiles - self.oldTotalFiles))) self.pushGbdbs = set(sorted((self.newGbdbSet - self.oldGbdbSet))) self.newSupp = self.newSupplementalSet - self.oldSupplementalSet self.newTables = set(self.pushTables) self.newFiles = set(ucscUtils.printIter(self.pushFiles, self.releasePath)) self.newGbdbs = set(ucscUtils.printIter(self.pushGbdbs, self.gbdbPath)) self.newSupplemental = set(ucscUtils.printIter(self.newSupp, self.releasePath)) self.newOthers = set(ucscUtils.printIter(self.additionalList, self.releasePath)) + self.fullFiles = sorted(self.totalFiles - self.revokedFiles) + self.fullTables = self.oldTableSet & self.newTableSet self.errors = errors #don't output.append(report unless ignore option is on or no errors #module mode doesn't generate output by default if (not errors) or self.ignore: self.output = self.printReport(args, c) else: self.output = self.printErrors(errors, self.missingFiles) elif self.releaseOld == 'solo': self.newReleaseFiles = c.releases[int(self.releaseNew)-1] self.oldReleaseFiles = set() @@ -631,24 +633,31 @@ self.tableSize = self.__getTableSize() (self.newGbdbSet, self.revokedGbdbs, newGbdbError) = self.getGbdbFiles("new") #collect errors errors.extend(newFileErrors) errors.extend(newTableError) errors.extend(newGbdbError) #set for easy operations totalFiles = set(self.newReleaseFiles) #clean out special fiels we don't push i.e. md5sum.history self.totalFiles = self.__cleanSpecialFiles(totalFiles) + self.pushTables = self.newTableSet + self.pushFiles = self.totalFiles + self.pushGbdbs = self.newGbdbSet + self.newSupp = self.newSupplementalSet + self.fullFiles = self.totalFiles + self.fullTables = self.newTableSet + #makes list for additional files (self.oldTotalFiles, self.oldSupplementalSet) = (set(), set()) (self.oldReleaseFiles, self.additionalList, self.oldAdditionalList, self.totalFiles) = self.__separateOutAdditional() self.errors = errors if (not errors) or self.ignore: self.output = self.printReportOne(args, c) else: self.droppedTables = set() self.output = self.printErrors(errors, set())