version 1.21, 2006/06/13 20:59:56
|
version 1.22, 2006/06/14 18:43:38
|
Line 18 from ZPublisher.HTTPRequest import HTTPR
|
Line 18 from ZPublisher.HTTPRequest import HTTPR
|
from ZPublisher.HTTPResponse import HTTPResponse |
from ZPublisher.HTTPResponse import HTTPResponse |
from ZPublisher.BaseRequest import RequestContainer |
from ZPublisher.BaseRequest import RequestContainer |
import threading |
import threading |
global tmpVar |
|
|
|
|
|
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 78 class uploadATFfinallyThread(Thread):
|
Line 79 class uploadATFfinallyThread(Thread):
|
self.end=True |
self.end=True |
return True |
return True |
|
|
|
def __del__(self): |
|
"""delete""" |
|
|
|
|
|
|
def getResult(self): |
def getResult(self): |
"""method for accessing result""" |
"""method for accessing result""" |
|
|
Line 123 class uploadATFfinallyThread(Thread):
|
Line 129 class uploadATFfinallyThread(Thread):
|
tmpDir=SESSION['tmpdir'] |
tmpDir=SESSION['tmpdir'] |
self.result+="<p>Adding files</p>" |
self.result+="<p>Adding files</p>" |
#TODO: make this configurable, at the moment base folder for the files has to be cdli_main |
#TODO: make this configurable, at the moment base folder for the files has to be cdli_main |
ctx2.cdli_main.importFiles(comment=comment,author=str(username) ,folderName=tmpDir, files=newPs,ext=self) |
|
|
ctx2.importFiles(comment=comment,author=str(username) ,folderName=tmpDir, files=newPs,ext=self) |
|
|
|
|
|
|
Line 207 class uploadATFThread(Thread):
|
Line 214 class uploadATFThread(Thread):
|
app = root['Application'] |
app = root['Application'] |
ctx = self.getContext(app,serverport=self.serverport) |
ctx = self.getContext(app,serverport=self.serverport) |
self.uploadATFThread(ctx,self.upload,self.basketId) |
self.uploadATFThread(ctx,self.upload,self.basketId) |
|
ctx.cdliRoot.cdli_main.tmpStore=self.returnValue |
|
get_transaction().commit() |
|
|
while self.continueVar: |
while self.continueVar: |
pass |
pass |
get_transaction().abort() |
|
conn.close() |
conn.close() |
print "done" |
|
|
|
def getResult(self): |
def getResult(self): |
"""method for accessing result""" |
"""method for accessing result""" |
Line 1177 class CDLIFile(versionedFile,CatalogAwar
|
Line 1186 class CDLIFile(versionedFile,CatalogAwar
|
|
|
manage_addCDLIFileObject(self,id,vC,author,file,id,precondition, content_type) |
manage_addCDLIFileObject(self,id,vC,author,file,id,precondition, content_type) |
objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) |
objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) |
|
try: |
|
#FIXME: wozu ist das gut? |
self.REQUEST.SESSION['objID_parent']=self.getId() |
self.REQUEST.SESSION['objID_parent']=self.getId() |
|
except: |
|
pass |
if RESPONSE: |
if RESPONSE: |
obj=self.ZopeFind(self,obj_ids=[id])[0][1] |
obj=self.ZopeFind(self,obj_ids=[id])[0][1] |
if obj.getSize()==0: |
if obj.getSize()==0: |
Line 1201 def manage_addCDLIFileForm(self):
|
Line 1213 def manage_addCDLIFileForm(self):
|
def manage_addCDLIFile(self,id,title,lockedBy, author=None, RESPONSE=None): |
def manage_addCDLIFile(self,id,title,lockedBy, author=None, RESPONSE=None): |
"""add the OSAS_root""" |
"""add the OSAS_root""" |
newObj=CDLIFile(id,title,lockedBy,author) |
newObj=CDLIFile(id,title,lockedBy,author) |
|
|
|
tryToggle=True |
|
tryCount=0 |
|
|
|
|
|
|
self._setObject(id,newObj) |
self._setObject(id,newObj) |
|
# try: |
|
# self._setObject(id,newObj) |
|
# tryToggle=False |
|
# except: |
|
# while tryToggle and (tryCount < 10): |
|
# try: |
|
# #get_transaction().commit() |
|
# self._setObject(id,newObj) |
|
# tryToggle=False |
|
# |
|
# except: |
|
# time.sleep(10) |
|
# tryCount+=1 |
|
#no successfull adding |
|
if tryToggle: |
|
print "ERROR",id |
|
|
|
|
if RESPONSE is not None: |
if RESPONSE is not None: |
RESPONSE.redirect('manage_main') |
RESPONSE.redirect('manage_main') |
Line 1244 class CDLIFileFolder(versionedFileFolder
|
Line 1279 class CDLIFileFolder(versionedFileFolder
|
filesMetaType=['CDLI file'] |
filesMetaType=['CDLI file'] |
folderMetaType=['CDLI Folder'] |
folderMetaType=['CDLI Folder'] |
default_catalog='CDLICatalog' |
default_catalog='CDLICatalog' |
|
tmpStore=None |
def setTemp(self,name,value): |
def setTemp(self,name,value): |
"""set tmp""" |
"""set tmp""" |
|
|
Line 1285 class CDLIFileFolder(versionedFileFolder
|
Line 1320 class CDLIFileFolder(versionedFileFolder
|
"""check if fn is in the catalog""" |
"""check if fn is in the catalog""" |
#TODO add checkCatalog |
#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 |
|
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=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: |
|
#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.aq_parent.absolute_url()) |
|
|
|
|
|
|
|
Line 1529 class CDLIFileFolder(versionedFileFolder
|
Line 1447 class CDLIFileFolder(versionedFileFolder
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','CDLIFileFolderMain')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','CDLIFileFolderMain')).__of__(self) |
return pt() |
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): |
def importFiles(self,comment="",author="" ,folderName="/Users/dwinter/Documents/workspace/cdli/atf", files=None,ext=None): |
"""import files""" |
"""import files""" |
|
root=self.cdli_main |
|
|
if not files: |
if not files: |
files=os.listdir(folderName) |
files=os.listdir(folderName) |
Line 1538 class CDLIFileFolder(versionedFileFolder
|
Line 1619 class CDLIFileFolder(versionedFileFolder
|
for f in files: |
for f in files: |
folder=f[0:3] |
folder=f[0:3] |
f2=f[0:5] |
f2=f[0:5] |
obj=self.ZopeFind(self,obj_ids=[folder]) |
obj=self.ZopeFind(root,obj_ids=[folder]) |
if ext: |
if ext: |
|
|
ext.result+="<p>Adding: %s </p>"%f |
ext.result+="<p>Adding: %s </p>"%f |
if not obj: |
if not obj: |
manage_addCDLIFileFolder(self,folder,folder) |
manage_addCDLIFileFolder(root,folder,folder) |
fobj=getattr(self,folder) |
fobj=getattr(root,folder) |
|
#get_transaction().commit() |
else: |
else: |
fobj=obj[0][1] |
fobj=obj[0][1] |
|
|
Line 1572 class CDLIFileFolder(versionedFileFolder
|
Line 1653 class CDLIFileFolder(versionedFileFolder
|
|
|
return "ok" |
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, |
createPublic=0, |
createUserF=0, |
createUserF=0, |
REQUEST=None): |
REQUEST=None): |
Line 1585 def manage_addCDLIFileFolder(self, id, t
|
Line 1667 def manage_addCDLIFileFolder(self, id, t
|
value, an 'index_html' and a 'UserFolder' objects are created respectively |
value, an 'index_html' and a 'UserFolder' objects are created respectively |
in the new folder. |
in the new folder. |
""" |
""" |
ob=CDLIFileFolder() |
ob=CDLIRoot() |
ob.id=str(id) |
ob.id=str(id) |
ob.title=title |
ob.title=title |
self._setObject(id, ob) |
self._setObject(id, ob) |
Line 1604 def manage_addCDLIFileFolder(self, id, t
|
Line 1686 def manage_addCDLIFileFolder(self, id, t
|
if REQUEST is not None: |
if REQUEST is not None: |
return self.manage_main(self, REQUEST, update_menu=1) |
return self.manage_main(self, REQUEST, update_menu=1) |
|
|
|
|