075f5d45b2377b8f9582ac2c3e5b5b5d21bb33f9 wong Wed Dec 14 10:36:38 2011 -0800 corrected backward changes diff --git python/lib/ucscgenomics/ra.py python/lib/ucscgenomics/ra.py index e3e15b8..d900f2a 100644 --- python/lib/ucscgenomics/ra.py +++ python/lib/ucscgenomics/ra.py @@ -240,31 +240,31 @@ ''' retDict = collections.defaultdict(list) dropList = set(self.iterkeys()) - set(otherRa.iterkeys()) addList = set(otherRa.iterkeys()) - set(self.iterkeys()) common = set(self.iterkeys()) & set(otherRa.iterkeys()) p = re.compile('^\s*#') for stanza in common: if p.match(stanza): continue for key in self[stanza]: if p.match(key): continue if key in otherRa[stanza]: if self[stanza][key] != otherRa[stanza][key]: - retDict[stanza].append("Changed %s from %s -> %s" %(key, self[stanza][key], otherRa[stanza][key])) + retDict[stanza].append("Changed %s from %s -> %s" %(key, otherRa[stanza][key], self[stanza][key])) else: retDict[stanza].append("Added %s -> %s" %(key, self[stanza][key])) for key in otherRa[stanza]: if p.match(key): continue if key not in self[stanza]: retDict[stanza].append("Dropped %s -> %s" %(key, otherRa[stanza][key])) return retDict, dropList, addList def diffFilter(self, select, other): ''' Input: Lambda function of desired comparison term RaFile object being compared. Output: RaFile with differences.