--- versionedFile/versionedFile.py 2004/03/22 15:46:07 1.1 +++ versionedFile/versionedFile.py 2004/07/08 15:15:06 1.6 @@ -1,11 +1,14 @@ from OFS.Folder import Folder from OFS.Image import File from OFS.Image import cookId -from Globals import DTMLFile, InitializeClass +from Globals import DTMLFile, InitializeClass,package_home from Products.PageTemplates.PageTemplateFile import PageTemplateFile from AccessControl import getSecurityManager from Products.PageTemplates.PageTemplate import PageTemplate +from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from AccessControl import ClassSecurityInfo +import os.path + def sortv(x,y): return cmp(x[0],y[0]) @@ -18,15 +21,74 @@ class versionedFileFolder(Folder): security= ClassSecurityInfo() security.declareProtected('AUTHENTICATED_USER','addFileForm') + manage_options = Folder.manage_options+( + {'label':'Generate Index.html','action':'generateIndexHTML'}, + {'label':'Generate history_template.html','action':'generateHistoryHTML'}, + ) + + def generateIndexHTML(self,RESPONSE=None): + """lege standard index.html an""" + + + + + if not hasattr(self,'index.html'): + 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 generateHistoryHTML(self,RESPONSE=None): + """lege standard index.html an""" + + + + + if not hasattr(self,'history_template.html'): + zt=ZopePageTemplate('history_template.html') + self._setObject('history_template.html',zt) + default_content_fn = os.path.join(package_home(globals()), + 'zpt/versionHistory.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 getVersionedFiles(self): """get all versioned files""" - versionedFiles=self.ZopeFind(self,obj_metatypes="versionedFiles") - print versionedFiles + + versionedFiles=self.ZopeFind(self,obj_metatypes=['versionedFile']) + return versionedFiles - + + def header_html(self): + """zusätzlicher header""" + ext=self.ZopeFind(self,obj_ids=["header.html"]) + if ext: + return ext[0][1]() + else: + return "" + def index_html(self): """main""" + ext=self.ZopeFind(self,obj_ids=["index.html"]) + if ext: + return ext[0][1]() + pt=PageTemplateFile('Products/versionedFile/zpt/versionFileFolderMain').__of__(self) return pt() @@ -37,7 +99,7 @@ class versionedFileFolder(Folder): return out() - def addFile(self,vC,file,content_type='',RESPONSE=None): + def addFile(self,vC,file,author,content_type='',RESPONSE=None): """ add a new file""" id=file.filename @@ -45,8 +107,8 @@ class versionedFileFolder(Folder): manage_addVersionedFile(self,id,'','') ob=self._getOb(id) ob.title=id - print "MYVC",vC - ob.manage_addVersionedFileObject(self,id,vC,file,content_type=content_type) + file2=file + ob.manage_addVersionedFileObject(id,vC,author,file2,content_type=content_type) RESPONSE.redirect(self.REQUEST['URL1']) @@ -105,17 +167,22 @@ class versionedFileObject(File): def lastEditor(self): """last Editor""" - jar=self._p_jar - oid=self._p_oid - if jar is None or oid is None: return None - return jar.db().history(oid)[0]['user_name'] + if hasattr(self,'author'): + return self.author + else: + jar=self._p_jar + oid=self._p_oid + + if jar is None or oid is None: return None + + return jar.db().history(oid)[0]['user_name'] manage_addVersionedFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject', version='1') -def manage_addVersionedFileObject(self,id,vC='',file='',title='',precondition='', content_type='', +def manage_addVersionedFileObject(self,id,vC='',author='', file='',title='',precondition='', content_type='', REQUEST=None): """Add a new File object. @@ -125,7 +192,7 @@ def manage_addVersionedFileObject(self,i title=str(title) content_type=str(content_type) precondition=str(precondition) - + id, title = cookId(id, title, file) self=self.this() @@ -133,6 +200,7 @@ def manage_addVersionedFileObject(self,i # First, we create the file without data: self._setObject(id, versionedFileObject(id,title,'',content_type, precondition)) self._getOb(id).versionComment=str(vC) + setattr(self._getOb(id),'author',author) # Now we "upload" the data. By doing this in two steps, we # can use a database trick to make the upload more efficient. @@ -150,11 +218,12 @@ def manage_addVersionedFileObject(self,i class versionedFile(Folder): """Versioniertes File""" - def __init__(self, id, title, lockedBy): + def __init__(self, id, title, lockedBy,author): """init""" self.id=id self.title=title self.lockedBy=lockedBy + self.author=author meta_type="versionedFile" @@ -162,11 +231,11 @@ class versionedFile(Folder): """Last Version""" tmp=0 lastVersion=None - print "FI",self.ZopeFind(self) + for version in self.ZopeFind(self): - print version + if hasattr(version[1],'versionNumber'): - print "HI",version[1].versionNumber + if int(version[1].versionNumber) > tmp: tmp=int(version[1].versionNumber,) lastVersion=version[1] @@ -181,9 +250,9 @@ class versionedFile(Folder): def getVersion(self): tmp=0 for version in self.ZopeFind(self): - print version + if hasattr(version[1],'versionNumber'): - print "HI",version[1].versionNumber + if int(version[1].versionNumber) > tmp: tmp=int(version[1].versionNumber,) return tmp+1 @@ -192,7 +261,12 @@ class versionedFile(Folder): security.declareProtected('AUTHENTICATED_USER','unlock') def history(self): - """history""" + """history""" + + ext=self.ZopeFind(self.aq_parent,obj_ids=["history_template.html"]) + if ext: + return getattr(self,ext[0][1].getId())() + pt=PageTemplateFile('Products/versionedFile/zpt/versionHistory').__of__(self) return pt() @@ -208,7 +282,7 @@ class versionedFile(Folder): def unlock(self,RESPONSE): """unlock""" - if str(self.lockedBy) in str(self.REQUEST['AUTHENTICATED_USER']): + if str(self.lockedBy) in [str(self.REQUEST['AUTHENTICATED_USER'])]: self.lockedBy='' RESPONSE.redirect(self.REQUEST['URL2']) else: @@ -219,8 +293,8 @@ class versionedFile(Folder): def addVersionedFileObjectForm(self): """add a new version""" - print self.REQUEST['AUTHENTICATED_USER'] - if str(self.REQUEST['AUTHENTICATED_USER']) in "Anonymous User": + + 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) @@ -228,12 +302,18 @@ class versionedFile(Folder): else: return "Sorry file is locked by somebody else" - def manage_addVersionedFileObject(self,id,vC,file='',title='',precondition='', content_type='',RESPONSE=None): + def manage_addVersionedFileObject(self,id,vC,author,file='',title='',precondition='', content_type='',changeName='no',RESPONSE=None): """add""" vC=self.REQUEST['vC'] + author=self.REQUEST['author'] + + if changeName=="yes": + self.title=file.filename[0:] + + id="V%i"%self.getVersion()+"_"+self.title - manage_addVersionedFileObject(self,id,vC,file,"V%i"%self.getVersion()+"_"+self.title,precondition, content_type) + 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())) if RESPONSE: @@ -256,10 +336,11 @@ def manage_addVersionedFileForm(self): pt=PageTemplateFile('Products/versionedFile/zpt/addVersionedFile.zpt').__of__(self) return pt() -def manage_addVersionedFile(self,id,title,lockedBy, RESPONSE=None): +def manage_addVersionedFile(self,id,title,lockedBy, author=None, RESPONSE=None): """add the OSAS_root""" - newObj=versionedFile(id,title,lockedBy) + newObj=versionedFile(id,title,lockedBy,author) self._setObject(id,newObj) + if RESPONSE is not None: RESPONSE.redirect('manage_main')