--- cdli/cdli_files.py 2006/03/19 03:27:21 1.12 +++ cdli/cdli_files.py 2006/06/13 20:59:56 1.21 @@ -11,7 +11,304 @@ 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 +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 start values for the thread""" + self.procedure=procedure + self.comment=comment + self.basketname=basketname + self.unlock=unlock + self.SESSION=SESSION + self.username=username + self.serverport=serverport + + def __call__(self): + """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', + 'SERVER_PORT':serverport, + 'REQUEST_METHOD':'GET' + } + req = HTTPRequest(None, env, resp) + return app.__of__(RequestContainer(REQUEST = req)) + + + 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 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: + 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))) + + + #now add the new files + newPs=SESSION['newPs'] + if len(newPs)>0: + tmpDir=SESSION['tmpdir'] + self.result+="

Adding files

" + #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) + + + + #unlock locked files? + 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 a basketname is give, add files to the basket + 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): + """class for checking the files befor uploading""" + + def __init__(self): + """initialise""" + + self.continueVar=True + self.returnValue=None + + Thread.__init__(self) + + + def set(self,upload,basketId,username,serverport="8080"): + """set start values for the thread""" + self.result="" + self.upload=upload + self.basketId=basketId + self.username=username + self.serverport=serverport + + def __call__(self): + """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', + 'SERVER_PORT':serverport, + 'REQUEST_METHOD':'GET' + } + req = HTTPRequest(None, env, resp) + return app.__of__(RequestContainer(REQUEST = req)) + + 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) + + while self.continueVar: + pass + get_transaction().abort() + conn.close() + print "done" + + def getResult(self): + """method for accessing result""" + 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...

" + #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=[] # 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 + 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

" + + #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): + 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 + + #ready, set the returnValues + 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 """ @@ -131,8 +428,8 @@ class BasketObject_old(Folder): meta_type="basketObject" def __init__(self): - """init basket object""" - self.contents=[] + """init basket object""" + self.contents=[] def numberOfItems(self): """return anzahl der elemente im basket""" @@ -152,9 +449,9 @@ class BasketObject_old(Folder): return True def index_html(self): - """view the basket""" - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','basketObject_index_html.zpt')).__of__(self) - return pt() + """view the basket""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','basketObject_index_html.zpt')).__of__(self) + return pt() def deleteObjects(self,ids,RESPONSE=None): """delete objects""" @@ -166,7 +463,7 @@ class BasketObject_old(Folder): if RESPONSE: - RESPONSE.redirect(self.absolute_url()) + RESPONSE.redirect(self.absolute_url()) def unlockTest(self): @@ -208,7 +505,7 @@ class BasketObject_old(Folder): elif not procedure: #keine fails gesperrt dann alle donwloaden procedure="downloadAll" - print procedure + for object in self.contents: if (procedure=="downloadAll") or (object.lockedBy=='') or (object.lockedBy==self.REQUEST['AUTHENTICATED_USER']): @@ -537,7 +834,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 +859,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 @@ -757,8 +1056,12 @@ class CDLIFileObject(versionedFileObject security.declarePublic('getDesignation') def getDesignation(self): """get the designation out of the file""" - txt=re.search("&[Pp](.*)= (.*)",self.data) - + try: + txt=re.match("&[Pp](\d*)\s*=([^\r\n]*)",self.data[0:]) + except: + txt=self.data[0:] + + return "ERROR" try: return txt.group(2) except: @@ -932,14 +1235,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""" @@ -970,122 +1281,135 @@ class CDLIFileFolder(versionedFileFolder return ret - - 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=[] - basketNameFromFile, numberOfFiles=splitatf(upload,dir) + def checkCatalog(self,fn): + """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 + 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: - if basketId == '0': - basketObj=self.basketContainer.getActiveBasket() - if basketObj: - basketId=basketObj.getId() + + wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template']) + if wait_template: + return wait_template[0][1]() - if basketId == '0': - basketNameFromId="" - basketLen=0 - else: - basketNameFromId=getattr(self.basketContainer,basketId).title - basketLen=getattr(self.basketContainer,basketId).getLastVersion().numberOfItems() - - - for fn in os.listdir(dir): - founds=self.CDLICatalog.search({'title':fn}) - - if len(founds)==0: - newPs.append(fn) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self) + + return pt(txt='/uploadATF') - 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 + 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=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": - uploadFns=self.REQUEST.SESSION['changed']+self.REQUEST.SESSION['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) - 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))) - - - newPs=self.REQUEST.SESSION['newPs'] - if len(newPs)>0: - tmpDir=self.REQUEST.SESSION['tmpdir'] + 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() - self.cdli_main.importFiles(comment=comment,author=str(self.REQUEST['AUTHENTICATED_USER']) ,folderName=tmpDir, files=newPs) + 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]() - - - #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) - - 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) + 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()) - 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)""" + + if upload: # list from file upload txt=upload.read() txt=txt.replace(",","\n") @@ -1111,7 +1435,7 @@ class CDLIFileFolder(versionedFileFolder pt=getattr(self,'filelist.html') return pt(basketName=basketName,numberOfObjects=numberOfObjects) - if list: # got already a list + if list is not None: # got already a list ret=[] for fileId in list: if len(fileId.split("."))==1: @@ -1125,7 +1449,10 @@ class CDLIFileFolder(versionedFileFolder if start: RESPONSE.redirect("filelist.html?start:int="+str(start)) - + + + + security.declareProtected('Manage','createAllFilesAsSingleFile') def createAllFilesAsSingleFile(self,RESPONSE=None): """download all files""" @@ -1149,7 +1476,7 @@ class CDLIFileFolder(versionedFileFolder #os.write(tf,obj.getLastVersion().data) if RESPONSE: - RESPONSE.write(obj.getLastVersion().data) + RESPONSE.write(obj.getLastVersion().data[0:]) #os.close(tf) #RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename) return True @@ -1202,7 +1529,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: @@ -1212,7 +1539,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) @@ -1275,4 +1604,3 @@ def manage_addCDLIFileFolder(self, id, t if REQUEST is not None: return self.manage_main(self, REQUEST, update_menu=1) -