version 1.9, 2006/03/15 14:56:48
|
version 1.16, 2006/05/05 08:13:36
|
Line 9 import urlparse
|
Line 9 import urlparse
|
from OFS.OrderedFolder import OrderedFolder |
from OFS.OrderedFolder import OrderedFolder |
from OFS.SimpleItem import SimpleItem |
from OFS.SimpleItem import SimpleItem |
import time |
import time |
|
from OFS.Folder import manage_addFolder |
|
import re |
|
|
class Basket_old(Folder): |
class Basket_old(Folder): |
"""shopping basket - alte fassung """ |
"""shopping basket - alte fassung """ |
Line 208 class BasketObject_old(Folder):
|
Line 208 class BasketObject_old(Folder):
|
elif not procedure: #keine fails gesperrt dann alle donwloaden |
elif not procedure: #keine fails gesperrt dann alle donwloaden |
procedure="downloadAll" |
procedure="downloadAll" |
|
|
print procedure |
|
for object in self.contents: |
for object in self.contents: |
|
|
if (procedure=="downloadAll") or (object.lockedBy=='') or (object.lockedBy==self.REQUEST['AUTHENTICATED_USER']): |
if (procedure=="downloadAll") or (object.lockedBy=='') or (object.lockedBy==self.REQUEST['AUTHENTICATED_USER']): |
Line 250 class CDLIBasketContainer(OrderedFolder)
|
Line 250 class CDLIBasketContainer(OrderedFolder)
|
security=ClassSecurityInfo() |
security=ClassSecurityInfo() |
meta_type="CDLIBasketContainer" |
meta_type="CDLIBasketContainer" |
|
|
|
def deleteBaskets(self,ids=None): |
|
"""delete baskets, i.e. move them into trash folder""" |
|
|
|
|
|
found=self.ZopeFind(self,obj_ids=['trash']) |
|
|
|
if len(found)<1: |
|
manage_addFolder(self, 'trash') |
|
trash=self._getOb('trash') |
|
else: |
|
trash=found[0][1] |
|
|
|
if type(ids) is not ListType: |
|
ids=[ids] |
|
cut=self.manage_cutObjects(ids) |
|
trash.manage_pasteObjects(cut) |
|
|
|
def manageBaskets(self,ids,submit,REQUEST=None,RESPONSE=None): |
|
"""manage baskets, delete or copy""" |
|
if submit=="delete": |
|
self.deleteBaskets(ids) |
|
|
|
|
|
|
|
if RESPONSE: |
|
RESPONSE.redirect(self.absolute_url()) |
def getBasketIdfromName(self,basketname): |
def getBasketIdfromName(self,basketname): |
"""get id from name""" |
"""get id from name""" |
|
|
Line 372 class CDLIBasketContainer(OrderedFolder)
|
Line 397 class CDLIBasketContainer(OrderedFolder)
|
def setActiveBasket(self,basketId,REQUEST=None): |
def setActiveBasket(self,basketId,REQUEST=None): |
"""store active basketId in a cookie""" |
"""store active basketId in a cookie""" |
self.REQUEST.RESPONSE.setCookie("CDLIActiveBasket",basketId,path="/") |
self.REQUEST.RESPONSE.setCookie("CDLIActiveBasket",basketId,path="/") |
|
|
if REQUEST: |
if REQUEST: |
REQUEST.RESPONSE.redirect(REQUEST['URL1']) |
REQUEST.RESPONSE.redirect(REQUEST['URL1']+'?'+REQUEST['QUERY_STRING']) |
|
|
def getActiveBasket(self): |
def getActiveBasket(self): |
"""get active basket from cookie""" |
"""get active basket from cookie""" |
Line 460 class CDLIBasket(Folder,CatalogAware):
|
Line 486 class CDLIBasket(Folder,CatalogAware):
|
"""teste ob im basket die aktuelle version ist""" |
"""teste ob im basket die aktuelle version ist""" |
actualNo=obj[1].getLastVersion().getVersionNumber() |
actualNo=obj[1].getLastVersion().getVersionNumber() |
storedNo=obj[0].getVersionNumber() |
storedNo=obj[0].getVersionNumber() |
|
|
|
founds=self.CDLICatalog.search({'title':obj[0].getId()}) |
|
if len(founds)>0 and founds[0].getObject().aq_parent.getId()==".trash": |
|
return False, -1 |
|
|
if actualNo==storedNo: |
if actualNo==storedNo: |
return True |
return True , 0 |
else: |
else: |
return False |
return False, actualNo |
|
|
def history(self): |
def history(self): |
"""history""" |
"""history""" |
Line 538 class CDLIBasket(Folder,CatalogAware):
|
Line 569 class CDLIBasket(Folder,CatalogAware):
|
|
|
return added |
return added |
|
|
def deleteObjects(self,ids,RESPONSE=None): |
def deleteObjects(self,ids,RESPONSE=None,REQUEST=None): |
"""delete objects""" |
"""delete objects""" |
#TODO: implement delete Objects |
|
|
if type(ids) is not ListType: |
|
ids=[ids] |
|
|
|
lastVersion=self.getLastVersion() |
|
oldContent=lastVersion.basketContent[0:] |
|
newContent=[] |
|
for obj in oldContent: |
|
if obj[1].getId() not in ids: |
|
newContent.append(obj) |
|
|
|
|
|
user=self.getActualUserName() |
|
|
|
ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=newContent) |
|
|
|
if RESPONSE: |
|
obj=self._getOb(ob.getId()) |
|
RESPONSE.redirect(obj.absolute_url()) |
|
|
def manage_addCDLIBasketForm(self): |
def manage_addCDLIBasketForm(self): |
"""add the CDLIBasketContainer form""" |
"""add the CDLIBasketContainer form""" |
Line 666 class CDLIBasketVersion(SimpleItem):
|
Line 715 class CDLIBasketVersion(SimpleItem):
|
objId=result[1].getTitle() |
objId=result[1].getTitle() |
founds=self.CDLICatalog.search({'title':objId}) |
founds=self.CDLICatalog.search({'title':objId}) |
if len(founds)>0: |
if len(founds)>0: |
return founds[0].getObject().absolute_url() |
return founds[0].getObject().getLastVersion().absolute_url() |
|
|
else: #assume version number |
else: #assume version number |
splitted=objId.split("_") |
splitted=objId.split("_") |
founds=self.CDLICatalog.search({'title':splitted[1]}) |
founds=self.CDLICatalog.search({'title':splitted[1]}) |
return founds[0].getObject().absolute_url()+'/'+objId |
return founds[0].getObject().getLastVersion().absolute_url()+'/'+objId |
|
|
def manage_addCDLIBasketVersion(self,user,comment="",basketContent=[],RESPONSE=None): |
def manage_addCDLIBasketVersion(self,user,comment="",basketContent=[],RESPONSE=None): |
"""add a version""" |
"""add a version""" |
Line 698 class CDLIFileObject(versionedFileObject
|
Line 747 class CDLIFileObject(versionedFileObject
|
|
|
meta_type="CDLI File Object" |
meta_type="CDLI File Object" |
|
|
|
security=ClassSecurityInfo() |
|
|
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) |
return pt() |
return pt() |
|
|
|
security.declarePublic('getDesignation') |
|
def getDesignation(self): |
|
"""get the designation out of the file""" |
|
try: |
|
txt=re.search("&[Pp](.*)= (.+[^\n\r])",self.data[0:]) |
|
except: |
|
txt=self.data[0:] |
|
|
|
return "ERROR" |
|
try: |
|
return txt.group(2) |
|
except: |
|
return "ERROR" |
|
|
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='',precondition='', content_type='', |
Line 755 class CDLIFile(versionedFile,CatalogAwar
|
Line 819 class CDLIFile(versionedFile,CatalogAwar
|
if not context: |
if not context: |
context=self |
context=self |
|
|
return [x.getObject() for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()})] |
ret=[] |
|
for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()}): |
|
#if the basket x is deleted it seemes to be that x is sometimes still in the Catalog, why? |
|
try: |
|
ret.append(x.getObject()) |
|
except: |
|
pass |
|
return ret |
|
#return [x.getObject() for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()})] |
|
|
|
|
def addCDLIFileObjectForm(self): |
def addCDLIFileObjectForm(self): |
Line 776 class CDLIFile(versionedFile,CatalogAwar
|
Line 848 class CDLIFile(versionedFile,CatalogAwar
|
except: |
except: |
pass |
pass |
|
|
author=self.REQUEST.SESSION['author'] |
|
|
|
if changeName=="yes": |
if changeName=="yes": |
filename=file.filename |
filename=file.filename |
Line 817 class CDLIFile(versionedFile,CatalogAwar
|
Line 888 class CDLIFile(versionedFile,CatalogAwar
|
return pt() |
return pt() |
|
|
else: |
else: |
RESPONSE.redirect(self.REQUEST['URL2']) |
RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title) |
|
|
else: |
else: |
return self.ZopeFind(self,obj_ids=[id])[0][1] |
return self.ZopeFind(self,obj_ids=[id])[0][1] |
Line 873 class CDLIFileFolder(versionedFileFolder
|
Line 944 class CDLIFileFolder(versionedFileFolder
|
folderMetaType=['CDLI Folder'] |
folderMetaType=['CDLI Folder'] |
default_catalog='CDLICatalog' |
default_catalog='CDLICatalog' |
|
|
|
def delete(self,ids): |
|
"""delete this file, i.e. move into a trash folder""" |
|
|
|
found=self.ZopeFind(self,obj_ids=['.trash']) |
|
|
|
if len(found)<1: |
|
manage_addCDLIFileFolder(self, '.trash',title="Trash") |
|
trash=self._getOb('.trash') |
|
else: |
|
trash=found[0][1] |
|
|
|
if type(ids) is not ListType: |
|
ids=[ids] |
|
cut=self.manage_cutObjects(ids) |
|
trash.manage_pasteObjects(cut) |
|
|
def getVersionNumbersFromIds(self,ids): |
def getVersionNumbersFromIds(self,ids): |
"""get the numbers of the current versions of documents described by their ids""" |
"""get the numbers of the current versions of documents described by their ids""" |
|
|
Line 887 class CDLIFileFolder(versionedFileFolder
|
Line 974 class CDLIFileFolder(versionedFileFolder
|
|
|
return ret |
return ret |
|
|
|
def checkCatalog(self,fn): |
|
"""check if fn is in the catalog""" |
|
|
|
|
def uploadATF(self,upload,basketId=0,RESPONSE=None): |
def uploadATF(self,upload,basketId=0,RESPONSE=None): |
"""upload an atf file""" |
"""upload an atf file""" |
Line 900 class CDLIFileFolder(versionedFileFolder
|
Line 990 class CDLIFileFolder(versionedFileFolder
|
changed=[] |
changed=[] |
errors=[] |
errors=[] |
newPs=[] |
newPs=[] |
|
psNotInCatalog=[] |
basketNameFromFile, numberOfFiles=splitatf(upload,dir) |
basketNameFromFile, numberOfFiles=splitatf(upload,dir) |
|
|
if basketId == '0': |
if basketId == '0': |
Line 916 class CDLIFileFolder(versionedFileFolder
|
Line 1007 class CDLIFileFolder(versionedFileFolder
|
|
|
|
|
for fn in os.listdir(dir): |
for fn in os.listdir(dir): |
|
|
|
if self.checkCatalog(fn): |
|
psNotInCatalog.append(fn) |
|
|
|
|
founds=self.CDLICatalog.search({'title':fn}) |
founds=self.CDLICatalog.search({'title':fn}) |
|
|
if len(founds)==0: |
if len(founds)==0: |
Line 946 class CDLIFileFolder(versionedFileFolder
|
Line 1042 class CDLIFileFolder(versionedFileFolder
|
"""upload the files""" |
"""upload the files""" |
|
|
if procedure=="uploadchanged": |
if procedure=="uploadchanged": |
uploadFns=self.REQUEST.SESSION['changed']+self.REQUEST.SESSION['newPs'] |
|
|
uploadFns=self.REQUEST.SESSION.get('changed',[])+self.REQUEST.SESSION.get('newPs',[]) |
|
|
elif procedure=="uploadAll": |
elif procedure=="uploadAll": |
uploadFns=[] |
uploadFns=[] |
for x in os.listdir(self.REQUEST.SESSION['tmpdir']): |
for x in os.listdir(self.REQUEST.SESSION['tmpdir']): |
if not x in self.REQUEST.SESSION['errors']: |
if not x in self.REQUEST.SESSION['errors']: |
uploadFns.append(x) |
uploadFns.append(x) |
|
elif procedure=="noupload": |
|
if RESPONSE is not None: |
|
RESPONSE.redirect(self.aq_parent.absolute_url()) |
|
return "" |
|
else: |
|
return "" |
else: |
else: |
uploadFns=[] |
uploadFns=[] |
|
|
for fn in uploadFns: |
for fn in uploadFns: |
print "UP:",fn |
|
founds=self.CDLICatalog.search({'title':fn}) |
founds=self.CDLICatalog.search({'title':fn}) |
print " -----",founds |
|
if len(founds)>0: |
if len(founds)>0: |
self.REQUEST.SESSION['author']=str(self.REQUEST['AUTHENTICATED_USER']) |
self.REQUEST.SESSION['author']=str(self.REQUEST['AUTHENTICATED_USER']) |
print "-------- author:",self.REQUEST.SESSION['author'] |
|
founds[0].getObject().manage_addCDLIFileObject('',comment,self.REQUEST.SESSION['author'],file=file(os.path.join(self.REQUEST.SESSION['tmpdir'],fn))) |
founds[0].getObject().manage_addCDLIFileObject('',comment,self.REQUEST.SESSION['author'],file=file(os.path.join(self.REQUEST.SESSION['tmpdir'],fn))) |
|
|
|
|
Line 990 class CDLIFileFolder(versionedFileFolder
|
Line 1091 class CDLIFileFolder(versionedFileFolder
|
founds[0].getObject().lockedBy="" |
founds[0].getObject().lockedBy="" |
|
|
if not (basketname ==''): |
if not (basketname ==''): |
basketId=self.basketFolder.getBasketIdfromName(basketname) |
basketId=self.basketContainer.getBasketIdfromName(basketname) |
|
|
if not basketId: # create new basket |
if not basketId: # create new basket |
ob=self.basketContainer.addBasket(basketname) |
ob=self.basketContainer.addBasket(basketname) |
basketId=ob.getId() |
basketId=ob.getId() |
basket=getattr(self.basketFolder,str(basketId)) |
basket=getattr(self.basketContainer,str(basketId)) |
ids=os.listdir(self.REQUEST.SESSION['tmpdir']) |
ids=os.listdir(self.REQUEST.SESSION['tmpdir']) |
basket.addObjects(ids,deleteOld=True) |
basket.addObjects(ids,deleteOld=True) |
|
|
Line 1005 class CDLIFileFolder(versionedFileFolder
|
Line 1106 class CDLIFileFolder(versionedFileFolder
|
|
|
def findObjectsFromList(self,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None): |
def findObjectsFromList(self,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None): |
"""findObjectsFromList (, TAB oder LINE separated)""" |
"""findObjectsFromList (, TAB oder LINE separated)""" |
|
|
|
|
if upload: # list from file upload |
if upload: # list from file upload |
txt=upload.read() |
txt=upload.read() |
txt=txt.replace(",","\n") |
txt=txt.replace(",","\n") |
txt=txt.replace("\t","\n") |
txt=txt.replace("\t","\n") |
|
txt=txt.replace("\r","\n") |
idsTmp=txt.split("\n") |
idsTmp=txt.split("\n") |
ids=[] |
ids=[] |
for id in idsTmp: # make sure that no empty lines |
for id in idsTmp: # make sure that no empty lines |
Line 1029 class CDLIFileFolder(versionedFileFolder
|
Line 1133 class CDLIFileFolder(versionedFileFolder
|
pt=getattr(self,'filelist.html') |
pt=getattr(self,'filelist.html') |
return pt(basketName=basketName,numberOfObjects=numberOfObjects) |
return pt(basketName=basketName,numberOfObjects=numberOfObjects) |
|
|
if list: # got already a list |
if list is not None: # got already a list |
ret=[] |
ret=[] |
for fileId in list: |
for fileId in list: |
if len(fileId.split("."))==1: |
if len(fileId.split("."))==1: |
Line 1044 class CDLIFileFolder(versionedFileFolder
|
Line 1148 class CDLIFileFolder(versionedFileFolder
|
if start: |
if start: |
RESPONSE.redirect("filelist.html?start:int="+str(start)) |
RESPONSE.redirect("filelist.html?start:int="+str(start)) |
|
|
|
print "nothing" |
|
|
def createAllFilesAsSingleFile(self,RESPONSE=None): |
def createAllFilesAsSingleFile(self,RESPONSE=None): |
"""download all files""" |
"""download all files""" |
|
|
Line 1067 class CDLIFileFolder(versionedFileFolder
|
Line 1173 class CDLIFileFolder(versionedFileFolder
|
|
|
#os.write(tf,obj.getLastVersion().data) |
#os.write(tf,obj.getLastVersion().data) |
if RESPONSE: |
if RESPONSE: |
RESPONSE.write(obj.getLastVersion().data) |
RESPONSE.write(obj.getLastVersion().data[0:]) |
#os.close(tf) |
#os.close(tf) |
#RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename) |
#RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename) |
return True |
return True |