--- cdli/cdli_files.py 2006/06/13 18:34:10 1.19
+++ cdli/cdli_files.py 2006/06/14 18:50:09 1.23
@@ -1,7 +1,7 @@
-"""CDLI extensions of the filearchive"""
+"""CDLI extensions of the filearchive"""
from Products.versionedFile.versionedFile import *
from Products.ZCatalog.CatalogPathAwareness import CatalogAware
-from tempfile import mkstemp,mkdtemp
+from tempfile import mkstemp,mkdtemp
import os.path
import os
from types import *
@@ -17,19 +17,22 @@ from threading import Thread
from ZPublisher.HTTPRequest import HTTPRequest
from ZPublisher.HTTPResponse import HTTPResponse
from ZPublisher.BaseRequest import RequestContainer
+import threading
+
-global tmpVar
class uploadATFfinallyThread(Thread):
-
+ """class for adding uploaded filed (temporarily stored in the staging area at /tmp"""
+
def __init__(self):
+ """init for uploadATFfinallyThread"""
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"""
+ """set start values for the thread"""
self.procedure=procedure
self.comment=comment
self.basketname=basketname
@@ -39,11 +42,13 @@ class uploadATFfinallyThread(Thread):
self.serverport=serverport
def __call__(self):
- """wait"""
+ """call of the thread (equals run)"""
self.run()
return True
def getContext(self, app,serverport="8080"):
+ """get the context within the ZODB"""
+
resp = HTTPResponse(stdout=None)
env = {
'SERVER_NAME':'localhost',
@@ -55,42 +60,61 @@ class uploadATFfinallyThread(Thread):
def run(self):
-
+ """run"""
+
self.result=""
+ #find context within ZODB
from Zope import DB
conn = DB.open()
root = conn.root()
app = root['Application']
ctx = self.getContext(app,serverport=self.serverport)
+ #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()
conn.close()
+ #set flag for end of this method
self.end=True
return True
+ def __del__(self):
+ """delete"""
+
+
+
def getResult(self):
+ """method for accessing result"""
+
return self.result
def uploadATFfinallyThread(self,ctx,procedure,comment="",basketname='',unlock=None,RESPONSE=None,SESSION=None,username=None):
"""upload the files"""
+ #TODO: make this configurable, at the moment, rootFolder for cdli has to be cdliRoot
ctx2=ctx.cdliRoot
self.result+="
Start processing
"
+
+ #shall I only upload the changed files?
if procedure=="uploadchanged":
uploadFns=SESSION.get('changed',[])+SESSION.get('newPs',[])
+ #or all
elif procedure=="uploadAll":
uploadFns=[]
for x in os.listdir(SESSION['tmpdir']):
if not x in SESSION['errors']:
uploadFns.append(x)
+
+ #or maybe nothing
elif procedure=="noupload":
return True
else:
uploadFns=[]
+ #do first the changed files
for fn in uploadFns:
founds=ctx2.CDLICatalog.search({'title':fn})
if len(founds)>0:
@@ -99,16 +123,18 @@ class uploadATFfinallyThread(Thread):
founds[0].getObject().manage_addCDLIFileObject('',comment,SESSION['author'],file=file(os.path.join(SESSION['tmpdir'],fn)))
-
+ #now add the new files
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)
+ #TODO: make this configurable, at the moment base folder for the files has to be cdli_main
+
+ ctx2.importFiles(comment=comment,author=str(username) ,folderName=tmpDir, files=newPs,ext=self)
- #unlock
+ #unlock locked files?
if unlock:
self.result+="Unlock files
"
unlockFns=[]
@@ -123,6 +149,7 @@ class uploadATFfinallyThread(Thread):
founds[0].getObject().lockedBy=""
+ #if a basketname is give, add files to the basket
if not (basketname ==''):
self.result+="Add basket
"
basketId=ctx2.basketContainer.getBasketIdfromName(basketname)
@@ -142,8 +169,11 @@ class uploadATFfinallyThread(Thread):
return True
class uploadATFThread(Thread):
+ """class for checking the files befor uploading"""
def __init__(self):
+ """initialise"""
+
self.continueVar=True
self.returnValue=None
@@ -151,6 +181,7 @@ class uploadATFThread(Thread):
def set(self,upload,basketId,username,serverport="8080"):
+ """set start values for the thread"""
self.result=""
self.upload=upload
self.basketId=basketId
@@ -158,11 +189,12 @@ class uploadATFThread(Thread):
self.serverport=serverport
def __call__(self):
- """wait"""
+ """call method """
self.run()
return True
def getContext(self, app,serverport="8080"):
+ """get the context within the ZODB"""
resp = HTTPResponse(stdout=None)
env = {
'SERVER_NAME':'localhost',
@@ -175,20 +207,24 @@ class uploadATFThread(Thread):
def run(self):
self.result=""
+ #find context within ZODB
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)
+ ctx.cdliRoot.cdli_main.tmpStore=self.returnValue
+ get_transaction().commit()
while self.continueVar:
pass
- get_transaction().abort()
+
conn.close()
-
+
def getResult(self):
+ """method for accessing result"""
return self.result
def uploadATFThread(self,ctx,upload,basketId=0):
@@ -196,22 +232,33 @@ class uploadATFThread(Thread):
#TODO: add comments
#TODO: finish uploadATF
self.result="I am loading your file...
"
+ #make sure that id is a string and not an integer
basketId=str(basketId)
-
+ #TODO: make this configurable, at the moment, rootFolder for cdli has to be cdliRoot
ctx2=ctx.cdliRoot
+
+ #get temporary file for staging the downloaded and splitted files
dir=mkdtemp()
- changed=[]
- errors=[]
- newPs=[]
- psNotInCatalog=[]
+
+
+ changed=[] # changed files
+ errors=[] # files with errors
+ newPs=[] # new p filed
+ psNotInCatalog=[] # files not in the catalog
+
+ #split the uploadedd atf file
basketNameFromFile, numberOfFiles=splitatf(upload,dir)
+ #find basketId if not set
+
+ #get active abaket
if basketId == '0':
basketObj=ctx2.basketContainer.getActiveBasket()
if basketObj:
basketId=basketObj.getId()
+ #if there is no active baske and no basketid given, id is empty, else get besketname and length
if basketId == '0':
basketNameFromId=""
basketLen=0
@@ -221,21 +268,27 @@ class uploadATFThread(Thread):
self.result+="I got the files
I am checking now the files
"
-
+
+ #start to check the files
for fn in os.listdir(dir):
self.result+="check:%s
"%fn
+ # check if file is in the catalog
+ #TODO: checkCatalog is not implemented yet
if ctx2.cdli_main.checkCatalog(fn):
psNotInCatalog.append(fn)
-
+ #check if p-file already at the server
founds=ctx2.CDLICatalog.search({'title':fn})
+ #if not than add filename to the list of newfiles
if len(founds)==0:
newPs.append(fn)
-
+
+ #if p file alread at the server
for found in founds:
+ #analyse the differences to the actual file
obj=found.getObject()
if (not obj.lockedBy=='') and (not obj.lockedBy==self.username):
@@ -247,7 +300,7 @@ class uploadATFThread(Thread):
changed.append((obj,diffs))
#hochladen
-
+ #ready, set the returnValues
self.result+="Done
"
self.returnValue={}
@@ -1133,8 +1186,11 @@ class CDLIFile(versionedFile,CatalogAwar
manage_addCDLIFileObject(self,id,vC,author,file,id,precondition, content_type)
objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion()))
- self.REQUEST.SESSION['objID_parent']=self.getId()
-
+ try:
+ #FIXME: wozu ist das gut?
+ self.REQUEST.SESSION['objID_parent']=self.getId()
+ except:
+ pass
if RESPONSE:
obj=self.ZopeFind(self,obj_ids=[id])[0][1]
if obj.getSize()==0:
@@ -1157,8 +1213,15 @@ def manage_addCDLIFileForm(self):
def manage_addCDLIFile(self,id,title,lockedBy, author=None, RESPONSE=None):
"""add the OSAS_root"""
newObj=CDLIFile(id,title,lockedBy,author)
- self._setObject(id,newObj)
-
+
+ tryToggle=True
+ tryCount=0
+
+
+
+ self._setObject(id,newObj)
+
+
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -1200,7 +1263,7 @@ class CDLIFileFolder(versionedFileFolder
filesMetaType=['CDLI file']
folderMetaType=['CDLI Folder']
default_catalog='CDLICatalog'
-
+ tmpStore=None
def setTemp(self,name,value):
"""set tmp"""
@@ -1241,115 +1304,7 @@ class CDLIFileFolder(versionedFileFolder
"""check if fn is in the catalog"""
#TODO add checkCatalog
- 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()
-
- 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')
-
- else:
-
- tmp=self._v_uploadATF.returnValue
- self._v_uploadATF.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']
-
- 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=="":
-
-
- self._v_uploadATF=uploadATFfinallyThread()
-
-
- 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()
-
- else:
-
- 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]()
-
- 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())
-
@@ -1476,8 +1431,171 @@ class CDLIFileFolder(versionedFileFolder
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','CDLIFileFolderMain')).__of__(self)
return pt()
+
+manage_addCDLIFileFolderForm=DTMLFile('dtml/folderAdd', globals())
+
+
+def manage_addCDLIFileFolder(self, id, title='',
+ createPublic=0,
+ createUserF=0,
+ REQUEST=None):
+ """Add a new Folder object with id *id*.
+
+ If the 'createPublic' and 'createUserF' parameters are set to any true
+ value, an 'index_html' and a 'UserFolder' objects are created respectively
+ in the new folder.
+ """
+ ob=CDLIFileFolder()
+ ob.id=str(id)
+ ob.title=title
+ self._setObject(id, ob)
+ ob=self._getOb(id)
+
+ checkPermission=getSecurityManager().checkPermission
+
+ if createUserF:
+ if not checkPermission('Add User Folders', ob):
+ raise Unauthorized, (
+ 'You are not authorized to add User Folders.'
+ )
+ ob.manage_addUserFolder()
+
+
+ if REQUEST is not None:
+ return self.manage_main(self, REQUEST, update_menu=1)
+
+class CDLIRoot(Folder):
+ """main folder for cdli"""
+
+ meta_type="CDLIRoot"
+
+ 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
+ thread=uploadATFThread()
+ self._v_uploadATF=thread
+ #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()
+
+ else:
+ #recover thread, if lost
+ if not hasattr(self,'_v_uploadATF'):
+ for thread in threading.enumerate():
+ if threadName == thread.getName():
+ self._v_uploadATF=thread
+
+ 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')
+
+ else:
+# tmp={}
+# for key in self._v_uploadATF.returnValue.keys():
+# t=self._v_uploadATF.returnValue[key]
+# if type(t) is ListType:
+# tmp[key]=self._v_uploadATF.returnValue[key][0:]
+# else:
+# tmp[key]=self._v_uploadATF.returnValue[key]
+ tmp=self.cdli_main.tmpStore
+
+ self._v_uploadATF.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']
+
+ 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=="":
+
+
+ self._v_uploadATF=uploadATFfinallyThread()
+
+
+ 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()
+
+ else:
+ #recover thread, if lost
+ if not hasattr(self,'_v_uploadATF'):
+ for thread in threading.enumerate():
+ if threadName == thread.getName():
+ self._v_uploadATF=thread
+
+ 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]()
+
+ 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.absolute_url())
+
def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/Documents/workspace/cdli/atf", files=None,ext=None):
"""import files"""
+ root=self.cdli_main
if not files:
files=os.listdir(folderName)
@@ -1485,14 +1603,14 @@ class CDLIFileFolder(versionedFileFolder
for f in files:
folder=f[0:3]
f2=f[0:5]
- obj=self.ZopeFind(self,obj_ids=[folder])
+ obj=self.ZopeFind(root,obj_ids=[folder])
if ext:
ext.result+="Adding: %s
"%f
if not obj:
- manage_addCDLIFileFolder(self,folder,folder)
- fobj=getattr(self,folder)
-
+ manage_addCDLIFileFolder(root,folder,folder)
+ fobj=getattr(root,folder)
+ #get_transaction().commit()
else:
fobj=obj[0][1]
@@ -1518,11 +1636,12 @@ class CDLIFileFolder(versionedFileFolder
#self.CDLICatalog.manage_catalogObject(self.REQUEST, self.REQUEST.RESPONSE, 'CDLICatalog', urlparse.urlparse(ob.absolute_url())[1])
return "ok"
-
-manage_addCDLIFileFolderForm=DTMLFile('dtml/folderAdd', globals())
+
+
+manage_addCDLIRootForm=DTMLFile('dtml/rootAdd', globals())
-def manage_addCDLIFileFolder(self, id, title='',
+def manage_addCDLIRoot(self, id, title='',
createPublic=0,
createUserF=0,
REQUEST=None):
@@ -1532,7 +1651,7 @@ def manage_addCDLIFileFolder(self, id, t
value, an 'index_html' and a 'UserFolder' objects are created respectively
in the new folder.
"""
- ob=CDLIFileFolder()
+ ob=CDLIRoot()
ob.id=str(id)
ob.title=title
self._setObject(id, ob)
@@ -1549,5 +1668,6 @@ def manage_addCDLIFileFolder(self, id, t
if REQUEST is not None:
- return self.manage_main(self, REQUEST, update_menu=1)
+ return self.manage_main(self, REQUEST, update_menu=1)
+