version 1.17, 2007/11/23 18:51:39
|
version 1.18, 2008/01/02 16:58:35
|
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) |
#if (getattr(self,'commentNonEmpty',0)==1) and vC.strip()=="": |
logging.debug("addFile id=%s vf=%s of %s"%(repr(id),repr(vf),repr(self))) |
# add file to this folder |
# 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) |
|
# add file to this folder (this should do the indexing) |
self._setObject(id,vf) |
self._setObject(id,vf) |
# add its content |
|
logging.info("ADD: %s"%repr(vf)) |
|
obj=vf.addContentObject(id,vC,author=author,file=file,content_type=content_type,from_tmp=isRealFile) |
|
|
|
|
try: |
self.REQUEST.SESSION['objID']=vf.getId() |
self.REQUEST.SESSION['objID']=vf.getId() |
self.REQUEST.SESSION['objID_parent']=None |
self.REQUEST.SESSION['objID_parent']=None |
|
except: |
|
pass |
|
|
if obj.getSize()==0: |
if obj.getSize()==0: |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) |
Line 872 class extVersionedFile(CatalogAware,Fold
|
Line 874 class extVersionedFile(CatalogAware,Fold
|
def getLastChangeDate(self): |
def getLastChangeDate(self): |
"""get last change date""" |
"""get last change date""" |
lv=self.getContentObject() |
lv=self.getContentObject() |
|
if lv: |
time=lv.getTime() |
time=lv.getTime() |
return time |
return time |
|
return None |
|
|
def getLastEditor(self): |
def getLastEditor(self): |
"""get last change date""" |
"""get last change date""" |
Line 925 class extVersionedFile(CatalogAware,Fold
|
Line 929 class extVersionedFile(CatalogAware,Fold
|
|
|
def getContentObject(self): |
def getContentObject(self): |
"""returns the last version object""" |
"""returns the last version object""" |
if not hasattr(self, 'lastVersionId'): |
if not getattr(self, 'lastVersionId', None): |
# find last version and save it |
# find last version and save it |
lv = self.findLastVersion() |
lv = self.findLastVersion() |
if lv is None: |
if lv is None: |
Line 933 class extVersionedFile(CatalogAware,Fold
|
Line 937 class extVersionedFile(CatalogAware,Fold
|
self.lastVersionNumber = lv.getVersionNumber() |
self.lastVersionNumber = lv.getVersionNumber() |
self.lastVersionId = lv.getId() |
self.lastVersionId = lv.getId() |
|
|
return getattr(self, self.lastVersionId) |
return getattr(self, self.lastVersionId, None) |
|
|
security.declarePublic('getData') |
security.declarePublic('getData') |
def getData(self): |
def getData(self): |
Line 1029 class extVersionedFile(CatalogAware,Fold
|
Line 1033 class extVersionedFile(CatalogAware,Fold
|
return extVersionedFileObject(id,title,versionNumber=versionNumber,versionComment=versionComment,time=time,author=author) |
return extVersionedFileObject(id,title,versionNumber=versionNumber,versionComment=versionComment,time=time,author=author) |
|
|
|
|
def addContentObject(self,id,vC,author=None,file=None,title='',changeName='no',newName='',from_tmp=False, |
def addContentObject(self,id,vC,author=None,file=None,title='',changeName='no',newName='',from_tmp=False,index=True, |
precondition='', content_type=''): |
precondition='', content_type=''): |
"""add""" |
"""add""" |
|
|
Line 1078 class extVersionedFile(CatalogAware,Fold
|
Line 1082 class extVersionedFile(CatalogAware,Fold
|
self.lastVersionId = id |
self.lastVersionId = id |
|
|
#logging.debug("addcontentobject: lastversion=%s"%self.getData()) |
#logging.debug("addcontentobject: lastversion=%s"%self.getData()) |
|
#logging.debug("addcontentobject: fob_data=%s"%fob.getData()) |
|
if index and self.default_catalog: |
logging.debug("reindex1: %s in %s"%(repr(self),repr(self.default_catalog))) |
logging.debug("reindex1: %s in %s"%(repr(self),repr(self.default_catalog))) |
self.reindex_object() |
self.reindex_object() |
#logging.debug("addcontentobject: fob_data=%s"%fob.getData()) |
|
|
|
return fob |
return fob |
|
|