--- cdli/cdli_files.py 2006/06/18 12:53:56 1.29
+++ cdli/cdli_files.py 2006/08/24 09:28:29 1.44
@@ -13,6 +13,7 @@ from OFS.Folder import manage_addFolder
import re
from AccessControl import ClassSecurityInfo
from Acquisition import Implicit
+from Globals import Persistent
from threading import Thread
from ZPublisher.HTTPRequest import HTTPRequest
from ZPublisher.HTTPResponse import HTTPResponse
@@ -20,7 +21,27 @@ from ZPublisher.BaseRequest import Reque
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 for adding uploaded filed (temporarily stored in the staging area at /tmp"""
@@ -215,7 +236,7 @@ class uploadATFThread(Thread):
ctx = self.getContext(app,serverport=self.serverport)
self.uploadATFThread(ctx,self.upload,self.basketId)
- ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue
+ #ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue
get_transaction().commit()
@@ -294,8 +315,8 @@ class uploadATFThread(Thread):
for found in founds:
#analyse the differences to the actual file
obj=found.getObject()
-
- if (not obj.lockedBy=='') and (not obj.lockedBy==self.username):
+
+ if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))):
errors.append(obj)
else:
data=file(os.path.join(dir,fn)).read()
@@ -446,7 +467,9 @@ class BasketObject_old(Folder):
def numberOfItems(self):
"""return anzahl der elemente im basket"""
- return len(self.contents)
+ num=len(self.contents)
+
+ return num
def addObjects(self,ids):
"""addObjects"""
@@ -560,6 +583,15 @@ class CDLIBasketContainer(OrderedFolder)
security=ClassSecurityInfo()
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')
def deleteBaskets(self,ids=None):
"""delete baskets, i.e. move them into trash folder"""
@@ -577,6 +609,7 @@ class CDLIBasketContainer(OrderedFolder)
cut=self.manage_cutObjects(ids)
trash.manage_pasteObjects(cut)
+ security.declareProtected('manage','manageBaskets')
def manageBaskets(self,ids,submit,REQUEST=None,RESPONSE=None):
"""manage baskets, delete or copy"""
if submit=="delete":
@@ -586,6 +619,8 @@ class CDLIBasketContainer(OrderedFolder)
if RESPONSE:
RESPONSE.redirect(self.absolute_url())
+
+ security.declareProtected('View','getBasketIdfromName')
def getBasketIdfromName(self,basketname):
"""get id from name"""
@@ -611,7 +646,7 @@ class CDLIBasketContainer(OrderedFolder)
return pt(basketId=basketId,basketName=basketName)
-
+ security.declareProtected('View','index_html')
def index_html(self):
"""stanadard ansicht"""
@@ -781,6 +816,7 @@ class CDLIBasket(Folder,CatalogAware):
meta_type="CDLIBasket"
default_catalog="CDLIBasketCatalog"
+
def getFile(self,obj):
return obj[1]
@@ -792,12 +828,16 @@ class CDLIBasket(Folder,CatalogAware):
return [x[1].getId() for x in self.getLastVersion().getContent()]
+
def isActual(self,obj):
"""teste ob im basket die aktuelle version ist"""
actualNo=obj[1].getLastVersion().getVersionNumber()
storedNo=obj[0].getVersionNumber()
founds=self.CDLICatalog.search({'title':obj[0].getId()})
+ if len(founds)>0:
+ actualNo=founds[0].getObject().getLastVersion().getVersionNumber()
+
if len(founds)>0 and founds[0].getObject().aq_parent.getId()==".trash":
return False, -1
@@ -832,12 +872,22 @@ class CDLIBasket(Folder,CatalogAware):
def getLastVersion(self):
"""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()
+
if len(ids)==0:
return None
else:
ob=getattr(self,str(ids[-1]))
+
+
return ob
def getVersions(self):
@@ -846,6 +896,41 @@ class CDLIBasket(Folder,CatalogAware):
return versions
+ def updateObjects(self,ids,RESPONSE=None,REQUEST=None):
+ """update ids, ids not in the basket the add"""
+ if type(ids) is not ListType:
+ ids=[ids]
+
+ lastVersion=self.getLastVersion()
+ oldContent=lastVersion.content.getContent()
+ newContent=[]
+
+ #first copy the old
+ for obj in oldContent:
+ if obj[1].getId() not in ids:
+ newContent.append(obj)
+ #now add the new
+
+ for id in ids:
+ founds=self.CDLICatalog.search({'title':id})
+
+ for found in founds:
+ if found.getObject() not in oldContent:
+ #TODO: was passiert wenn, man eine Object dazufgt, das schon da ist aber eine neuere version
+ newContent.append((found.getObject().getLastVersion(),found.getObject()))
+
+
+ content=newContent
+ user=self.getActualUserName()
+
+ ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=newContent)
+
+ obj=self._getOb(ob.getId())
+ if RESPONSE:
+
+ RESPONSE.redirect(obj.absolute_url())
+
+ return obj
def addObjects(self,ids,deleteOld=None,username=None):
"""generate a new version of the basket with objects added"""
@@ -855,7 +940,7 @@ class CDLIBasket(Folder,CatalogAware):
if lastVersion is None:
oldContent=[]
else:
- oldContent=lastVersion.basketContent[0:]
+ oldContent=lastVersion.content.getContent()
if deleteOld:
oldContent=[]
@@ -881,6 +966,13 @@ class CDLIBasket(Folder,CatalogAware):
return added
+ def changeBasket(self,ids,submit,RESPONSE=None,REQUEST=None):
+ """change a basket"""
+ if submit=="update":
+ return self.updateObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST)
+ elif submit=="delete":
+ return self.deleteObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST)
+
def deleteObjects(self,ids,RESPONSE=None,REQUEST=None):
"""delete objects"""
@@ -888,7 +980,7 @@ class CDLIBasket(Folder,CatalogAware):
ids=[ids]
lastVersion=self.getLastVersion()
- oldContent=lastVersion.basketContent[0:]
+ oldContent=lastVersion.content.getContent()
newContent=[]
for obj in oldContent:
if obj[1].getId() not in ids:
@@ -922,14 +1014,42 @@ def manage_addCDLIBasket(self,title,shor
else:
return ob
-class CDLIBasketVersion(SimpleItem):
+class CDLIBasketVersion(Implicit,Persistent,Folder):
"""version of a basket"""
meta_type="CDLIBasketVersion"
+ security=ClassSecurityInfo()
- def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None):
- """download all selected files in one file"""
+ 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):
+ """returns True if basket contains one or more non current files"""
+ objs=self.getContent()
+ for obj in objs:
+ if not self.isActual(obj)[0]:
+ return True
+ return False
+
+ security.declareProtected('View','downloadObjectsAsOneFile')
+ def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None,check="yes",current="no"):
+ """download all selected files in one file"""
+
+ if (check=="yes") and self.containsNonActualFiles():
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadObjectAsOneFile_check.zpt')).__of__(self)
+ return pt(lock=lock)
+
ret=""
lockedObjects={}
@@ -942,7 +1062,7 @@ class CDLIBasketVersion(SimpleItem):
#check if a locked object exist in the basket.
lockedObjects={}
- for object in self.basketContent:
+ for object in self.content.getContent():
if not object[1].lockedBy=="":
lockedObjects[object[1].title]=repr(object[1].lockedBy)
@@ -960,14 +1080,20 @@ class CDLIBasketVersion(SimpleItem):
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']):
- ret+=object[0].data
-
+ if current=="no": #version as they are in the basket
+ ret+=str(object[0].data)+"\n"
+ elif current=="yes":
+ #search current object
+ founds=self.CDLICatalog.search({'title':object[0].getId()})
+ if len(founds)>0:
+ ret+=str(founds[0].getObject().getLastVersion().data)+"\n"
+
if lock and object[1].lockedBy=='':
object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER']
-
+
basket_name=self.aq_parent.title+"_V"+self.getId()
#write basketname to header of atf file
@@ -982,7 +1108,7 @@ class CDLIBasketVersion(SimpleItem):
def numberOfItems(self):
"""return anzahl der elemente im basket"""
- return len(self.basketContent)
+ return self.content.numberOfItems()
def getTime(self):
"""getTime"""
@@ -998,14 +1124,15 @@ class CDLIBasketVersion(SimpleItem):
def getContent(self):
"""get Basket Content"""
- return self.basketContent
+ return self.content.getContent()
def __init__(self,id,user,comment="",basketContent=[]):
""" init a basket version"""
self.id=id
self.coment=comment
- self.basketContent=basketContent[0:]
+ self._setObject('content',BasketContent(basketContent))
+ #self.basketContent=basketContent[0:]a
self.user=user
self.time=time.localtime()
@@ -1017,8 +1144,15 @@ class CDLIBasketVersion(SimpleItem):
"""get Comment"""
return self.comment
+ security.declareProtected('View','index_html')
def index_html(self):
"""view the basket"""
+
+ if self.REQUEST.get('change',False):
+ ob=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)
return pt()
@@ -1095,6 +1229,20 @@ class CDLIFileObject(CatalogAware,versio
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self)
return pt()
+ security.declarePublic('getPNumber')
+ def getPNumber(self):
+ """get the pnumber"""
+ try:
+ txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.data[0:])
+ except:
+ txt=self.data[0:]
+
+ return "ERROR"
+ try:
+ return "P"+txt.group(1)
+ except:
+ return "ERROR"
+
security.declarePublic('getDesignation')
def getDesignation(self):
"""get the designation out of the file"""
@@ -1161,6 +1309,18 @@ class CDLIFile(versionedFile,CatalogAwar
return pt()
+ def getBasketFromId(self,basketid, context=None):
+ """get basket from id"""
+
+ if not context:
+ context=self
+
+ for basket in self.ZopeFind(context,obj_metatypes=["CDLIBasket"]):
+ if basket[0]==basketid:
+ return basket[1]
+ else:
+ None
+
def isContainedInBaskets(self,context=None):
"""check is this file is part of any basket
@@ -1193,7 +1353,12 @@ class CDLIFile(versionedFile,CatalogAwar
else:
return "Sorry file is locked by somebody else"
- def manage_addCDLIFileObject(self,id,vC,author,file='',title='',precondition='', content_type='',changeName='no',newName='', RESPONSE=None):
+ def manage_addCDLIFileObject(self,id,vC,author,
+ file='',title='',
+ precondition='',
+ content_type='',
+ changeName='no',newName='',
+ come_from=None,RESPONSE=None):
"""add"""
try: #TODO: der ganze vC unsinn muss ueberarbeitet werden
vC=self.REQUEST['vC']
@@ -1214,8 +1379,7 @@ class CDLIFile(versionedFile,CatalogAwar
-
-
+
positionVersionNum=getattr(self,'positionVersionNum','front')
if positionVersionNum=='front':
@@ -1227,7 +1391,7 @@ class CDLIFile(versionedFile,CatalogAwar
else:
id=tmp[0]+"_V%i"%self.getVersion()
-
+
manage_addCDLIFileObject(self,id,vC,author,file,id,precondition, content_type)
objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion()))
try:
@@ -1235,7 +1399,9 @@ class CDLIFile(versionedFile,CatalogAwar
self.REQUEST.SESSION['objID_parent']=self.getId()
except:
pass
+
if RESPONSE:
+
obj=self.ZopeFind(self,obj_ids=[id])[0][1]
if obj.getSize()==0:
self.REQUEST.SESSION['objID']=obj.getId()
@@ -1243,7 +1409,10 @@ class CDLIFile(versionedFile,CatalogAwar
return pt()
else:
- RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title)
+ if come_from and (come_from!=""):
+ RESPONSE.redirect(come_from+"?change="+self.getId())
+ else:
+ RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title)
else:
return self.ZopeFind(self,obj_ids=[id])[0][1]
@@ -1377,12 +1546,17 @@ class CDLIFileFolder(versionedFileFolder
- def findObjectsFromList(self,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None):
+ def findObjectsFromList(self,enterList=None,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None):
"""findObjectsFromList (, TAB oder LINE separated)"""
if upload: # list from file upload
txt=upload.read()
+
+ if enterList:
+ txt=enterList
+
+ if upload or enterList:
txt=txt.replace(",","\n")
txt=txt.replace("\t","\n")
txt=txt.replace("\r","\n")
@@ -1409,9 +1583,11 @@ class CDLIFileFolder(versionedFileFolder
if list is not None: # got already a list
ret=[]
for fileId in list:
- if len(fileId.split("."))==1:
+ if fileId.find("*"): #check for wildcards
+ fileId=fileId
+ elif len(fileId.split("."))==1:
fileId=fileId+".atf"
-
+
ret+=self.CDLICatalog({'title':fileId})
#TODO: get rid of one of these..
ids=[x.getObject().getId() for x in ret]
@@ -1499,7 +1675,7 @@ class CDLIFileFolder(versionedFileFolder
len(getattr(self,self.default_catalog)({'path':folder[0]}))
))
return ret
-
+ security.declareProtected('View','index_html')
def index_html(self):
"""main"""
ext=self.ZopeFind(self,obj_ids=["index.html"])
@@ -1547,12 +1723,21 @@ class CDLIRoot(Folder):
meta_type="CDLIRoot"
+ def URLquote(self,str):
+ """quote url"""
+ return urllib.quote(str)
+
+ def URLunquote(self,str):
+ """unquote url"""
+ return urllib.unquote(str)
+
+
def forceunlock(self):
"break all locks"
ret=[]
for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1):
un=f[1].forceunlock()
- print un
+
if un and un !="":
ret.append((f[0],un))
print ret
@@ -1612,7 +1797,13 @@ class CDLIRoot(Folder):
def checkThreads(self):
"""check threads"""
- return threading.enumerate()
+ ret=""
+ for thread in threading.enumerate():
+ ret+="%s : %s
"%(repr(thread),thread.isAlive())
+
+ return ret
+
+
def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None):
"""standard ausgabe"""
@@ -1624,7 +1815,7 @@ class CDLIRoot(Folder):
thread=uploadATFThread()
threadName=thread.getName()[0:]
- if not hasattr(self,'_v_uploadATF'):
+ if (not hasattr(self,'_v_uploadATF')):
self._v_uploadATF={}
self._v_uploadATF[threadName]=thread
@@ -1647,7 +1838,7 @@ class CDLIRoot(Folder):
else:
#recover thread, if lost
- if not hasattr(self,'_v_uploadATF'):
+ if (not hasattr(self,'_v_uploadATF')):
self._v_uploadATF={}
if not self._v_uploadATF.get(threadName,None):
for thread in threading.enumerate():
@@ -1666,28 +1857,40 @@ class CDLIRoot(Folder):
return pt(txt='/uploadATF',threadName=threadName)
else:
- tmp={}
- for key in self._v_uploadATF[threadName].returnValue.keys():
- t=self._v_uploadATF[threadName].returnValue[key]
- if type(t) is ListType:
- tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:]
- else:
- tmp[key]=self._v_uploadATF[threadName].returnValue[key]
- print repr(tmp[key]),repr(key)
-
+# tmp={}
+# for key in self._v_uploadATF[threadName].returnValue.keys():
+# t=self._v_uploadATF[threadName].returnValue[key]
+# if type(t) is ListType:
+# tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:]
+# else:
+# tmp[key]=self._v_uploadATF[threadName].returnValue[key]
+# print repr(tmp[key]),repr(key)
+#
+# #
#tmp=self.cdli_main.tmpStore2[threadName]
+ tmp=self._v_uploadATF[threadName].returnValue
- self._v_uploadATF[threadName].continueVar=False
+ #self._v_uploadATF[threadName].continueVar=False
self.REQUEST.SESSION['changed']=[x[0].getId() for x in tmp['changed']]
self.REQUEST.SESSION['errors']=[x.getId() for x in tmp['errors']]
self.REQUEST.SESSION['newPs']=tmp['newPs']
self.REQUEST.SESSION['tmpdir']=tmp['dir']
- del(self.cdli_main.tmpStore2[threadName])
+ #del(self.cdli_main.tmpStore2[threadName])
+
+
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self)
+
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'])
-
+
+ def redoUpload(self,threadName):
+ """redo the upload"""
+ tmp=self.cdli_main.tmpStore2[threadName]
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self)
+ 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'])
+
def uploadATFfinally(self,procedure='',comment="",basketname='',unlock=None,repeat=None,RESPONSE=None):
"""nowupload the files"""
@@ -1697,6 +1900,11 @@ class CDLIRoot(Folder):
if not threadName or threadName=="":
thread=uploadATFfinallyThread()
threadName=thread.getName()[0:]
+
+ if (not hasattr(self,'_v_uploadATF')):
+ self._v_uploadATF={}
+
+
self._v_uploadATF[threadName]=thread
@@ -1750,7 +1958,7 @@ class CDLIRoot(Folder):
obj=self.ZopeFind(root,obj_ids=[folder])
if ext:
- ext.result+="Adding: %s
"%f
+ ext.result+="adding: %s
"%f
if not obj:
manage_addCDLIFileFolder(root,folder,folder)
fobj=getattr(root,folder)
@@ -1814,4 +2022,3 @@ def manage_addCDLIRoot(self, id, title='
if REQUEST is not None:
return self.manage_main(self, REQUEST, update_menu=1)
-