--- versionedFile/extVersionedFile.py 2008/10/29 12:12:25 1.30 +++ versionedFile/extVersionedFile.py 2010/05/12 10:58:21 1.37 @@ -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 @@ -142,6 +143,20 @@ class extVersionedFileFolder(Folder,ECHO ) + 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) @@ -412,8 +427,9 @@ class extVersionedFileFolder(Folder,ECHO return cmp(x[1].title.lower(),y[1].title.lower()) def sortDate(x,y): - return cmp(y[1].getContentObject().getTime(),x[1].getContentObject().getTime()) - + + return cmp(y[1].getContentObject().getTime(),x[1].getContentObject().getTime()) + def sortComment(x,y): try: xc=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower() @@ -430,19 +446,26 @@ class extVersionedFileFolder(Folder,ECHO xc=x[1].getContentObject().getVComment().lower() except: xc='ZZZZZZZZZZZZZ'.lower() + if (yc=='') or (yc=='ZZZZZZZZZZZZZ'.lower()): try: yc=y[1].getContentObject().getVComment().lower() except: yc='ZZZZZZZZZZZZZ'.lower() + return cmp(xc,yc) def sortAuthor(x,y): + + return cmp(x[1].getContentObject().lastEditor().lower(),y[1].getContentObject().lastEditor().lower()) + - return cmp(x[1].getContentObject().lastEditor().lower(),y[1].getContentObject().lastEditor().lower()) - + def sortVersionComment(x,y): + + return cmp(x[1].getContentObject().getVersionComment().lower(),y[1].getContentObject().getVersionComment().lower()) + versionedFiles=self.objectItems(self.file_meta_type) logging.debug("versionedfiles: %s of type %s"%(repr(versionedFiles),repr(self.file_meta_type))) @@ -452,9 +475,12 @@ class extVersionedFileFolder(Folder,ECHO versionedFiles.sort(sortDate) elif sortField=='author': versionedFiles.sort(sortAuthor) + elif sortField=='versioncomment': + versionedFiles.sort(sortVersionComment) elif sortField=='comment': versionedFiles.sort(sortComment) + return versionedFiles @@ -516,9 +542,12 @@ class extVersionedFileFolder(Folder,ECHO vf = self._newVersionedFile(id,title=id) logging.error("addFile id=%s vf=%s of %s"%(repr(id),repr(vf),repr(self))) # add its content (and don't index) + self._setObject(id,vf) + vf=getattr(self,id) + 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) + #self._setObject(id,vf) try: self.REQUEST.SESSION['objID']=vf.getId() @@ -632,8 +661,10 @@ class extVersionedFileObject(ExtFile): 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) @@ -723,11 +754,9 @@ class extVersionedFileObject(ExtFile): security.declareProtected('AUTHENTICATED_USER','downloadLocked') def downloadLocked(self): """download and lock""" - - if repr(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User': return "please login first" - if not self.aq_parent.lockedBy=="": + if (not ((self.aq_parent.lockedBy=="") or (self.aq_parent.lockedBy==None))): return "cannot be locked because is already locked by %s"%self.lockedBy self.aq_parent.lockedBy=self.REQUEST['AUTHENTICATED_USER'] @@ -740,9 +769,7 @@ class extVersionedFileObject(ExtFile): return self.versionNumber security.declarePublic('getVersionComment') - def getVersionComment(self): - """get version""" - return self.versionComment + security.declarePublic('lastEditor') def lastEditor(self): @@ -811,7 +838,7 @@ class extVersionedFile(CatalogAware,Fold security=ClassSecurityInfo() - def __init__(self, id, title, lockedBy,author): + def __init__(self, id, title, lockedBy,author,defaultAction='history'): """init""" self.id=id self.title=title @@ -821,6 +848,7 @@ class extVersionedFile(CatalogAware,Fold self.author=author self.lastVersionNumber=0 self.lastVersionId=None + self.defaultAction = defaultAction security.declarePublic('getTitle') def getTitle(self): @@ -947,28 +975,28 @@ class extVersionedFile(CatalogAware,Fold security.declarePublic('getLastVersion') def getLastVersion(self): """Last Version (old)""" - tmp=0 - lv=None - - for v in self.objectValues(self.content_meta_type): - #logging.debug("getlastversion: check %s"%v.getId()) - if v.getVersionNumber() > tmp: - tmp=v.getVersionNumber() - lv=v - - #ogging.debug("getlastversion: got %s"%lv.getId()) - return lv - +# tmp=0 +# lv=None +# +# for v in self.objectValues(self.content_meta_type): +# #logging.debug("getlastversion: check %s"%v.getId()) +# if v.getVersionNumber() > tmp: +# tmp=v.getVersionNumber() +# lv=v +# +# #ogging.debug("getlastversion: got %s"%lv.getId()) +# return lv + return self.getContentObject(); + def getContentObject(self): """returns the last version object""" - if not getattr(self, 'lastVersionId', None): + if (not getattr(self, 'lastVersionId', None)) or (not getattr(self, 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, None) security.declarePublic('getData') @@ -1011,27 +1039,31 @@ class extVersionedFile(CatalogAware,Fold security.declarePublic('index_html') - def index_html(self): + def index_html(self,REQUEST=None, RESPONSE=None): """main view""" #lastVersion=self.getContentObject() #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()) - return self.history() + act = getattr(self, 'defaultAction', 'history') + if act == 'download': + return self.getContentObject().download() + elif act == 'view': + #return self.getContentObject().download() + return self.getContentObject().index_html(REQUEST=REQUEST, RESPONSE=RESPONSE) + else: + 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 @@ -1076,14 +1108,23 @@ class extVersionedFile(CatalogAware,Fold 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') @@ -1096,6 +1137,7 @@ class extVersionedFile(CatalogAware,Fold return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER']) + def _newContentObject(self, id, title='', versionNumber=0, versionComment=None, time=None, author=None): """factory for content objects. to be overridden in derived classes.""" return extVersionedFileObject(id,title,versionNumber=versionNumber,versionComment=versionComment,time=time,author=author) @@ -1164,7 +1206,7 @@ class extVersionedFile(CatalogAware,Fold if str(self.REQUEST['AUTHENTICATED_USER']) in ["Anonymous User"]: return "please login first" - if (self.lockedBy==self.REQUEST['AUTHENTICATED_USER']) or (self.lockedBy==''): + if (self.lockedBy==self.REQUEST['AUTHENTICATED_USER']) or (self.lockedBy=='') or (self.lockedBy==None): ext=self.ZopeFind(self.aq_parent,obj_ids=["addNewVersion.dtml"]) if ext: return ext[0][1]('',globals(),version=self.getVersion(),lastComment=self.getContentObject().getVersionComment(),AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER) @@ -1203,10 +1245,11 @@ class extVersionedFile(CatalogAware,Fold changeVersionedFileForm = PageTemplateFile('zpt/changeVersionedFile', globals()) - def manage_changeVersionedFile(self,title,vC,author,comment,RESPONSE=None): + def manage_changeVersionedFile(self,title,vC,author,comment,defaultAction='history',RESPONSE=None): """Change VersionedFile metadata""" self.title = title self.author = author + self.defaultAction = defaultAction cob = self.getContentObject() if cob: if vC: @@ -1235,7 +1278,7 @@ class extVersionedFile(CatalogAware,Fold if repr(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User': return "please login first" - if not self.lockedBy=="": + if not ((self.lockedBy=="") or (self.lockedBy==None)): return "cannot be locked because is already locked by %s"%self.lockedBy self.lockedBy=self.REQUEST['AUTHENTICATED_USER'] self.getContentObject().content_type="application/octet-stream" @@ -1268,9 +1311,9 @@ def manage_addextVersionedFileForm(self) pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addextVersionedFile.zpt')).__of__(self) return pt() -def manage_addextVersionedFile(self,id,title,lockedBy, author=None, RESPONSE=None): +def manage_addextVersionedFile(self,id,title,lockedBy, author=None, defaultAction='history', RESPONSE=None): """add the OSAS_root""" - newObj=extVersionedFile(id,title,lockedBy,author) + newObj=extVersionedFile(id,title,lockedBy,author,defaultAction=defaultAction) self._setObject(id,newObj) if RESPONSE is not None: