--- versionedFile/versionedFile.py 2005/11/02 12:38:52 1.50 +++ versionedFile/versionedFile.py 2006/02/17 12:16:08 1.56 @@ -1,4 +1,3 @@ - from OFS.Folder import Folder from OFS.Image import File from OFS.Image import cookId @@ -8,15 +7,16 @@ from AccessControl import getSecurityMan from Products.PageTemplates.PageTemplate import PageTemplate from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from AccessControl import ClassSecurityInfo -<<<<<<< versionedFile.py -from Products.ImageArchive.ImageArchive import manage_AddImageZogiLib +from difflib import Differ +from pprint import pprint + from Products.ZCatalog.CatalogPathAwareness import CatalogAware -======= + try: from Products.ImageArchive.ImageArchive import manage_AddImageZogiLib except: print "no images" ->>>>>>> 1.49 + from threading import Thread import shutil @@ -133,8 +133,55 @@ class versionedFileFolder(Folder,ECHO_ba {'label':'Generate history_template.html','action':'generateHistoryHTML'}, {'label':'Import Folder','action':'importFolderForm'}, {'label':'Export Folder','action':'exportFolder'}, + {'label':'Position of version number','action':'changeHistoryFileNamesForm'}, ) + def changeHistoryFileNamesForm(self): + """change position of version num""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeHistoryFileNamesForm.zpt')).__of__(self) + return pt() + + + def changeHistoryFileNames(self,positionVersionNum="front",RESPONSE=None): + """change position of version num""" + + + + versions=self.ZopeFind(self,obj_metatypes=['versionedFileObject'],search_sub=1) + + if not (getattr(self,'positionVersionNum','front')==positionVersionNum): + + for version in versions: + + if positionVersionNum=="front": + + titleTmp=os.path.splitext(version[1].title) + titleTmp2="_".join(titleTmp[0].split("_")[0:-1]) + if len(titleTmp)>1: + id=titleTmp[0].split("_")[-1]+"_"+titleTmp2+"."+titleTmp[1] + else: + id=titleTmp[0].split("_")[-1]+"_"+titleTmp2 + + else: + titleTmp="_".join(version[1].getId().split("_")[1:]) + tmp=os.path.splitext(titleTmp) + if len(tmp)>1: + id=tmp[0]+"_"+version[1].getId().split("_")[0]+tmp[1] + else: + id=tmp[0]+"_"+version[1].getId().split("_")[0] + + + + version[1].aq_parent.manage_renameObjects(ids=[version[1].getId()],new_ids=[id]) + version[1].title=id + + + self.positionVersionNum=positionVersionNum + if RESPONSE: + RESPONSE.redirect("manage_main") + + + def importFolderForm(self): """form fuer folder import""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','importFolderForm.zpt')).__of__(self) @@ -469,13 +516,15 @@ class versionedFileObject(File): manage_editForm =DTMLFile('dtml/fileEdit',globals(), Kind='File',kind='file') manage_editForm._setName('manage_editForm') -<<<<<<< versionedFile.py - security.declarePublic('getVComment') -======= - security= ClassSecurityInfo() ->>>>>>> 1.49 + security.declarePublic('getTitle') + + def getTitle(self): + """get title""" + return self.title + + security.declarePublic('getVComment') def getVComment(self): """get the comment of this file""" if not hasattr(self,'vComment') or (not self.vComment) or (self.vComment.lstrip()==""): @@ -510,25 +559,23 @@ class versionedFileObject(File): return REQUEST.RESPONSE.redirect(self.REQUEST.SESSION['refer']) return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()+"/history") -<<<<<<< versionedFile.py + security.declarePublic('getVersionComment') def getVersionComment(self): """getversioncomment""" return self.versionComment security.declarePublic('getTime') -======= - security.declarePublic('getTime') ->>>>>>> 1.49 + def getTime(self): """getTime""" #return self.bobobase_modification_time().ISO() if hasattr(self,'time'): return time.strftime("%Y-%m-%d %H:%M:%S",self.time) - elif hasattr(self,'timefixed'): - return self.timefixed + elif hasattr(self,'timefixed'): + return self.timefixed else: - setattr(self,'timefixed',self.bobobase_modification_time().ISO()) + setattr(self,'timefixed',self.bobobase_modification_time().ISO()) return self.bobobase_modification_time().ISO() @@ -572,12 +619,9 @@ class versionedFileObject(File): """set version""" self.versionNumber=versionNumber -<<<<<<< versionedFile.py - security.declarePublic('getVersionNumber') -======= security.declarePublic('getVersionNumber') ->>>>>>> 1.49 + def getVersionNumber(self): """get version""" return self.versionNumber @@ -588,15 +632,16 @@ class versionedFileObject(File): return self.versionComment -<<<<<<< versionedFile.py - security.declarePublic('lastEditor') -======= + security.declarePublic('lastEditor') ->>>>>>> 1.49 + def lastEditor(self): """last Editor""" if hasattr(self,'author'): - ret=self.author.replace("-","\n") + try: + ret=self.author.replace("-","\n") + except:#old version of versionded file sometimes stored the user object and not only the name the following corrects this + ret=str(self.author).replace("-","\n") ret=ret.replace("\r","\n") return ret @@ -653,6 +698,10 @@ class versionedFile(CatalogAware,Folder) default_catalog='fileCatalog' + def getTitle(self): + """get title""" + return self.title + def PrincipiaSearchSource(self): """Return cataloguable key for ourselves.""" return str(self) @@ -761,12 +810,33 @@ 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() #return "File:"+self.title+" Version:%i"%lastVersion.versionNumber," modified:",lastVersion.bobobase_modification_time()," size:",lastVersion.getSize(),"modified by:",lastVersion.lastEditor() return "File: %s Version:%i modified:%s size:%s modified by:%s"%(self.title,lastVersion.versionNumber,lastVersion.getTime(),lastVersion.getSize(),lastVersion.lastEditor()) - security= ClassSecurityInfo() + security= ClassSecurityInfo() + + security.declarePublic('getVersion') def getVersion(self): tmp=0 @@ -848,11 +918,24 @@ class versionedFile(CatalogAware,Folder) if not newName=='': self.title=newName[0:] - print self.title - id="V%i"%self.getVersion()+"_"+self.title - manage_addVersionedFileObject(self,id,vC,author,file,"V%i"%self.getVersion()+"_"+self.title,precondition, content_type) + + + + positionVersionNum=getattr(self,'positionVersionNum','front') + + if positionVersionNum=='front': + id="V%i"%self.getVersion()+"_"+self.title + else: + tmp=os.path.splitext(self.title) + if len(tmp)>1: + id=tmp[0]+"_V%i"%self.getVersion()+tmp[1] + else: + id=tmp[0]+"_V%i"%self.getVersion() + + + manage_addVersionedFileObject(self,id,vC,author,file,id,precondition, content_type) objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) self.REQUEST.SESSION['objID_parent']=self.getId()