version 1.24, 2008/06/27 18:20:40
|
version 1.26, 2008/08/19 14:43:25
|
Line 514 class extVersionedFileFolder(Folder,ECHO
|
Line 514 class extVersionedFileFolder(Folder,ECHO
|
|
|
# get new extVersionedFile |
# get new extVersionedFile |
vf = self._newVersionedFile(id,title=id) |
vf = self._newVersionedFile(id,title=id) |
logging.debug("addFile id=%s vf=%s of %s"%(repr(id),repr(vf),repr(self))) |
logging.error("addFile id=%s vf=%s of %s"%(repr(id),repr(vf),repr(self))) |
# add its content (and don't index) |
# 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) |
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) |
# add file to this folder (this should do the indexing) |
Line 692 class extVersionedFileObject(ExtFile):
|
Line 692 class extVersionedFileObject(ExtFile):
|
#self.REQUEST.RESPONSE.setHeader("Content-Length","str(len(txt)+1000)") |
#self.REQUEST.RESPONSE.setHeader("Content-Length","str(len(txt)+1000)") |
|
|
self.content_type="application/octet-stream" |
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() |
#txt=urllib.urlopen(self.absolute_url()).read() |
#self.REQUEST.RESPONSE.write(txt) |
#self.REQUEST.RESPONSE.write(txt) |
|
|
Line 797 class extVersionedFile(CatalogAware,Fold
|
Line 798 class extVersionedFile(CatalogAware,Fold
|
self.id=id |
self.id=id |
self.title=title |
self.title=title |
self.lockedBy=lockedBy |
self.lockedBy=lockedBy |
|
if self.lockedBy is None: |
|
self.lockedBy = '' |
self.author=author |
self.author=author |
self.lastVersionNumber=0 |
self.lastVersionNumber=0 |
self.lastVersionId=None |
self.lastVersionId=None |
Line 896 class extVersionedFile(CatalogAware,Fold
|
Line 899 class extVersionedFile(CatalogAware,Fold
|
|
|
def getLockedBy(self): |
def getLockedBy(self): |
"""get locked by""" |
"""get locked by""" |
|
if self.lockedBy is None: |
|
self.lockedBy = '' |
return str(self.lockedBy) |
return str(self.lockedBy) |
|
|
def getLastVersionNumber(self): |
def getLastVersionNumber(self): |
Line 1186 class extVersionedFile(CatalogAware,Fold
|
Line 1191 class extVersionedFile(CatalogAware,Fold
|
|
|
def download(self): |
def download(self): |
"""download""" |
"""download""" |
self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getContentObject().getId()) |
|
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") |
txt=self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getContentObject().getId()+'/download' |
self.content_type="application/octet-stream" |
|
self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getContentObject().getId()) |
self.REQUEST.RESPONSE.redirect(txt) |
|
|
|
|
security.declareProtected('AUTHENTICATED_USER','downloadLocked') |
security.declareProtected('AUTHENTICATED_USER','downloadLocked') |