--- versionedFile/versionedFile.py 2004/11/24 17:02:56 1.20 +++ versionedFile/versionedFile.py 2005/03/21 14:54:50 1.33 @@ -15,8 +15,8 @@ try: except: print "ECHO Elements not imported" class ECHO_basis: - """leer""" - manage_options=() + """leer""" + manage_options=() def sortv(x,y): @@ -52,10 +52,8 @@ class versionedFileFolder(Folder,ECHO_ba def generateIndexHTML(self,RESPONSE=None): """lege standard index.html an""" - - - if not hasattr(self,'index.html'): + if not self.ZopeFind(self,obj_ids=['index.html']): zt=ZopePageTemplate('index.html') self._setObject('index.html',zt) default_content_fn = os.path.join(package_home(globals()), @@ -75,8 +73,7 @@ class versionedFileFolder(Folder,ECHO_ba - - if not hasattr(self,'history_template.html'): + if not self.ZopeFind(self,obj_ids=['history_template.html']): zt=ZopePageTemplate('history_template.html') self._setObject('history_template.html',zt) default_content_fn = os.path.join(package_home(globals()), @@ -90,6 +87,9 @@ class versionedFileFolder(Folder,ECHO_ba if RESPONSE is not None: RESPONSE.redirect('manage_main') + + + def getVersionedFiles(self,sortField='title'): """get all versioned files""" @@ -99,9 +99,21 @@ class versionedFileFolder(Folder,ECHO_ba def sortDate(x,y): return cmp(y[1].getLastVersion().getTime(),x[1].getLastVersion().getTime()) + + def sortComment(x,y): + try: + x=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower() + except: + x='zzzzzzzzzzzzzzzz' + try: + y=getattr(y[1],'comment','ZZZZZZZZZZZZZ').lower() + except: + y='zzzzzzzzzzzzzzzz' + return cmp(x,y) + def sortAuthor(x,y): - return cmp(x[1].getLastVersion().lastEditor(),y[1].getLastVersion().lastEditor()) + return cmp(x[1].getLastVersion().lastEditor().lower(),y[1].getLastVersion().lastEditor().lower()) versionedFiles=self.ZopeFind(self,obj_metatypes=['versionedFile']) @@ -111,6 +123,8 @@ class versionedFileFolder(Folder,ECHO_ba versionedFiles.sort(sortDate) elif sortField=='author': versionedFiles.sort(sortAuthor) + elif sortField=='comment': + versionedFiles.sort(sortComment) return versionedFiles @@ -135,6 +149,10 @@ class versionedFileFolder(Folder,ECHO_ba def addFileForm(self): """add a file""" + ext=self.ZopeFind(self,obj_ids=["addFileForm.dtml"]) + if ext: + return ext[0][1]('',globals(),version='1',AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER) + out=DTMLFile('dtml/newFileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject',version='1').__of__(self) return out() @@ -142,19 +160,47 @@ class versionedFileFolder(Folder,ECHO_ba def addFile(self,vC,file,author,newName='',content_type='',RESPONSE=None): """ add a new file""" if newName=='': - id=file.filename + filename=file.filename + id=filename[max(filename.rfind('/'), + filename.rfind('\\'), + filename.rfind(':'), + )+1:] + else: id=newName vC=self.REQUEST.form['vC'] manage_addVersionedFile(self,id,'','') + #if (getattr(self,'commentNonEmpty',0)==1) and vC.strip()=="": + + ob=self._getOb(id) ob.title=id file2=file - ob.manage_addVersionedFileObject(id,vC,author,file2,content_type=content_type) - + + obj=ob.manage_addVersionedFileObject(id,vC,author,file2,content_type=content_type) + self.REQUEST.SESSION['objID']=ob.getId() + self.REQUEST.SESSION['objID_parent']=None + + if obj.getSize()==0: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) + return pt() + RESPONSE.redirect(self.REQUEST['URL1']) + + def deleteEmptyObject(self,submit,RESPONSE=None): + """deleteemptyobject""" + if submit=="delete it": + if self.REQUEST.SESSION['objID_parent']: + obj=getattr(self,self.REQUEST.SESSION['objID_parent']) + + else: + obj=self + obj.manage_delObjects([self.REQUEST.SESSION['objID']]) + + RESPONSE.redirect(self.REQUEST['URL1']) + manage_addVersionedFileFolderForm=DTMLFile('dtml/folderAdd', globals()) @@ -199,6 +245,33 @@ class versionedFileObject(File): Kind='File',kind='file') manage_editForm._setName('manage_editForm') + def getVComment(self): + """get the comment of this file""" + if not hasattr(self,'vComment') or (not self.vComment) or (self.vComment.lstrip()==""): + return "Add comment" + + else: + return self.vComment + + def manageVCommentForm(self): + """add a comment""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addVComment')).__of__(self) + return pt() + + def manageVComment(self,text,comment_author,submit,REQUEST=None): + """manage comments""" + if submit =='change': + if text=='': + self.vComment=None + else: + self.vComment=text + self.vComment_author=comment_author + + self.vComment_date=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime()) + + return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()+"/history") + + def getTime(self): """getTime""" #return self.bobobase_modification_time().ISO() @@ -217,9 +290,14 @@ class versionedFileObject(File): def download(self): """download and lock""" - + self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getId()) + self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + self.content_type="application/octet-stream" - self.REQUEST.RESPONSE.redirect(self.absolute_url()) + #self.REQUEST.RESPONSE.redirect(self.absolute_url()) + self.REQUEST.RESPONSE.write(self.index_html()) + #self.REQUEST.RESPONSE.write("bl") + self.REQUEST.close() def downloadLocked(self): """download and lock""" @@ -242,10 +320,15 @@ class versionedFileObject(File): """get version""" return self.versionNumber + + def lastEditor(self): """last Editor""" if hasattr(self,'author'): - return self.author + ret=self.author.replace("-","\n") + ret=ret.replace("\r","\n") + return ret + else: jar=self._p_jar oid=self._p_oid @@ -303,11 +386,36 @@ class versionedFile(Folder): self.title=title self.lockedBy=lockedBy self.author=author - + + def getComment(self): + """get the comment of this file""" + if not hasattr(self,'comment') or (not self.comment) or (self.comment.lstrip()==""): + return "Add comment" + + else: + return self.comment + meta_type="versionedFile" - + def manageCommentForm(self): + """add a comment""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addComment')).__of__(self) + return pt() + + def manageComment(self,text,comment_author,submit,REQUEST=None): + """manage comments""" + if submit =='change': + if text=='': + self.comment=None + else: + self.comment=text + self.comment_author=comment_author + + self.comment_date=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime()) + + return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()) + def getLastVersion(self): """Last Version""" tmp=0 @@ -360,6 +468,11 @@ class versionedFile(Folder): ret.sort(sortv) return ret + security.declareProtected('AUTHENTICATED_USER','forceunlock') + def forceunlock(self,RESPONSE): + """unlock""" + self.lockedBy='' + security.declareProtected('AUTHENTICATED_USER','unlock') def unlock(self,RESPONSE): """unlock""" @@ -369,6 +482,7 @@ class versionedFile(Folder): else: return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER']) + security.declareProtected('AUTHENTICATED_USER','addVersionedFileObjectForm') @@ -390,24 +504,50 @@ class versionedFile(Folder): author=self.REQUEST['author'] if changeName=="yes": - self.title=file.filename[0:] + filename=file.filename + self.title=filename[max(filename.rfind('/'), + filename.rfind('\\'), + filename.rfind(':'), + )+1:] + if not newName=='': self.title=newName[0:] id="V%i"%self.getVersion()+"_"+self.title + manage_addVersionedFileObject(self,id,vC,author,file,"V%i"%self.getVersion()+"_"+self.title,precondition, content_type) objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) + self.REQUEST.SESSION['objID_parent']=self.getId() if RESPONSE: - RESPONSE.redirect(self.REQUEST['URL2']) + obj=self.ZopeFind(self,obj_ids=[id])[0][1] + if obj.getSize()==0: + self.REQUEST.SESSION['objID']=obj.getId() + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) + return pt() + else: + RESPONSE.redirect(self.REQUEST['URL2']) + + else: + return self.ZopeFind(self,obj_ids=[id])[0][1] + security.declareProtected('AUTHENTICATED_USER','downloadLocked') def download(self): """download and lock""" - self.getLastVersion().content_type="application/octet-stream" - self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getLastVersion().getId()) + + self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getLastVersion().getId()) + self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + + self.content_type="application/octet-stream" + #self.REQUEST.RESPONSE.write("bl") + self.REQUEST.RESPONSE.write(self.getLastVersion().index_html()) + self.REQUEST.close() + + #self.getLastVersion().content_type="application/octet-stream" + #self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getLastVersion().getId()) def downloadLocked(self): """download and lock"""