version 1.79, 2007/08/31 14:22:52
|
version 1.80.2.1, 2007/10/06 13:44:46
|
Line 1450 class CDLIFileObject(CatalogAware,extVer
|
Line 1450 class CDLIFileObject(CatalogAware,extVer
|
|
|
security=ClassSecurityInfo() |
security=ClassSecurityInfo() |
|
|
|
|
security.declarePublic('makeThisVersionCurrent') |
|
|
|
security.declareProtected('manage','index_html') |
security.declareProtected('manage','index_html') |
|
|
def PrincipiaSearchSource(self): |
def PrincipiaSearchSource(self): |
"""Return cataloguable key for ourselves.""" |
"""Return cataloguable key for ourselves.""" |
return str(self) |
return str(self) |
Line 1463 class CDLIFileObject(CatalogAware,extVer
|
Line 1461 class CDLIFileObject(CatalogAware,extVer
|
|
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','makeThisVersionCurrent.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','makeThisVersionCurrent.zpt')).__of__(self) |
return pt() |
return pt() |
|
|
|
security.declarePublic('makeThisVersionCurrent') |
def makeThisVersionCurrent(self,comment,author,RESPONSE=None): |
def makeThisVersionCurrent(self,comment,author,RESPONSE=None): |
"""copy this version to current""" |
"""copy this version to current""" |
parent=self.aq_parent |
parent=self.aq_parent |
|
|
|
|
newversion=parent.manage_addCDLIFileObject('',comment,author) |
newversion=parent.manage_addCDLIFileObject('',comment,author) |
newversion.manage_upload(self.getData()) |
newversion.manage_upload(self.getData()) |
|
|
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect(self.aq_parent.absolute_url()+'/history') |
RESPONSE.redirect(self.aq_parent.absolute_url()+'/history') |
|
|
|
|
return True |
return True |
|
|
security.declarePublic('view') |
|
|
|
def getFormattedData(self): |
def getFormattedData(self): |
"""fromat text""" |
"""fromat text""" |
data=self.getData() |
data=self.getData() |
# return re.sub("\s\#lem"," #lem",data) #remove return vor #lem |
# return re.sub("\s\#lem"," #lem",data) #remove return vor #lem |
return re.sub("#lem"," #lem",data) #remove return vor #lem |
return re.sub("#lem"," #lem",data) #remove return vor #lem |
|
|
|
security.declarePublic('view') |
def view(self): |
def view(self): |
"""view file""" |
"""view file""" |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self) |
Line 1520 class CDLIFileObject(CatalogAware,extVer
|
Line 1516 class CDLIFileObject(CatalogAware,extVer
|
|
|
manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1') |
manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1') |
|
|
def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',precondition='', content_type='', |
def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',versionNumber=0, |
|
precondition='', content_type='', |
from_tmp=False,REQUEST=None): |
from_tmp=False,REQUEST=None): |
"""Add a new File object. |
"""Add a new File object. |
|
|
Creates a new File object 'id' with the contents of 'file'""" |
Creates a new File object 'id' with the contents of 'file'""" |
|
|
id=str(id) |
id=str(id) |
Line 1536 def manage_addCDLIFileObject(self,id,vC=
|
Line 1532 def manage_addCDLIFileObject(self,id,vC=
|
self=self.this() |
self=self.this() |
|
|
# First, we create the file without data: |
# First, we create the file without data: |
self._setObject(id, CDLIFileObject(id,title,'',content_type, precondition)) |
self._setObject(id, CDLIFileObject(id,title,versionNumber=versionNumber,versionComment=vC,time=time.localtime(),author=author)) |
self._getOb(id).versionComment=str(vC) |
fob = self._getOb(id) |
self._getOb(id).time=time.localtime() |
|
|
|
setattr(self._getOb(id),'author',author) |
|
|
|
|
|
# Now we "upload" the data. By doing this in two steps, we |
# Now we "upload" the data. By doing this in two steps, we |
# can use a database trick to make the upload more efficient. |
# can use a database trick to make the upload more efficient. |
|
|
if file and not from_tmp: |
if file and not from_tmp: |
self._getOb(id).manage_upload(file) |
fob.manage_upload(file) |
elif file and from_tmp: |
elif file and from_tmp: |
self._getOb(id).manage_upload_from_tmp(file) |
fob.manage_file_upload(file) # manage_upload_from_tmp doesn't exist in ExtFile2 |
|
# fob.manage_upload_from_tmp(file) # manage_upload_from_tmp doesn't exist in ExtFile2 |
if content_type: |
if content_type: |
self._getOb(id).content_type=content_type |
fob.content_type=content_type |
|
|
|
logging.debug("manage_add: lastversion=%s"%self.getData()) |
|
logging.debug("reindex1: %s in %s"%(repr(self),repr(self.default_catalog))) |
self.reindex_object() |
self.reindex_object() |
self._getOb(id).reindex_object() |
logging.debug("manage_add: fob_data=%s"%fob.getData()) |
|
logging.debug("reindex2: %s in %s"%(repr(fob), repr(fob.default_catalog))) |
|
fob.index_object() |
|
|
if REQUEST is not None: |
if REQUEST is not None: |
REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main') |
REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main') |
|
|
|
|
class CDLIFile(extVersionedFile,CatalogAware): |
class CDLIFile(extVersionedFile,CatalogAware): |
"""CDLI file""" |
"""CDLI file""" |
|
|
security=ClassSecurityInfo() |
security=ClassSecurityInfo() |
meta_type="CDLI file" |
meta_type="CDLI file" |
|
content_meta_type = ["CDLI File Object"] |
|
|
default_catalog='CDLICatalog' |
default_catalog='CDLICatalog' |
security.declareProtected('manage','index_html') |
security.declareProtected('manage','index_html') |
#security.declarePublic('history') |
|
def getLastVersionData(self): |
def getLastVersionData(self): |
"""get last version data""" |
"""get last version data""" |
return self.getLastVersion().getData() |
return self.getData() |
|
|
def getLastVersionFormattedData(self): |
def getLastVersionFormattedData(self): |
"""get last version data""" |
"""get last version data""" |
return self.getLastVersion().getFormattedData() |
return self.getContentObject().getFormattedData() |
|
|
#security.declarePublic('history') |
#security.declarePublic('history') |
|
|
|
|
def history(self): |
def history(self): |
"""history""" |
"""history""" |
|
|
Line 1622 class CDLIFile(extVersionedFile,CatalogA
|
Line 1620 class CDLIFile(extVersionedFile,CatalogA
|
#return [x.getObject() for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()})] |
#return [x.getObject() for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()})] |
|
|
|
|
|
def _newContentObject(self, id, title='', versionNumber=0, versionComment=None, time=None, author=None): |
|
"""factory for content objects. to be overridden in derived classes.""" |
|
return CDLIFileObject(id,title,versionNumber=versionNumber,versionComment=versionComment,time=time,author=author) |
|
|
|
|
def addCDLIFileObjectForm(self): |
def addCDLIFileObjectForm(self): |
"""add a new version""" |
"""add a new version""" |
|
|
Line 1647 class CDLIFile(extVersionedFile,CatalogA
|
Line 1650 class CDLIFile(extVersionedFile,CatalogA
|
except: |
except: |
pass |
pass |
|
|
|
ob = self.addContentObject(id, vC, author, file, title, changeName=changeName, newName=newName, from_tmp=from_tmp, |
|
precondition=precondition, content_type=content_type) |
|
|
if changeName=="yes": |
|
filename=file.filename |
|
self.title=filename[max(filename.rfind('/'), |
|
filename.rfind('\\'), |
|
filename.rfind(':'), |
|
)+1:] |
|
|
|
|
|
if not newName=='': |
|
self.title=newName[0:] |
|
|
|
|
|
|
|
|
|
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_addCDLIFileObject(self,id,vC,author,file,id,precondition, content_type,from_tmp=from_tmp) |
|
#objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) |
|
objs=getattr(self,id).setVersionNumber(int(self.getVersion())) |
|
try: |
try: |
#FIXME: wozu ist das gut? |
#FIXME: wozu ist das gut? |
self.REQUEST.SESSION['objID_parent']=self.getId() |
self.REQUEST.SESSION['objID_parent']=self.getId() |
Line 1684 class CDLIFile(extVersionedFile,CatalogA
|
Line 1660 class CDLIFile(extVersionedFile,CatalogA
|
pass |
pass |
|
|
if RESPONSE: |
if RESPONSE: |
|
if ob.getSize()==0: |
obj=self.ZopeFind(self,obj_ids=[id])[0][1] |
self.REQUEST.SESSION['objID']=ob.getId() |
if obj.getSize()==0: |
|
self.REQUEST.SESSION['objID']=obj.getId() |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) |
return pt() |
return pt() |
|
|
else: |
else: |
if come_from and (come_from!=""): |
if come_from and (come_from!=""): |
RESPONSE.redirect(come_from+"?change="+self.getId()) |
RESPONSE.redirect(come_from+"?change="+self.getId()) |
else: |
else: |
RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title) |
RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title) |
|
|
else: |
else: |
return self.ZopeFind(self,obj_ids=[id])[0][1] |
return ob |
|
|
|
|
def manage_addCDLIFileForm(self): |
def manage_addCDLIFileForm(self): |
Line 1713 def manage_addCDLIFile(self,id,title,loc
|
Line 1685 def manage_addCDLIFile(self,id,title,loc
|
tryToggle=True |
tryToggle=True |
tryCount=0 |
tryCount=0 |
|
|
|
|
|
|
self._setObject(id,newObj) |
self._setObject(id,newObj) |
getattr(self,id).reindex_object() |
getattr(self,id).reindex_object() |
|
|
Line 1804 class CDLIFileFolder(extVersionedFileFol
|
Line 1774 class CDLIFileFolder(extVersionedFileFol
|
|
|
security=ClassSecurityInfo() |
security=ClassSecurityInfo() |
meta_type="CDLI Folder" |
meta_type="CDLI Folder" |
filesMetaType=['CDLI file'] |
file_meta_type=['CDLI file'] |
folderMetaType=['CDLI Folder'] |
folder_meta_type=['CDLI Folder'] |
|
|
default_catalog='CDLICatalog' |
default_catalog='CDLICatalog' |
defaultFileCatalog=default_catalog #wenn dieses definiert ist, wird beim hinzufgen einer neuen version eines files dieser catalog neuiniziert |
defaultFileCatalog=default_catalog #wenn dieses definiert ist, wird beim hinzufgen einer neuen version eines files dieser catalog neuiniziert |
#downloadCounter=0 # counts how many download for all files currently run, be mehr als 5 wird verweigert. |
#downloadCounter=0 # counts how many download for all files currently run, be mehr als 5 wird verweigert. |
tmpStore2={} |
tmpStore2={} |
|
|
def setTemp(self,name,value): |
def setTemp(self,name,value): |
"""set tmp""" |
"""set tmp""" |
|
|
Line 1841 class CDLIFileFolder(extVersionedFileFol
|
Line 1813 class CDLIFileFolder(extVersionedFileFol
|
founds=self.CDLICatalog.search({'title':searchStr}) |
founds=self.CDLICatalog.search({'title':searchStr}) |
|
|
for found in founds: |
for found in founds: |
lastVersion=found.getObject().getLastVersion() |
lastVersion=found.getObject().getContentObject() |
ret.append((found.getId,lastVersion)) |
ret.append((found.getId,lastVersion)) |
|
|
return ret |
return ret |
Line 1852 class CDLIFileFolder(extVersionedFileFol
|
Line 1824 class CDLIFileFolder(extVersionedFileFol
|
if not founds: |
if not founds: |
return "" |
return "" |
else: |
else: |
obj=founds[0].getObject().getLastVersion() |
obj=founds[0].getObject().getContentObject() |
|
|
return obj.getData()[0:] |
return obj.getData()[0:] |
|
|
Line 1980 class CDLIFileFolder(extVersionedFileFol
|
Line 1952 class CDLIFileFolder(extVersionedFileFol
|
|
|
#os.write(tf,obj.getLastVersion().data) |
#os.write(tf,obj.getLastVersion().data) |
if RESPONSE: |
if RESPONSE: |
RESPONSE.write(obj.getLastVersion().getData()[0:]) |
RESPONSE.write(obj.getData()[0:]) |
RESPONSE.write("\n") |
RESPONSE.write("\n") |
self.temp_folder.downloadCounter-=1 |
self.temp_folder.downloadCounter-=1 |
self._p_changed=1 |
self._p_changed=1 |
Line 2000 class CDLIFileFolder(extVersionedFileFol
|
Line 1972 class CDLIFileFolder(extVersionedFileFol
|
def hasParent(self): |
def hasParent(self): |
"""returns true falls subfolder""" |
"""returns true falls subfolder""" |
|
|
if self.aq_parent.meta_type in self.folderMetaType: |
if self.aq_parent.meta_type in self.folder_meta_type: |
return True |
return True |
else: |
else: |
return False |
return False |
Line 2008 class CDLIFileFolder(extVersionedFileFol
|
Line 1980 class CDLIFileFolder(extVersionedFileFol
|
def getFolders(self): |
def getFolders(self): |
"""get all subfolders""" |
"""get all subfolders""" |
ret=[] |
ret=[] |
folders=self.ZopeFind(self,obj_metatypes=self.folderMetaType) |
folders=self.ZopeFind(self,obj_metatypes=self.folder_meta_type) |
for folder in folders: |
for folder in folders: |
ret.append((folder[1], |
ret.append((folder[1], |
len(self.ZopeFind(folder[1],obj_metatypes=self.folderMetaType)), |
len(self.ZopeFind(folder[1],obj_metatypes=self.folder_meta_type)), |
len(self.ZopeFind(folder[1],obj_metatypes=self.filesMetaType)) |
len(self.ZopeFind(folder[1],obj_metatypes=self.file_meta_type)) |
)) |
)) |
return ret |
return ret |
|
|
Line 2076 class CDLIRoot(Folder):
|
Line 2048 class CDLIRoot(Folder):
|
manage_addCDLIFileFolder(self, '.trash',title="Trash") |
manage_addCDLIFileFolder(self, '.trash',title="Trash") |
trash=self._getOb('.trash') |
trash=self._getOb('.trash') |
else: |
else: |
logging.info(found) |
|
trash=found[0][1] |
trash=found[0][1] |
|
|
|
|
for id in ids: |
for id in ids: |
founds=self.CDLICatalog.search({'title':id.split(".")[0]}) |
founds=self.CDLICatalog.search({'title':id.split(".")[0]}) |
if founds: |
if founds: |
Line 2233 class CDLIRoot(Folder):
|
Line 2203 class CDLIRoot(Folder):
|
|
|
if wholePage: |
if wholePage: |
logging.info("whole") |
logging.info("whole") |
return f[0].getObject().getLastVersion().view() |
return f[0].getObject().getContentObject().view() |
else: |
else: |
return f[0].getObject().getLastVersionFormattedData() |
return f[0].getObject().getLastVersionFormattedData() |
|
|