--- cdli/cdli_files.py 2007/01/09 16:06:09 1.57
+++ cdli/cdli_files.py 2007/02/02 14:31:49 1.62
@@ -23,6 +23,8 @@ from ZPublisher.BaseRequest import Reque
import threading
from BTrees.OOBTree import OOBTree
import logging
+import transaction
+import copy
def unique(s):
"""Return a list of the elements in s, but without duplicates.
@@ -134,6 +136,7 @@ class uploadATFfinallyThread(Thread):
self.SESSION=SESSION
self.username=username
self.serverport=serverport
+
def __call__(self):
"""call of the thread (equals run)"""
@@ -167,11 +170,11 @@ class uploadATFfinallyThread(Thread):
#add the files
self.uploadATFfinallyThread(ctx,self.procedure,comment=self.comment,basketname=self.basketname,unlock=self.unlock,SESSION=self.SESSION,username=self.username)
#commit the transactions
- get_transaction().commit()
+ transaction.get().commit()
conn.close()
#set flag for end of this method
self.end=True
- print "ended"
+ logging.info("ended")
return True
def __del__(self):
@@ -193,8 +196,8 @@ class uploadATFfinallyThread(Thread):
#shall I only upload the changed files?
if procedure=="uploadchanged":
-
- uploadFns=SESSION.get('changed',[])+SESSION.get('newPs',[])
+ changed=[x[0] for x in SESSION.get('changed',[])]
+ uploadFns=changed+SESSION.get('newPs',[])
#or all
elif procedure=="uploadAll":
@@ -210,14 +213,21 @@ class uploadATFfinallyThread(Thread):
uploadFns=[]
#do first the changed files
+ i=0
for fn in uploadFns:
+ i+=1
founds=ctx2.CDLICatalog.search({'title':fn})
if len(founds)>0:
SESSION['author']=str(username)
self.result+="
Changing : %s"%fn
founds[0].getObject().manage_addCDLIFileObject('',comment,SESSION['author'],file=os.path.join(SESSION['tmpdir'],fn),from_tmp=True)
-
-
+ if i==200:
+ i=0
+ transaction.get().commit()
+ logging.info("changing: do commit")
+ transaction.get().commit()
+ logging.info("changing: last commit")
+
#now add the new files
newPs=SESSION['newPs']
if len(newPs)>0:
@@ -262,7 +272,15 @@ class uploadATFfinallyThread(Thread):
return True
+
+class tmpStore(SimpleItem):
+ """simple item"""
+ meta_type="cdli_upload"
+ def __init__(self,id):
+ """init tmp"""
+ self.id=id
+
class uploadATFThread(Thread):
"""class for checking the files befor uploading"""
@@ -275,13 +293,14 @@ class uploadATFThread(Thread):
Thread.__init__(self)
- def set(self,upload,basketId,username,serverport="8080"):
+ def set(self,upload,basketId,username,idTmp,serverport="8080"):
"""set start values for the thread"""
self.result=""
self.upload=upload
self.basketId=basketId
self.username=username
self.serverport=serverport
+ self.idTmp=idTmp
def __call__(self):
"""call method """
@@ -300,7 +319,7 @@ class uploadATFThread(Thread):
return app.__of__(RequestContainer(REQUEST = req))
def run(self):
-
+ idTmp=self.idTmp
self.result=""
#find context within ZODB
from Zope import DB
@@ -308,14 +327,15 @@ class uploadATFThread(Thread):
root = conn.root()
app = root['Application']
ctx = self.getContext(app,serverport=self.serverport)
- self.uploadATFThread(ctx,self.upload,self.basketId)
+ logging.info("run intern")
+ ctx.temp_folder._setObject(idTmp,tmpStore(idTmp))
+ logging.info("call thread intern")
+ self.uploadATFThread(ctx,self.upload,idTmp,self.basketId)
#ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue
-
- get_transaction().commit()
-
- while self.continueVar:
- pass
+
+
+ transaction.get().commit()
conn.close()
@@ -324,10 +344,13 @@ class uploadATFThread(Thread):
"""method for accessing result"""
return self.result
- def uploadATFThread(self,ctx,upload,basketId=0):
+ def uploadATFThread(self,ctx,upload,idTmp,basketId=0):
"""upload an atf file"""
#TODO: add comments
#TODO: finish uploadATF
+
+ stObj=getattr(ctx.temp_folder,idTmp)
+ logging.info("start, upload thread")
self.result="
I got your file, start now to split it into single atf-files!
"
#make sure that id is a string and not an integer
@@ -366,7 +389,7 @@ class uploadATFThread(Thread):
basketNameFromId=getattr(ctx2.basketContainer,basketId).title
basketLen=getattr(ctx2.basketContainer,basketId).getLastVersion().numberOfItems()
-
+ logging.info("got the file, upload thread")
self.result+="""
I got the files
<
p>I am computing the differences to the exisiting files"""
@@ -411,19 +434,24 @@ class uploadATFThread(Thread):
#ready, set the returnValues
self.result+="Done
"
- self.returnValue={}
- self.returnValue['changed']=changed
- self.returnValue['errors']=errors
- self.returnValue['lockerrors']=lockerrors
- self.returnValue['newPs']=newPs
- self.returnValue['tmpdir']=dir
- self.returnValue['basketLen']=basketLen
- self.returnValue['numberOfFiles']=numberOfFiles
- self.returnValue['basketNameFromId']=basketNameFromId
- self.returnValue['basketNameFromFile']=basketNameFromFile
- self.returnValue['basketId']=basketId
- self.returnValue['dir']=dir
+ stObj.returnValue={}
+ stObj.returnValue['errors']=errors
+
+ stObj.returnValue['newPs']=newPs
+ stObj.returnValue['tmpdir']=dir
+ stObj.returnValue['basketLen']=basketLen
+ stObj.returnValue['numberOfFiles']=numberOfFiles
+ stObj.returnValue['basketNameFromId']=basketNameFromId
+ stObj.returnValue['basketNameFromFile']=basketNameFromFile
+ stObj.returnValue['basketId']=basketId
+ stObj.returnValue['dir']=dir
+ #stObj.returnValue['changed']=copy.copy(changed)
+ stObj.returnValue['changed']=[(x[0].getId(),x[1][0]) for x in changed]
+ #stObj.returnValue['lockerrors']=[x[0].getId() for x in lockerrors]
+ print lockerrors
+ stObj.returnValue['lockerrors']=[x for x in lockerrors]
+ self.returnValue=True
#ctx2.cdli_main.setTemp('v_uploadATF_returnValue',True)
@@ -590,7 +618,7 @@ class BasketObject_old(Folder):
"""unlock all files of the testuser for debuggin"""
for object in self.contents:
- if str(object.lockedBy)=="test":
+ if str(object.lockedBy)=="dahl":
object.lockedBy=""
def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None):
@@ -630,8 +658,8 @@ class BasketObject_old(Folder):
self.temp_folder.downloadCounter+=1
self._p_changed=1
- get_transaction().commit()
-
+
+ transaction.get().commit()
for object in self.contents:
@@ -649,7 +677,8 @@ class BasketObject_old(Folder):
self.REQUEST.RESPONSE.write(ret)
self.temp_folder.downloadCounter-=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
+
def manage_addBasket_oldObjectForm(self):
@@ -1192,17 +1221,17 @@ class CDLIBasketVersion(Implicit,Persist
self.temp_folder.downloadCounterBaskets+=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
if lock:
if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User':
self.temp_folder.downloadCounterBaskets-=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
self.temp_folder.downloadCounterBaskets-=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
return "please login first"
#check if a locked object exist in the basket.
@@ -1222,7 +1251,7 @@ class CDLIBasketVersion(Implicit,Persist
self.temp_folder.downloadCounterBaskets-=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
return pt()
@@ -1252,7 +1281,7 @@ class CDLIBasketVersion(Implicit,Persist
self.temp_folder.downloadCounterBaskets-=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s.atf" """%basket_name)
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
@@ -1675,10 +1704,14 @@ def splitatf(fh,dir=None,ext=None):
if dir:
filename=os.path.join(dir,filename)
nf=file(filename,"w")
+ logging.info("open %s"%filename)
if nf:
nf.write(line.replace("\n","")+"\n")
- nf.close()
+ try:
+ nf.close()
+ except:
+ pass
fh.close()
return ret,len(os.listdir(dir))
@@ -1831,7 +1864,7 @@ class CDLIFileFolder(extVersionedFileFol
self.temp_folder.downloadCounter+=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
list=[(x.getId,x) for x in catalog()]
list.sort(sortF)
@@ -1851,7 +1884,7 @@ class CDLIFileFolder(extVersionedFileFol
RESPONSE.write(obj.getLastVersion().getData()[0:])
self.temp_folder.downloadCounter-=1
self._p_changed=1
- get_transaction().commit()
+ transaction.get().commit()
#os.close(tf)
#RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename)
return True
@@ -2024,7 +2057,7 @@ class CDLIRoot(Folder):
self.lineIndex=li
- get_transaction().commit()
+ transaction.get().commit()
def showFile(self,fileId):
@@ -2106,6 +2139,14 @@ class CDLIRoot(Folder):
"""unquote url"""
return urllib.unquote(str)
+ def URLquote_plus(self,str):
+ """quote url"""
+ return urllib.quote_plus(str)
+
+ def URLunquote_plus(self,str):
+ """unquote url"""
+ return urllib.unquote_plus(str)
+
def forceunlock(self):
"break all locks"
@@ -2116,6 +2157,18 @@ class CDLIRoot(Folder):
if un and un !="":
ret.append((f[0],un))
+ return ret
+
+ def forceDahl(self):
+ "break all locks"
+ ret=[]
+ for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1):
+ if str(f[1].lockedBy)=="dahl":
+ un=f[1].forceunlock()
+
+ if un and un !="":
+ ret.append((f[0],un))
+
return ret
def getChangesByAuthor(self,author,n=100):
@@ -2183,7 +2236,14 @@ class CDLIRoot(Folder):
def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None):
"""standard ausgabe"""
#self._v_uploadATF.returnValue=None
+ from random import randint
+ if (not self.REQUEST.SESSION.get('idTmp',None)):
+ idTmp=str(randint(0,1000000000))
+ self.REQUEST.SESSION['idTmp']=idTmp
+ else:
+ idTmp=self.REQUEST.SESSION.get('idTmp',None)
+
threadName=repeat
if not threadName or threadName=="":
tmpVar=False
@@ -2196,9 +2256,10 @@ class CDLIRoot(Folder):
self._v_uploadATF[threadName]=thread
#self._xmltrans.start()
#thread=Thread(target=self._v_uploadATF)
-
- self._v_uploadATF[threadName].set(upload,basketId,self.REQUEST['AUTHENTICATED_USER'],serverport=self.REQUEST['SERVER_PORT'])
+ logging.info("set thread. extern")
+ self._v_uploadATF[threadName].set(upload,basketId,self.REQUEST['AUTHENTICATED_USER'],idTmp,serverport=self.REQUEST['SERVER_PORT'])
#thread.start()
+ logging.info("start thread. extern")
self._v_uploadATF[threadName].start()
@@ -2220,7 +2281,7 @@ class CDLIRoot(Folder):
if threadName == thread.getName():
self._v_uploadATF[threadName]=thread
- if not self._v_uploadATF[threadName].returnValue:
+ if self._v_uploadATF.get(threadName,None) and (not self._v_uploadATF[threadName].returnValue):
wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
@@ -2243,15 +2304,12 @@ class CDLIRoot(Folder):
#
# #
#tmp=self.cdli_main.tmpStore2[threadName]
- tmp=self._v_uploadATF[threadName].returnValue
- self._v_uploadATF[threadName].continueVar=False
+ tmp=getattr(self.temp_folder,idTmp).returnValue
+
+
- self.REQUEST.SESSION['changed']=[x[0].getId() for x in tmp['changed']]
- self.REQUEST.SESSION['lockerrors']=[x[0].getId() for x in tmp['lockerrors']]
- self.REQUEST.SESSION['errors']=tmp['errors']
- self.REQUEST.SESSION['newPs']=tmp['newPs']
- self.REQUEST.SESSION['tmpdir']=tmp['dir']
+
#del(self.cdli_main.tmpStore2[threadName])
@@ -2283,8 +2341,9 @@ class CDLIRoot(Folder):
self._v_uploadATF[threadName]=thread
-
- self._v_uploadATF[threadName].set(procedure,comment=comment,basketname=basketname,unlock=unlock,SESSION=self.REQUEST.SESSION,username=self.REQUEST['AUTHENTICATED_USER'],serverport=self.REQUEST['SERVER_PORT'])
+ idTmp=self.REQUEST.SESSION['idTmp']
+ stObj=getattr(self.temp_folder,idTmp)
+ self._v_uploadATF[threadName].set(procedure,comment=comment,basketname=basketname,unlock=unlock,SESSION=stObj.returnValue,username=self.REQUEST['AUTHENTICATED_USER'],serverport=self.REQUEST['SERVER_PORT'])
self._v_uploadATF[threadName].start()
@@ -2317,7 +2376,7 @@ class CDLIRoot(Folder):
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
return pt(txt='/uploadATFfinally',threadName=threadName)
else:
-
+ self.REQUEST.SESSION['idTmp']=None
if RESPONSE is not None:
RESPONSE.redirect(self.absolute_url())
@@ -2338,7 +2397,7 @@ class CDLIRoot(Folder):
if not obj:
manage_addCDLIFileFolder(root,folder,folder)
fobj=getattr(root,folder)
- #get_transaction().commit()
+ #transaction.get().commit()
else:
fobj=obj[0][1]
@@ -2366,9 +2425,9 @@ class CDLIRoot(Folder):
if count > 1000:
print "committing"
- get_transaction().commit()
+ transaction.get().commit()
count=0
- get_transaction().commit()
+ transaction.get().commit()
return "ok"
@@ -2388,7 +2447,10 @@ def manage_addCDLIRoot(self, id, title='
ob=CDLIRoot()
ob.id=str(id)
ob.title=title
- self._setObject(id, ob)
+ try:
+ self._setObject(id, ob)
+ except:
+ pass
ob=self._getOb(id)
checkPermission=getSecurityManager().checkPermission