--- cdli/cdli_files.py 2006/06/12 16:46:48 1.18
+++ cdli/cdli_files.py 2006/06/13 18:34:10 1.19
@@ -11,7 +11,260 @@ from OFS.SimpleItem import SimpleItem
import time
from OFS.Folder import manage_addFolder
import re
+from AccessControl import ClassSecurityInfo
+from Acquisition import Implicit
+from threading import Thread
+from ZPublisher.HTTPRequest import HTTPRequest
+from ZPublisher.HTTPResponse import HTTPResponse
+from ZPublisher.BaseRequest import RequestContainer
+global tmpVar
+
+class uploadATFfinallyThread(Thread):
+
+ def __init__(self):
+ self.continueVar=True
+ self.returnValue=None
+ self.end=False
+ Thread.__init__(self)
+
+ def set(self,procedure,comment="",basketname='',unlock=None,SESSION=None,username=None,serverport="8080"):
+ """set values"""
+ self.procedure=procedure
+ self.comment=comment
+ self.basketname=basketname
+ self.unlock=unlock
+ self.SESSION=SESSION
+ self.username=username
+ self.serverport=serverport
+
+ def __call__(self):
+ """wait"""
+ self.run()
+ return True
+
+ def getContext(self, app,serverport="8080"):
+ resp = HTTPResponse(stdout=None)
+ env = {
+ 'SERVER_NAME':'localhost',
+ 'SERVER_PORT':serverport,
+ 'REQUEST_METHOD':'GET'
+ }
+ req = HTTPRequest(None, env, resp)
+ return app.__of__(RequestContainer(REQUEST = req))
+
+
+ def run(self):
+
+ self.result=""
+ from Zope import DB
+ conn = DB.open()
+ root = conn.root()
+ app = root['Application']
+ ctx = self.getContext(app,serverport=self.serverport)
+
+ self.uploadATFfinallyThread(ctx,self.procedure,comment=self.comment,basketname=self.basketname,unlock=self.unlock,SESSION=self.SESSION,username=self.username)
+ get_transaction().commit()
+ conn.close()
+ self.end=True
+ return True
+
+ def getResult(self):
+ return self.result
+
+ def uploadATFfinallyThread(self,ctx,procedure,comment="",basketname='',unlock=None,RESPONSE=None,SESSION=None,username=None):
+ """upload the files"""
+ ctx2=ctx.cdliRoot
+
+ self.result+="
Start processing
"
+ if procedure=="uploadchanged":
+
+ uploadFns=SESSION.get('changed',[])+SESSION.get('newPs',[])
+
+ elif procedure=="uploadAll":
+ uploadFns=[]
+ for x in os.listdir(SESSION['tmpdir']):
+ if not x in SESSION['errors']:
+ uploadFns.append(x)
+ elif procedure=="noupload":
+ return True
+ else:
+ uploadFns=[]
+
+ for fn in uploadFns:
+ 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=file(os.path.join(SESSION['tmpdir'],fn)))
+
+
+
+ newPs=SESSION['newPs']
+ if len(newPs)>0:
+ tmpDir=SESSION['tmpdir']
+ self.result+="
Adding files
"
+ ctx2.cdli_main.importFiles(comment=comment,author=str(username) ,folderName=tmpDir, files=newPs,ext=self)
+
+
+
+ #unlock
+ if unlock:
+ self.result+="Unlock files
"
+ unlockFns=[]
+ for x in os.listdir(SESSION['tmpdir']):
+ if not x in SESSION['errors']:
+ unlockFns.append(x)
+
+ for fn in unlockFns:
+ founds=ctx2.CDLICatalog.search({'title':fn})
+ if len(founds)>0:
+ SESSION['author']=str(username)
+
+ founds[0].getObject().lockedBy=""
+
+ if not (basketname ==''):
+ self.result+="Add basket
"
+ basketId=ctx2.basketContainer.getBasketIdfromName(basketname)
+
+ if not basketId: # create new basket
+ ob=ctx2.basketContainer.addBasket(basketname)
+ basketId=ob.getId()
+ basket=getattr(ctx2.basketContainer,str(basketId))
+ ids=os.listdir(SESSION['tmpdir'])
+ basket.addObjects(ids,deleteOld=True,username=str(username))
+
+ if RESPONSE is not None:
+ RESPONSE.redirect(self.aq_parent.absolute_url())
+
+
+
+ return True
+
+class uploadATFThread(Thread):
+
+ def __init__(self):
+ self.continueVar=True
+ self.returnValue=None
+
+ Thread.__init__(self)
+
+
+ def set(self,upload,basketId,username,serverport="8080"):
+ self.result=""
+ self.upload=upload
+ self.basketId=basketId
+ self.username=username
+ self.serverport=serverport
+
+ def __call__(self):
+ """wait"""
+ self.run()
+ return True
+
+ def getContext(self, app,serverport="8080"):
+ resp = HTTPResponse(stdout=None)
+ env = {
+ 'SERVER_NAME':'localhost',
+ 'SERVER_PORT':serverport,
+ 'REQUEST_METHOD':'GET'
+ }
+ req = HTTPRequest(None, env, resp)
+ return app.__of__(RequestContainer(REQUEST = req))
+
+ def run(self):
+
+ self.result=""
+ from Zope import DB
+ conn = DB.open()
+ root = conn.root()
+ app = root['Application']
+ ctx = self.getContext(app,serverport=self.serverport)
+ self.uploadATFThread(ctx,self.upload,self.basketId)
+
+ while self.continueVar:
+ pass
+ get_transaction().abort()
+ conn.close()
+
+
+ def getResult(self):
+ return self.result
+
+ def uploadATFThread(self,ctx,upload,basketId=0):
+ """upload an atf file"""
+ #TODO: add comments
+ #TODO: finish uploadATF
+ self.result="I am loading your file...
"
+ basketId=str(basketId)
+
+
+ ctx2=ctx.cdliRoot
+ dir=mkdtemp()
+ changed=[]
+ errors=[]
+ newPs=[]
+ psNotInCatalog=[]
+ basketNameFromFile, numberOfFiles=splitatf(upload,dir)
+
+ if basketId == '0':
+ basketObj=ctx2.basketContainer.getActiveBasket()
+ if basketObj:
+ basketId=basketObj.getId()
+
+ if basketId == '0':
+ basketNameFromId=""
+ basketLen=0
+ else:
+ basketNameFromId=getattr(ctx2.basketContainer,basketId).title
+ basketLen=getattr(ctx2.basketContainer,basketId).getLastVersion().numberOfItems()
+
+
+ self.result+="I got the files
I am checking now the files
"
+
+ for fn in os.listdir(dir):
+
+ self.result+="check:%s
"%fn
+
+ if ctx2.cdli_main.checkCatalog(fn):
+ psNotInCatalog.append(fn)
+
+
+ founds=ctx2.CDLICatalog.search({'title':fn})
+
+ if len(founds)==0:
+ newPs.append(fn)
+
+ for found in founds:
+ obj=found.getObject()
+
+ if (not obj.lockedBy=='') and (not obj.lockedBy==self.username):
+ errors.append(obj)
+ else:
+ data=file(os.path.join(dir,fn)).read()
+ diffs=obj.diff(data)
+ if diffs[0]>0:
+ changed.append((obj,diffs))
+ #hochladen
+
+
+ self.result+="Done
"
+
+ self.returnValue={}
+ self.returnValue['changed']=changed
+ self.returnValue['errors']=errors
+ 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
+
+ #ctx2.cdli_main.setTemp('v_uploadATF_returnValue',True)
+
+
class Basket_old(Folder):
"""shopping basket - alte fassung """
@@ -537,7 +790,7 @@ class CDLIBasket(Folder,CatalogAware):
- def addObjects(self,ids,deleteOld=None):
+ def addObjects(self,ids,deleteOld=None,username=None):
"""generate a new version of the basket with objects added"""
lastVersion=self.getLastVersion()
@@ -562,9 +815,11 @@ class CDLIBasket(Folder,CatalogAware):
added+=1
content=oldContent+newContent
-
- user=self.getActualUserName()
-
+ if not username:
+ user=self.getActualUserName()
+ else:
+ user = username
+
ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=content)
return added
@@ -936,14 +1191,22 @@ def splitatf(fh,dir=None):
fh.close()
return ret,len(os.listdir(dir))
+
class CDLIFileFolder(versionedFileFolder):
"""CDLI File Folder"""
+ security=ClassSecurityInfo()
meta_type="CDLI Folder"
filesMetaType=['CDLI file']
folderMetaType=['CDLI Folder']
default_catalog='CDLICatalog'
+ def setTemp(self,name,value):
+ """set tmp"""
+
+ setattr(self,name,value)
+
+
def delete(self,ids):
"""delete this file, i.e. move into a trash folder"""
@@ -976,133 +1239,119 @@ class CDLIFileFolder(versionedFileFolder
def checkCatalog(self,fn):
"""check if fn is in the catalog"""
+ #TODO add checkCatalog
-
- def uploadATF(self,upload,basketId=0,RESPONSE=None):
- """upload an atf file"""
- #TODO: add comments
- #TODO: finish uploadATF
- basketId=str(basketId)
-
-
-
- dir=mkdtemp()
- changed=[]
- errors=[]
- newPs=[]
- psNotInCatalog=[]
- basketNameFromFile, numberOfFiles=splitatf(upload,dir)
-
- if basketId == '0':
- basketObj=self.basketContainer.getActiveBasket()
- if basketObj:
- basketId=basketObj.getId()
-
- if basketId == '0':
- basketNameFromId=""
- basketLen=0
- else:
- basketNameFromId=getattr(self.basketContainer,basketId).title
- basketLen=getattr(self.basketContainer,basketId).getLastVersion().numberOfItems()
+ def refreshTxt(self,txt=""):
+ """txt fuer refresh"""
+
+ return """ 2;url=%s?repeat=%s """%(self.absolute_url()+txt,self.threadName)
+
+
+ def getResult(self):
+ """result of thread"""
+ try:
+ return self._v_uploadATF.getResult()
+ except:
+ return "One moment, please"
+
+ def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None):
+ """standard ausgabe"""
+ #self._v_uploadATF.returnValue=None
+
+ threadName=repeat
+ if not threadName or threadName=="":
+ tmpVar=False
+
+ self._v_uploadATF=uploadATFThread()
+
+ #self._xmltrans.start()
+ #thread=Thread(target=self._v_uploadATF)
+ self._v_uploadATF.set(upload,basketId,self.REQUEST['AUTHENTICATED_USER'],serverport=self.REQUEST['SERVER_PORT'])
+ #thread.start()
+ self._v_uploadATF.start()
+
+
+ self.threadName=self._v_uploadATF.getName()[0:]
+ wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
+
+ if wait_template:
+ return wait_template[0][1]()
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
+ return pt(txt='/uploadATF')
+ #_v_xmltrans.run()
- for fn in os.listdir(dir):
-
- if self.checkCatalog(fn):
- psNotInCatalog.append(fn)
+ else:
+
+ if not self._v_uploadATF.returnValue:
+
+
+ wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
+ if wait_template:
+ return wait_template[0][1]()
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
+
+ return pt(txt='/uploadATF')
- founds=self.CDLICatalog.search({'title':fn})
-
- if len(founds)==0:
- newPs.append(fn)
+ else:
+
+ tmp=self._v_uploadATF.returnValue
+ self._v_uploadATF.continueVar=False
- for found in founds:
- obj=found.getObject()
-
- if (not obj.lockedBy=='') and (not obj.lockedBy==self.REQUEST['AUTHENTICATED_USER']):
- errors.append(obj)
- else:
- data=file(os.path.join(dir,fn)).read()
- diffs=obj.diff(data)
- if diffs[0]>0:
- changed.append((obj,diffs))
- #hochladen
-
- self.REQUEST.SESSION['changed']=[x[0].getId() for x in changed]
- self.REQUEST.SESSION['errors']=[x.getId() for x in errors]
- self.REQUEST.SESSION['newPs']=newPs
- self.REQUEST.SESSION['tmpdir']=dir
-
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self)
- return pt(changed=changed,errors=errors,dir=dir,newPs=newPs,basketLen=basketLen,numberOfFiles=numberOfFiles,
- basketNameFromId=basketNameFromId,basketNameFromFile=basketNameFromFile,basketId=basketId)
-
- def uploadATFfinally(self,procedure,comment="",basketname='',unlock=None,RESPONSE=None):
- """upload the files"""
-
- if procedure=="uploadchanged":
+ 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']
- uploadFns=self.REQUEST.SESSION.get('changed',[])+self.REQUEST.SESSION.get('newPs',[])
-
- elif procedure=="uploadAll":
- uploadFns=[]
- for x in os.listdir(self.REQUEST.SESSION['tmpdir']):
- if not x in self.REQUEST.SESSION['errors']:
- uploadFns.append(x)
- elif procedure=="noupload":
- if RESPONSE is not None:
- RESPONSE.redirect(self.aq_parent.absolute_url())
- return ""
- else:
- return ""
- else:
- uploadFns=[]
+ 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"""
+
+
+
+ threadName=repeat
+ if not threadName or threadName=="":
- for fn in uploadFns:
- founds=self.CDLICatalog.search({'title':fn})
- if len(founds)>0:
- self.REQUEST.SESSION['author']=str(self.REQUEST['AUTHENTICATED_USER'])
+
+ self._v_uploadATF=uploadATFfinallyThread()
+
- founds[0].getObject().manage_addCDLIFileObject('',comment,self.REQUEST.SESSION['author'],file=file(os.path.join(self.REQUEST.SESSION['tmpdir'],fn)))
+ self._v_uploadATF.set(procedure,comment=comment,basketname=basketname,unlock=unlock,SESSION=self.REQUEST.SESSION,username=self.REQUEST['AUTHENTICATED_USER'],serverport=self.REQUEST['SERVER_PORT'])
+
+ self._v_uploadATF.start()
+
+ self.threadName=self._v_uploadATF.getName()[0:]
+ wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
+
+ if wait_template:
+ return wait_template[0][1]()
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
+
+ return pt(txt='/uploadATFfinally')
+ #_v_xmltrans.run()
-
- newPs=self.REQUEST.SESSION['newPs']
- if len(newPs)>0:
- tmpDir=self.REQUEST.SESSION['tmpdir']
-
- self.cdli_main.importFiles(comment=comment,author=str(self.REQUEST['AUTHENTICATED_USER']) ,folderName=tmpDir, files=newPs)
-
-
-
- #unlock
- if unlock:
- unlockFns=[]
- for x in os.listdir(self.REQUEST.SESSION['tmpdir']):
- if not x in self.REQUEST.SESSION['errors']:
- unlockFns.append(x)
-
- for fn in unlockFns:
- founds=self.CDLICatalog.search({'title':fn})
- if len(founds)>0:
- self.REQUEST.SESSION['author']=str(self.REQUEST['AUTHENTICATED_USER'])
-
- founds[0].getObject().lockedBy=""
-
- if not (basketname ==''):
- basketId=self.basketContainer.getBasketIdfromName(basketname)
+ else:
- if not basketId: # create new basket
- ob=self.basketContainer.addBasket(basketname)
- basketId=ob.getId()
- basket=getattr(self.basketContainer,str(basketId))
- ids=os.listdir(self.REQUEST.SESSION['tmpdir'])
- basket.addObjects(ids,deleteOld=True)
+ if hasattr(self,'_v_uploadATF') and (self._v_uploadATF is not None) and (not self._v_uploadATF.end) :
+
+ wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template'])
+ if wait_template:
+ return wait_template[0][1]()
- if RESPONSE is not None:
- RESPONSE.redirect(self.aq_parent.absolute_url())
-
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self)
+ return pt(txt='/uploadATFfinally')
+ else:
+
+ if RESPONSE is not None:
+ RESPONSE.redirect(self.aq_parent.absolute_url())
+
+
+
def findObjectsFromList(self,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None):
"""findObjectsFromList (, TAB oder LINE separated)"""
@@ -1148,9 +1397,9 @@ class CDLIFileFolder(versionedFileFolder
if start:
RESPONSE.redirect("filelist.html?start:int="+str(start))
- print "nothing"
- #security.declareProtected('View','createAllFilesAsSingleFile')
+
+ security.declareProtected('Manage','createAllFilesAsSingleFile')
def createAllFilesAsSingleFile(self,RESPONSE=None):
"""download all files"""
@@ -1227,7 +1476,7 @@ class CDLIFileFolder(versionedFileFolder
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','CDLIFileFolderMain')).__of__(self)
return pt()
- def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/Documents/workspace/cdli/atf", files=None):
+ def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/Documents/workspace/cdli/atf", files=None,ext=None):
"""import files"""
if not files:
@@ -1237,7 +1486,9 @@ class CDLIFileFolder(versionedFileFolder
folder=f[0:3]
f2=f[0:5]
obj=self.ZopeFind(self,obj_ids=[folder])
-
+ if ext:
+
+ ext.result+="Adding: %s
"%f
if not obj:
manage_addCDLIFileFolder(self,folder,folder)
fobj=getattr(self,folder)