version 1.37, 2006/07/14 19:08:30
|
version 1.39, 2006/07/18 13:42:52
|
Line 13 from OFS.Folder import manage_addFolder
|
Line 13 from OFS.Folder import manage_addFolder
|
import re |
import re |
from AccessControl import ClassSecurityInfo |
from AccessControl import ClassSecurityInfo |
from Acquisition import Implicit |
from Acquisition import Implicit |
|
from Globals import Persistent |
from threading import Thread |
from threading import Thread |
from ZPublisher.HTTPRequest import HTTPRequest |
from ZPublisher.HTTPRequest import HTTPRequest |
from ZPublisher.HTTPResponse import HTTPResponse |
from ZPublisher.HTTPResponse import HTTPResponse |
Line 20 from ZPublisher.BaseRequest import Reque
|
Line 21 from ZPublisher.BaseRequest import Reque
|
import threading |
import threading |
|
|
|
|
|
class BasketContent(SimpleItem): |
|
"""classe fuer den Inhalt eines Baskets""" |
|
|
|
def __init__(self,content=[]): |
|
"""content""" |
|
self.contentList=content[0:] |
|
|
|
def getContent(self): |
|
"""get content""" |
|
|
|
return self.contentList |
|
|
|
def setContent(self,content): |
|
self.contentList=content[0:] |
|
|
|
def numberOfItems(self): |
|
"""number""" |
|
|
|
return len(self.getContent()) |
|
|
|
|
class uploadATFfinallyThread(Thread): |
class uploadATFfinallyThread(Thread): |
"""class for adding uploaded filed (temporarily stored in the staging area at /tmp""" |
"""class for adding uploaded filed (temporarily stored in the staging area at /tmp""" |
Line 152 class uploadATFfinallyThread(Thread):
|
Line 173 class uploadATFfinallyThread(Thread):
|
#if a basketname is give, add files to the basket |
#if a basketname is give, add files to the basket |
if not (basketname ==''): |
if not (basketname ==''): |
self.result+="<p>Add basket</p>" |
self.result+="<p>Add basket</p>" |
basketId=ctx2.basketContainer.getBasketIdfromName(basketname) |
basketId=ctx2.basketContainer.ketIdfromName(basketname) |
|
|
if not basketId: # create new basket |
if not basketId: # create new basket |
ob=ctx2.basketContainer.addBasket(basketname) |
ob=ctx2.basketContainer.addBasket(basketname) |
Line 446 class BasketObject_old(Folder):
|
Line 467 class BasketObject_old(Folder):
|
|
|
def numberOfItems(self): |
def numberOfItems(self): |
"""return anzahl der elemente im basket""" |
"""return anzahl der elemente im basket""" |
return len(self.contents) |
num=len(self.contents) |
|
|
|
return num |
|
|
def addObjects(self,ids): |
def addObjects(self,ids): |
"""addObjects""" |
"""addObjects""" |
Line 560 class CDLIBasketContainer(OrderedFolder)
|
Line 583 class CDLIBasketContainer(OrderedFolder)
|
security=ClassSecurityInfo() |
security=ClassSecurityInfo() |
meta_type="CDLIBasketContainer" |
meta_type="CDLIBasketContainer" |
|
|
|
def upDateBaskets(self): |
|
"""update content in to objects""" |
|
|
|
founds=self.ZopeFind(self,obj_metatypes=['CDLIBasketVersion'],search_sub=1) |
|
|
|
for found in founds: |
|
found[1].updateBasket() |
|
|
security.declareProtected('manage','deleteBaskets') |
security.declareProtected('manage','deleteBaskets') |
def deleteBaskets(self,ids=None): |
def deleteBaskets(self,ids=None): |
"""delete baskets, i.e. move them into trash folder""" |
"""delete baskets, i.e. move them into trash folder""" |
Line 693 class CDLIBasketContainer(OrderedFolder)
|
Line 724 class CDLIBasketContainer(OrderedFolder)
|
baskets.sort(sortAuthor) |
baskets.sort(sortAuthor) |
elif sortField=='comment': |
elif sortField=='comment': |
baskets.sort(sortComment) |
baskets.sort(sortComment) |
print "got the baskets" |
|
return baskets |
return baskets |
|
|
|
|
Line 785 class CDLIBasket(Folder,CatalogAware):
|
Line 816 class CDLIBasket(Folder,CatalogAware):
|
meta_type="CDLIBasket" |
meta_type="CDLIBasket" |
default_catalog="CDLIBasketCatalog" |
default_catalog="CDLIBasketCatalog" |
|
|
|
|
def getFile(self,obj): |
def getFile(self,obj): |
return obj[1] |
return obj[1] |
|
|
Line 840 class CDLIBasket(Folder,CatalogAware):
|
Line 872 class CDLIBasket(Folder,CatalogAware):
|
|
|
def getLastVersion(self): |
def getLastVersion(self): |
"""hole letzte version""" |
"""hole letzte version""" |
ids=[int(x[0]) for x in self.ZopeFind(self,obj_metatypes=["CDLIBasketVersion"])] |
|
|
ids=[] |
|
idsTmp= self.objectIds() |
|
for x in idsTmp: |
|
try: |
|
ids.append(int(x)) |
|
except: |
|
pass |
ids.sort() |
ids.sort() |
|
|
if len(ids)==0: |
if len(ids)==0: |
return None |
return None |
else: |
else: |
ob=getattr(self,str(ids[-1])) |
ob=getattr(self,str(ids[-1])) |
|
|
|
|
return ob |
return ob |
|
|
def getVersions(self): |
def getVersions(self): |
Line 860 class CDLIBasket(Folder,CatalogAware):
|
Line 902 class CDLIBasket(Folder,CatalogAware):
|
ids=[ids] |
ids=[ids] |
|
|
lastVersion=self.getLastVersion() |
lastVersion=self.getLastVersion() |
oldContent=lastVersion.basketContent[0:] |
oldContent=lastVersion.content.getContent() |
newContent=[] |
newContent=[] |
|
|
#first copy the old |
#first copy the old |
Line 883 class CDLIBasket(Folder,CatalogAware):
|
Line 925 class CDLIBasket(Folder,CatalogAware):
|
|
|
ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=newContent) |
ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=newContent) |
|
|
if RESPONSE: |
|
obj=self._getOb(ob.getId()) |
obj=self._getOb(ob.getId()) |
|
if RESPONSE: |
|
|
RESPONSE.redirect(obj.absolute_url()) |
RESPONSE.redirect(obj.absolute_url()) |
|
|
|
return obj |
|
|
def addObjects(self,ids,deleteOld=None,username=None): |
def addObjects(self,ids,deleteOld=None,username=None): |
"""generate a new version of the basket with objects added""" |
"""generate a new version of the basket with objects added""" |
|
|
Line 895 class CDLIBasket(Folder,CatalogAware):
|
Line 940 class CDLIBasket(Folder,CatalogAware):
|
if lastVersion is None: |
if lastVersion is None: |
oldContent=[] |
oldContent=[] |
else: |
else: |
oldContent=lastVersion.basketContent[0:] |
oldContent=lastVersion.content.getContent() |
|
|
if deleteOld: |
if deleteOld: |
oldContent=[] |
oldContent=[] |
Line 935 class CDLIBasket(Folder,CatalogAware):
|
Line 980 class CDLIBasket(Folder,CatalogAware):
|
ids=[ids] |
ids=[ids] |
|
|
lastVersion=self.getLastVersion() |
lastVersion=self.getLastVersion() |
oldContent=lastVersion.basketContent[0:] |
oldContent=lastVersion.content.getContent() |
newContent=[] |
newContent=[] |
for obj in oldContent: |
for obj in oldContent: |
if obj[1].getId() not in ids: |
if obj[1].getId() not in ids: |
Line 969 def manage_addCDLIBasket(self,title,shor
|
Line 1014 def manage_addCDLIBasket(self,title,shor
|
else: |
else: |
return ob |
return ob |
|
|
class CDLIBasketVersion(SimpleItem): |
class CDLIBasketVersion(Implicit,Persistent,Folder): |
"""version of a basket""" |
"""version of a basket""" |
|
|
meta_type="CDLIBasketVersion" |
meta_type="CDLIBasketVersion" |
security=ClassSecurityInfo() |
security=ClassSecurityInfo() |
|
|
|
def updateBasket(self): |
|
"""update""" |
|
try: |
|
self._setObject('content',BasketContent(self.basketContent)) |
|
except: |
|
try: |
|
if len(self.basketContent)>0: |
|
self.content.setContent(self.basketContent) |
|
except: |
|
print "error",self.getId(),self.aq_parent.getId() |
|
self.basketContent=[] |
|
|
|
|
def containsNonActualFiles(self): |
def containsNonActualFiles(self): |
"""returns True if basket contains one or more non current files""" |
"""returns True if basket contains one or more non current files""" |
|
|
Line 1004 class CDLIBasketVersion(SimpleItem):
|
Line 1062 class CDLIBasketVersion(SimpleItem):
|
|
|
#check if a locked object exist in the basket. |
#check if a locked object exist in the basket. |
lockedObjects={} |
lockedObjects={} |
for object in self.basketContent: |
for object in self.content.getContent(): |
|
|
if not object[1].lockedBy=="": |
if not object[1].lockedBy=="": |
lockedObjects[object[1].title]=repr(object[1].lockedBy) |
lockedObjects[object[1].title]=repr(object[1].lockedBy) |
Line 1022 class CDLIBasketVersion(SimpleItem):
|
Line 1080 class CDLIBasketVersion(SimpleItem):
|
procedure="downloadAll" |
procedure="downloadAll" |
|
|
|
|
for object in self.basketContent: |
for object in self.content.getContent(): |
|
|
if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']): |
if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']): |
if current=="no": #version as they are in the basket |
if current=="no": #version as they are in the basket |
Line 1050 class CDLIBasketVersion(SimpleItem):
|
Line 1108 class CDLIBasketVersion(SimpleItem):
|
|
|
def numberOfItems(self): |
def numberOfItems(self): |
"""return anzahl der elemente im basket""" |
"""return anzahl der elemente im basket""" |
return len(self.basketContent) |
return self.content.numberOfItems() |
|
|
def getTime(self): |
def getTime(self): |
"""getTime""" |
"""getTime""" |
Line 1066 class CDLIBasketVersion(SimpleItem):
|
Line 1124 class CDLIBasketVersion(SimpleItem):
|
|
|
def getContent(self): |
def getContent(self): |
"""get Basket Content""" |
"""get Basket Content""" |
return self.basketContent |
return self.content.getContent() |
|
|
|
|
def __init__(self,id,user,comment="",basketContent=[]): |
def __init__(self,id,user,comment="",basketContent=[]): |
""" init a basket version""" |
""" init a basket version""" |
self.id=id |
self.id=id |
self.coment=comment |
self.coment=comment |
self.basketContent=basketContent[0:] |
self._setObject('content',BasketContent(basketContent)) |
|
#self.basketContent=basketContent[0:]a |
self.user=user |
self.user=user |
self.time=time.localtime() |
self.time=time.localtime() |
|
|
Line 1090 class CDLIBasketVersion(SimpleItem):
|
Line 1149 class CDLIBasketVersion(SimpleItem):
|
"""view the basket""" |
"""view the basket""" |
|
|
if self.REQUEST.get('change',False): |
if self.REQUEST.get('change',False): |
|
ob=self.aq_parent.updateObjects(self.REQUEST['change']) |
|
|
self.aq_parent.updateObjects(self.REQUEST['change']) |
self.REQUEST.RESPONSE.redirect(ob.absolute_url())#go to new basket, because changing generates a new basket |
|
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketVersionMain.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketVersionMain.zpt')).__of__(self) |
return pt() |
return pt() |
Line 1651 class CDLIRoot(Folder):
|
Line 1711 class CDLIRoot(Folder):
|
ret=[] |
ret=[] |
for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1): |
for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1): |
un=f[1].forceunlock() |
un=f[1].forceunlock() |
print un |
|
if un and un !="": |
if un and un !="": |
ret.append((f[0],un)) |
ret.append((f[0],un)) |
print ret |
print ret |
Line 1785 class CDLIRoot(Folder):
|
Line 1845 class CDLIRoot(Folder):
|
self.REQUEST.SESSION['newPs']=tmp['newPs'] |
self.REQUEST.SESSION['newPs']=tmp['newPs'] |
self.REQUEST.SESSION['tmpdir']=tmp['dir'] |
self.REQUEST.SESSION['tmpdir']=tmp['dir'] |
#del(self.cdli_main.tmpStore2[threadName]) |
#del(self.cdli_main.tmpStore2[threadName]) |
print "here the templates" |
|
|
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self) |
print "init p" |
|
return pt(changed=tmp['changed'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'], |
return pt(changed=tmp['changed'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'], |
basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId']) |
basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId']) |
|
|