--- versionedFile/versionedFile.py 2005/10/18 15:45:02 1.46 +++ versionedFile/versionedFile.py 2005/11/21 20:03:31 1.52 @@ -1,4 +1,3 @@ - from OFS.Folder import Folder from OFS.Image import File from OFS.Image import cookId @@ -8,11 +7,16 @@ from AccessControl import getSecurityMan from Products.PageTemplates.PageTemplate import PageTemplate from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from AccessControl import ClassSecurityInfo + + +from Products.ZCatalog.CatalogPathAwareness import CatalogAware + try: from Products.ImageArchive.ImageArchive import manage_AddImageZogiLib except: print "no images" + from threading import Thread import shutil import tempfile @@ -116,7 +120,7 @@ class versionedFileFolder(Folder,ECHO_ba security= ClassSecurityInfo() security.declareProtected('AUTHENTICATED_USER','addFileForm') - + filesMetaType=['versionedFile'] if ECHO_basis: optTMP= Folder.manage_options+ECHO_basis.manage_options else: @@ -128,8 +132,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] + + print version[0],id + + 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) @@ -332,8 +383,9 @@ class versionedFileFolder(Folder,ECHO_ba return cmp(x[1].getLastVersion().lastEditor().lower(),y[1].getLastVersion().lastEditor().lower()) - versionedFiles=self.ZopeFind(self,obj_metatypes=['versionedFile']) - + versionedFiles=self.ZopeFind(self,obj_metatypes=self.filesMetaType) + + if sortField=='title': versionedFiles.sort(sortName) elif sortField=='date': @@ -457,13 +509,15 @@ def manage_addVersionedFileFolder(self, class versionedFileObject(File): """File Object im Folder""" - + security= ClassSecurityInfo() meta_type = "versionedFileObject" manage_editForm =DTMLFile('dtml/fileEdit',globals(), Kind='File',kind='file') manage_editForm._setName('manage_editForm') - security= ClassSecurityInfo() + + + security.declarePublic('getVComment') def getVComment(self): """get the comment of this file""" @@ -499,7 +553,14 @@ class versionedFileObject(File): return REQUEST.RESPONSE.redirect(self.REQUEST.SESSION['refer']) return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()+"/history") - security.declarePublic('getTime') + + security.declarePublic('getVersionComment') + def getVersionComment(self): + """getversioncomment""" + return self.versionComment + + security.declarePublic('getTime') + def getTime(self): """getTime""" #return self.bobobase_modification_time().ISO() @@ -515,19 +576,25 @@ class versionedFileObject(File): - def download(self): + def download(self,REQUEST=None,RESPONSE=None): """download and lock""" self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getId()) - self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") - + self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + #try: + # txt=self.index_html() + #except: + # txt=self.index_html(REQUEST,RESPONSE) + # + #self.REQUEST.RESPONSE.setHeader("Content-Length","str(len(txt)+1000)") + self.content_type="application/octet-stream" self.REQUEST.RESPONSE.redirect(self.absolute_url()) - #self.REQUEST.RESPONSE.write(self.index_html()) #txt=urllib.urlopen(self.absolute_url()).read() - #self.REQUEST.RESPONSE.write(txt) - #self.REQUEST.RESPONSE.write("bl") - self.REQUEST.close() + #self.REQUEST.RESPONSE.write(txt) + + + #self.REQUEST.close() def downloadLocked(self): """download and lock""" @@ -546,7 +613,9 @@ class versionedFileObject(File): """set version""" self.versionNumber=versionNumber + security.declarePublic('getVersionNumber') + def getVersionNumber(self): """get version""" return self.versionNumber @@ -557,7 +626,9 @@ class versionedFileObject(File): return self.versionComment + security.declarePublic('lastEditor') + def lastEditor(self): """last Editor""" if hasattr(self,'author'): @@ -613,9 +684,15 @@ def manage_addVersionedFileObject(self,i -class versionedFile(Folder): +class versionedFile(CatalogAware,Folder): """Versioniertes File""" + default_catalog='fileCatalog' + + def PrincipiaSearchSource(self): + """Return cataloguable key for ourselves.""" + return str(self) + def __init__(self, id, title, lockedBy,author): """init""" self.id=id @@ -707,6 +784,7 @@ class versionedFile(Folder): tmp=0 lastVersion=None + for version in self.ZopeFind(self): if hasattr(version[1],'versionNumber'): @@ -714,6 +792,9 @@ class versionedFile(Folder): if int(version[1].versionNumber) > tmp: tmp=int(version[1].versionNumber,) lastVersion=version[1] + if lastVersion==None: + lastVersion=version[1] + lastVersion.versionNumber=1 return lastVersion def index_html(self): @@ -803,11 +884,24 @@ class versionedFile(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() @@ -830,15 +924,22 @@ class versionedFile(Folder): """download and lock""" self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getLastVersion().getId()) - self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + #try: + # txt=self.getLastVersion.index_html() + #except: + # txt=self.getLastVersion.index_html(REQUEST,RESPONSE) + + #self.REQUEST.RESPONSE.setHeader("Content-Length","str(len(txt)+1000)") + self.content_type="application/octet-stream" #self.REQUEST.RESPONSE.write("bl") - self.REQUEST.RESPONSE.write(self.getLastVersion().index_html()) - self.REQUEST.close() + #self.REQUEST.RESPONSE.write(txt) + #self.REQUEST.close() #self.getLastVersion().content_type="application/octet-stream" - #self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getLastVersion().getId()) + self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getLastVersion().getId()) def downloadLocked(self): """download and lock"""