--- versionedFile/extVersionedFile.py 2007/09/14 14:58:28 1.11 +++ versionedFile/extVersionedFile.py 2009/06/21 11:28:55 1.32 @@ -3,6 +3,7 @@ using the ExtFile Product, this version DW 11.10.2006 """ +import email from OFS.Folder import Folder from OFS.Image import File from OFS.Image import cookId @@ -135,12 +136,26 @@ class extVersionedFileFolder(Folder,ECHO {'label':'Generate Index.html','action':'generateIndexHTML'}, {'label':'Generate Image Index.html','action':'generateIndexHTML_image'}, {'label':'Generate history_template.html','action':'generateHistoryHTML'}, - {'label':'Import Folder','action':'importFolderForm'}, - {'label':'Export Folder','action':'exportFolder'}, + {'label':'Import directory','action':'importFolderForm'}, + {'label':'Export as file','action':'exportFolder'}, + {'label':'Import versionedFileFolder','action':'importVersionedFileFolderForm'}, {'label':'Position of version number','action':'changeHistoryFileNamesForm'}, ) + def redirect(self,RESPONSE,url): + """mache ein redirect mit einem angehaengten time stamp um ein reload zu erzwingen""" + + timeStamp=time.time() + + if url.find("?")>-1: #giebt es schon parameter + addStr="&time=%s" + else: + addStr="?time=%s" + + RESPONSE.setHeader('Last-Modified',email.Utils.formatdate().split("-")[0]+'GMT') + logging.error(email.Utils.formatdate()+' GMT') + RESPONSE.redirect(url+addStr%timeStamp) def changeHistoryFileNamesForm(self): """change position of version num""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeHistoryFileNamesForm.zpt')).__of__(self) @@ -513,15 +528,17 @@ class extVersionedFileFolder(Folder,ECHO # get new extVersionedFile vf = self._newVersionedFile(id,title=id) - #if (getattr(self,'commentNonEmpty',0)==1) and vC.strip()=="": - # add file to this folder + logging.error("addFile id=%s vf=%s of %s"%(repr(id),repr(vf),repr(self))) + # add its content (and don't index) + obj=vf.addContentObject(id,vC,author=author,file=file,content_type=content_type,from_tmp=isRealFile,index=False) + # add file to this folder (this should do the indexing) self._setObject(id,vf) - # add its content - logging.info("ADD: %s"%repr(vf)) - obj=vf.addContentObject(id,vC,author=author,file=file,content_type=content_type,from_tmp=isRealFile) - self.REQUEST.SESSION['objID']=vf.getId() - self.REQUEST.SESSION['objID_parent']=None + try: + self.REQUEST.SESSION['objID']=vf.getId() + self.REQUEST.SESSION['objID_parent']=None + except: + pass if obj.getSize()==0: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) @@ -554,6 +571,9 @@ class extVersionedFileFolder(Folder,ECHO """fix last version number of all files""" for (id,vf) in self.getVersionedFiles(): vf.fixVersionNumbers() + # recursively + for (id,vf) in self.objectItems(self.meta_type): + vf.fixVersionNumbers() manage_addextVersionedFileFolderForm=DTMLFile('dtml/extfolderAdd', globals()) @@ -607,6 +627,13 @@ class extVersionedFileObject(ExtFile): self.time = time self.author = author + security.declareProtected('manage','changeObject') + def changeObject(self,**args): + """modify any of the objects attributes""" + for arg in args: + if hasattr(self, arg): + logging.debug("changeObject %s: %s=%s"%(repr(self),arg,args[arg])) + setattr(self, arg, args[arg]) security.declarePublic('getTitle') def getTitle(self): @@ -615,8 +642,28 @@ class extVersionedFileObject(ExtFile): def getData(self): """returns object content (calls ExtFile.index_html)""" - return ExtFile.index_html(self) + #logging.debug("+++++++getData1:"+repr(self.get_filename())) + filename = self.get_filename() + #return ExtFile.index_html(self) + try: + logging.info("readfile:"+filename) + return file(filename).read() + except: + logging.info("cannot readfile:"+filename) + return ExtFile.index_html(self) + + + def getFileName(self): + """return filename""" + return self.get_filename() + def addToFile(self,filehandle): + filehandle.write(self.getData()) + + def addToFile2(self,filename): + str="cat %s > %s"%(self.get_filename(),filename) + os.popen(str) + security.declarePublic('getVComment') def getVComment(self): """get the comment of this file""" @@ -679,13 +726,16 @@ class extVersionedFileObject(ExtFile): #self.REQUEST.RESPONSE.setHeader("Content-Length","str(len(txt)+1000)") self.content_type="application/octet-stream" - self.REQUEST.RESPONSE.redirect(self.absolute_url()) + return self.getData() + #self.REQUEST.RESPONSE.redirect(self.absolute_url()) #txt=urllib.urlopen(self.absolute_url()).read() #self.REQUEST.RESPONSE.write(txt) #self.REQUEST.close() + view = download + security.declareProtected('AUTHENTICATED_USER','downloadLocked') def downloadLocked(self): """download and lock""" @@ -769,8 +819,12 @@ class extVersionedFile(CatalogAware,Fold meta_type = 'extVersionedFile' # meta_type of contained objects content_meta_type = ['extVersionedFileObject'] + # default catalog for extVersionedFile objects default_catalog = 'fileCatalog' + manage_options = Folder.manage_options+({'label':'Main Config','action':'changeVersionedFileForm'},) + + security=ClassSecurityInfo() def __init__(self, id, title, lockedBy,author): @@ -778,6 +832,8 @@ class extVersionedFile(CatalogAware,Fold self.id=id self.title=title self.lockedBy=lockedBy + if self.lockedBy is None: + self.lockedBy = '' self.author=author self.lastVersionNumber=0 self.lastVersionId=None @@ -864,8 +920,10 @@ class extVersionedFile(CatalogAware,Fold def getLastChangeDate(self): """get last change date""" lv=self.getContentObject() - time=lv.getTime() - return time + if lv: + time=lv.getTime() + return time + return None def getLastEditor(self): """get last change date""" @@ -875,6 +933,8 @@ class extVersionedFile(CatalogAware,Fold def getLockedBy(self): """get locked by""" + if self.lockedBy is None: + self.lockedBy = '' return str(self.lockedBy) def getLastVersionNumber(self): @@ -907,34 +967,45 @@ class extVersionedFile(CatalogAware,Fold lv=None for v in self.objectValues(self.content_meta_type): - logging.debug("getlastversion: check %s"%v.getId()) + #logging.debug("getlastversion: check %s"%v.getId()) if v.getVersionNumber() > tmp: tmp=v.getVersionNumber() lv=v - logging.debug("getlastversion: got %s"%lv.getId()) + #ogging.debug("getlastversion: got %s"%lv.getId()) return lv def getContentObject(self): """returns the last version object""" - if not self.lastVersionId: + if not getattr(self, 'lastVersionId', None): + # find last version and save it lv = self.findLastVersion() if lv is None: return None self.lastVersionNumber = lv.getVersionNumber() self.lastVersionId = lv.getId() - return getattr(self, self.lastVersionId) + return getattr(self, self.lastVersionId, None) security.declarePublic('getData') def getData(self): """Returns the content of the last version""" + logging.debug("+++++++getData2") ob = self.getContentObject() if ob is not None: return ob.getData() else: return None + security.declarePublic('view') + def view(self,REQUEST=None,RESPONSE=None): + """Returns the last version's view""" + ob = self.getContentObject() + if ob is not None: + return ob.view(REQUEST=REQUEST,RESPONSE=RESPONSE) + else: + return None + def diff(self,data): """differenz between lastversion and data""" d=Differ() @@ -963,7 +1034,20 @@ class extVersionedFile(CatalogAware,Fold #return "File: %s Version:%i modified:%s size:%s modified by:%s"%(self.title,lastVersion.versionNumber,lastVersion.getTime(),lastVersion.getSize(),lastVersion.lastEditor()) return self.history() - + def getVersionNr(self,nr): + """get version with number nr""" + tmp=0 + lastVersion=None + + + for version in self.ZopeFind(self): + + if hasattr(version[1],'versionNumber'): + + if int(version[1].versionNumber) ==nr : + return version[1] + + return None security.declarePublic('getVersion') def getVersion(self): # TODO: this is ugly and it returns the next version number @@ -994,15 +1078,37 @@ class extVersionedFile(CatalogAware,Fold ret.sort(sortv) return ret + def getVersionList(self): + """get a list of dicts with author, comment, filename, etc, of all versions""" + vl = [] + for v in self.objectValues(self.content_meta_type): + vl.append({'versionNumber':getattr(v,'versionNumber',0), + 'title':v.getTitle(), + 'id':v.getId(), + 'date':v.getTime(), + 'author':getattr(v,'author',''), + 'comment':getattr(v,'versionComment','') + }) + return vl + security.declareProtected('AUTHENTICATED_USER','forceunlock') - def forceunlock(self,RESPONSE=None): + def forceunlock(self,RESPONSE=None,user=None): """unlock""" #safe who had the lock + logging.debug("extVersionFile: (forceunlock)"+str(user)) if self.lockedBy: - self.brokenLock=str(self.lockedBy) + if user is not None: + if str(self.lockedBy)==user: + self.brokenLock=str(self.lockedBy) + self.lockedBy='' + else: + self.brokenLock="" + else: + self.brokenLock=str(self.lockedBy) + self.lockedBy='' else: self.brokenLock="" - self.lockedBy='' + return self.brokenLock security.declareProtected('AUTHENTICATED_USER','unlock') @@ -1010,7 +1116,7 @@ class extVersionedFile(CatalogAware,Fold """unlock""" if str(self.lockedBy) in [str(self.REQUEST['AUTHENTICATED_USER'])]: self.lockedBy='' - RESPONSE.redirect(self.REQUEST['HTTP_REFERER']) + self.redirect(RESPONSE,self.REQUEST['HTTP_REFERER'],) else: return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER']) @@ -1020,7 +1126,7 @@ class extVersionedFile(CatalogAware,Fold return extVersionedFileObject(id,title,versionNumber=versionNumber,versionComment=versionComment,time=time,author=author) - def addContentObject(self,id,vC,author=None,file=None,title='',changeName='no',newName='',from_tmp=False, + def addContentObject(self,id,vC,author=None,file=None,title='',changeName='no',newName='',from_tmp=False,index=True, precondition='', content_type=''): """add""" @@ -1069,9 +1175,10 @@ class extVersionedFile(CatalogAware,Fold self.lastVersionId = id #logging.debug("addcontentobject: lastversion=%s"%self.getData()) - logging.debug("reindex1: %s in %s"%(repr(self),repr(self.default_catalog))) - self.reindex_object() #logging.debug("addcontentobject: fob_data=%s"%fob.getData()) + if index and self.default_catalog: + logging.debug("reindex1: %s in %s"%(repr(self),repr(self.default_catalog))) + self.reindex_object() return fob @@ -1114,17 +1221,38 @@ class extVersionedFile(CatalogAware,Fold return pt() else: - RESPONSE.redirect(self.REQUEST['URL2']) + RESPONSE.redirect(self.absolute_url()+'/history') else: return ob + + changeVersionedFileForm = PageTemplateFile('zpt/changeVersionedFile', globals()) + + def manage_changeVersionedFile(self,title,vC,author,comment,RESPONSE=None): + """Change VersionedFile metadata""" + self.title = title + self.author = author + cob = self.getContentObject() + if cob: + if vC: + cob.vComment=vC + + if comment=='': + cob.versionComment=None + else: + cob.versionComment=comment + + if RESPONSE: + RESPONSE.redirect('manage_main') + def download(self): - """download and lock""" - self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getContentObject().getId()) - self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") - self.content_type="application/octet-stream" - self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getContentObject().getId()) + """download""" + + txt=self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getContentObject().getId()+'/download' + + self.REQUEST.RESPONSE.redirect(txt) + security.declareProtected('AUTHENTICATED_USER','downloadLocked') def downloadLocked(self):