--- versionedFile/versionedFile.py 2005/11/21 19:54:11 1.51 +++ versionedFile/versionedFile.py 2006/06/18 12:59:46 1.65 @@ -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 @@ -299,6 +299,26 @@ class versionedFileFolder(Folder,ECHO_ba if RESPONSE is not None: RESPONSE.redirect('manage_main') + + def generateAddFileForm(self,RESPONSE=None): + """lege standard addfileform an""" + #TODO: write generateaddfileform only a dummy at them moment + + if not self.ZopeFind(self,obj_ids=['addFileForm.dtml']): + zt=ZopePageTemplate('index.html') + self._setObject('index.html',zt) + default_content_fn = os.path.join(package_home(globals()), + 'zpt/versionFileFolderMain.zpt') + text = open(default_content_fn).read() + zt.pt_edit(text, 'text/html') + + else: + return "already exists!" + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + + def generateIndexHTML(self,RESPONSE=None): """lege standard index.html an""" @@ -419,6 +439,7 @@ class versionedFileFolder(Folder,ECHO_ba return pt() + def addFileForm(self): """add a file""" ext=self.ZopeFind(self,obj_ids=["addFileForm.dtml"]) @@ -518,8 +539,15 @@ class versionedFileObject(File): manage_editForm._setName('manage_editForm') - security.declarePublic('getVComment') + + + 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()==""): @@ -567,10 +595,10 @@ class versionedFileObject(File): #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() @@ -597,11 +625,12 @@ class versionedFileObject(File): #self.REQUEST.close() + security.declareProtected('AUTHENTICATED_USER','downloadLocked') def downloadLocked(self): """download and lock""" - if self.REQUEST['AUTHENTICATED_USER']=='Anonymous User': + if repr(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User': return "please login first" if not self.aq_parent.lockedBy=="": return "cannot be locked because is already locked by %s"%self.lockedBy @@ -633,9 +662,12 @@ class versionedFileObject(File): 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 + return ret.lstrip().rstrip() else: jar=self._p_jar @@ -690,6 +722,13 @@ class versionedFile(CatalogAware,Folder) default_catalog='fileCatalog' + security= ClassSecurityInfo() + + security.declarePublic('getTitle') + def getTitle(self): + """get title""" + return self.title + def PrincipiaSearchSource(self): """Return cataloguable key for ourselves.""" return str(self) @@ -750,7 +789,7 @@ class versionedFile(CatalogAware,Folder) else: return images - + security.declarePublic('getComment') def getComment(self): """get the comment of this file""" if not hasattr(self,'comment') or (not self.comment) or (self.comment.lstrip()==""): @@ -779,7 +818,26 @@ class versionedFile(CatalogAware,Folder) self.comment_date=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime()) return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()) + + security.declarePublic('getLastChangeDate') + def getLastChangeDate(self): + """get last change date""" + lv=self.getLastVersion() + time=lv.getTime() + return time + + def getLastEditor(self): + """get last change date""" + lv=self.getLastVersion() + le=lv.lastEditor() + return le + + def getLockedBy(self): + """get locked by""" + return str(self.lockedBy) + + security.declarePublic('getLastVersion') def getLastVersion(self): """Last Version""" tmp=0 @@ -798,12 +856,40 @@ 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 + + try: + 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 + minus=0 + for a in l: + if a[0]=='+': + plus+=1 + if a[0]=='-': + minus+=1 + + + return max([plus,minus]),l + security.declarePublic('index_html') 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.declarePublic('getVersion') def getVersion(self): tmp=0 @@ -838,16 +924,22 @@ class versionedFile(CatalogAware,Folder) return ret security.declareProtected('AUTHENTICATED_USER','forceunlock') - def forceunlock(self,RESPONSE): + def forceunlock(self,RESPONSE=None): """unlock""" + #safe who had the lock + if self.lockedBy: + self.brokenLock=str(self.lockedBy) + else: + self.brokenLock="" self.lockedBy='' + return self.brokenLock security.declareProtected('AUTHENTICATED_USER','unlock') def unlock(self,RESPONSE): """unlock""" if str(self.lockedBy) in [str(self.REQUEST['AUTHENTICATED_USER'])]: self.lockedBy='' - RESPONSE.redirect(self.REQUEST['URL2']) + RESPONSE.redirect(self.REQUEST['HTTP_REFERER']) else: return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER']) @@ -861,8 +953,12 @@ class versionedFile(CatalogAware,Folder) if str(self.REQUEST['AUTHENTICATED_USER']) in ["Anonymous User"]: return "please login first" if (self.lockedBy==self.REQUEST['AUTHENTICATED_USER']) or (self.lockedBy==''): - out=DTMLFile('dtml/fileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject',version=self.getVersion()).__of__(self) - return out() + ext=self.ZopeFind(self.aq_parent,obj_ids=["addNewVersion.dtml"]) + if ext: + return ext[0][1]('',globals(),version=self.getVersion(),lastComment=self.getLastVersion().getVersionComment(),AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER) + else: + out=DTMLFile('dtml/fileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject',version=self.getVersion()).__of__(self) + return out() else: return "Sorry file is locked by somebody else" @@ -906,6 +1002,10 @@ class versionedFile(CatalogAware,Folder) objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) self.REQUEST.SESSION['objID_parent']=self.getId() + if getattr(self,'defaultFileCatalog',None): + + self.reindex_object() + if RESPONSE: obj=self.ZopeFind(self,obj_ids=[id])[0][1] if obj.getSize()==0: @@ -942,9 +1042,11 @@ class versionedFile(CatalogAware,Folder) #self.getLastVersion().content_type="application/octet-stream" self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getLastVersion().getId()) + security.declareProtected('AUTHENTICATED_USER','downloadLocked') def downloadLocked(self): """download and lock""" - if self.REQUEST['AUTHENTICATED_USER']=='Anonymous User': + + if repr(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User': return "please login first" if not self.lockedBy=="": return "cannot be locked because is already locked by %s"%self.lockedBy