version 1.22, 2004/12/01 09:16:29
|
version 1.24, 2005/01/12 14:04:52
|
Line 143 class versionedFileFolder(Folder,ECHO_ba
|
Line 143 class versionedFileFolder(Folder,ECHO_ba
|
def addFile(self,vC,file,author,newName='',content_type='',RESPONSE=None): |
def addFile(self,vC,file,author,newName='',content_type='',RESPONSE=None): |
""" add a new file""" |
""" add a new file""" |
if newName=='': |
if newName=='': |
id=file.filename |
filename=file.filename |
|
id=filename[max(filename.rfind('/'), |
|
filename.rfind('\\'), |
|
filename.rfind(':'), |
|
)+1:] |
|
v |
else: |
else: |
id=newName |
id=newName |
|
|
Line 155 class versionedFileFolder(Folder,ECHO_ba
|
Line 160 class versionedFileFolder(Folder,ECHO_ba
|
ob=self._getOb(id) |
ob=self._getOb(id) |
ob.title=id |
ob.title=id |
file2=file |
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) |
|
|
|
if obj.getSize()==0: |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) |
|
return pt() |
|
|
RESPONSE.redirect(self.REQUEST['URL1']) |
RESPONSE.redirect(self.REQUEST['URL1']) |
|
|
Line 394 class versionedFile(Folder):
|
Line 404 class versionedFile(Folder):
|
author=self.REQUEST['author'] |
author=self.REQUEST['author'] |
|
|
if changeName=="yes": |
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=='': |
if not newName=='': |
self.title=newName[0:] |
self.title=newName[0:] |
|
|
id="V%i"%self.getVersion()+"_"+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) |
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())) |
objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) |
|
|
|
|
if RESPONSE: |
if RESPONSE: |
|
if self.ZopeFind(self,obj_ids=[id])[0][1].getSize()==0: |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) |
|
return pt() |
|
|
|
else: |
RESPONSE.redirect(self.REQUEST['URL2']) |
RESPONSE.redirect(self.REQUEST['URL2']) |
|
|
|
else: |
|
return self.ZopeFind(self,obj_ids=[id])[0][1] |
|
|
security.declareProtected('AUTHENTICATED_USER','downloadLocked') |
security.declareProtected('AUTHENTICATED_USER','downloadLocked') |
|
|
def download(self): |
def download(self): |