--- versionedFile/versionedFile.py 2005/11/21 19:54:11 1.51 +++ versionedFile/versionedFile.py 2005/11/28 12:31:28 1.54 @@ -1,4 +1,3 @@ - from OFS.Folder import Folder from OFS.Image import File from OFS.Image import cookId @@ -8,7 +7,8 @@ from AccessControl import getSecurityMan from Products.PageTemplates.PageTemplate import PageTemplate from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from AccessControl import ClassSecurityInfo - +from difflib import Differ +from pprint import pprint from Products.ZCatalog.CatalogPathAwareness import CatalogAware @@ -170,7 +170,7 @@ class versionedFileFolder(Folder,ECHO_ba else: id=tmp[0]+"_"+version[1].getId().split("_")[0] - print version[0],id + version[1].aq_parent.manage_renameObjects(ids=[version[1].getId()],new_ids=[id]) version[1].title=id @@ -798,6 +798,25 @@ class versionedFile(CatalogAware,Folder) lastVersion.versionNumber=1 return lastVersion + + def diff(self,data): + """differenz between lastversion and data""" + d=Differ() + tmp=self.getLastVersion().data + #print "XX",data,tmp + l=list(d.compare(data.splitlines(1),tmp.splitlines(1))) + + plus=0 + minus=0 + for a in l: + if a[0]=='+': + plus+=1 + if a[0]=='-': + minus+=1 + + + return max([plus,minus]),l + def index_html(self): """main view""" lastVersion=self.getLastVersion()