versionedFile/versionedFile.py - diff

Return to versionedFile.py CVS log

Up to [Repository] / versionedFile

version 1.62, 2006/06/17 16:21:23	version 1.67, 2006/10/03 14:40:26
Line 833 class versionedFile(CatalogAware,Folder)	Line 833 class versionedFile(CatalogAware,Folder)
le=lv.lastEditor()	le=lv.lastEditor()
return le	return le

	def getLockedBy(self):
	"""get locked by"""
	return str(self.lockedBy)

security.declarePublic('getLastVersion')	security.declarePublic('getLastVersion')
def getLastVersion(self):	def getLastVersion(self):
Line 858 class versionedFile(CatalogAware,Folder)	Line 860 class versionedFile(CatalogAware,Folder)
def diff(self,data):	def diff(self,data):
"""differenz between lastversion and data"""	"""differenz between lastversion and data"""
d=Differ()	d=Differ()
tmp=self.getLastVersion().data	data=data.rstrip()
	try:
	tmp=self.getLastVersion().data.rstrip()
	except:
	tmp=str(self.getLastVersion().data).rstrip()
#print "XX",data,tmp	#print "XX",data,tmp

	try:
l=list(d.compare(data.splitlines(1),tmp.splitlines(1)))	l=list(d.compare(data.splitlines(1),tmp.splitlines(1)))
	except:
	try:
	l=list(d.compare(repr(data).splitlines(1),tmp.splitlines(1)))
	except:
	return 9999,[]

plus=0	plus=0
minus=0	minus=0

for a in l:	for a in l:
if a[0]=='+':	if a[0]=='+':
plus+=1	plus+=1