--- cdli/cdli_files.py 2006/06/13 20:59:56 1.21 +++ cdli/cdli_files.py 2006/06/15 22:02:40 1.25 @@ -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 * @@ -18,7 +18,8 @@ from ZPublisher.HTTPRequest import HTTPR 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""" @@ -78,6 +79,11 @@ class uploadATFfinallyThread(Thread): self.end=True return True + def __del__(self): + """delete""" + + + def getResult(self): """method for accessing result""" @@ -123,7 +129,8 @@ class uploadATFfinallyThread(Thread): 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) + + ctx2.importFiles(comment=comment,author=str(username) ,folderName=tmpDir, files=newPs,ext=self) @@ -207,12 +214,16 @@ class uploadATFThread(Thread): app = root['Application'] ctx = self.getContext(app,serverport=self.serverport) self.uploadATFThread(ctx,self.upload,self.basketId) + + ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue + + get_transaction().commit() while self.continueVar: pass - get_transaction().abort() + conn.close() - print "done" + def getResult(self): """method for accessing result""" @@ -222,7 +233,8 @@ class uploadATFThread(Thread): """upload an atf file""" #TODO: add comments #TODO: finish uploadATF - self.result="

I am loading your file...

" + 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 basketId=str(basketId) @@ -239,7 +251,7 @@ class uploadATFThread(Thread): psNotInCatalog=[] # files not in the catalog #split the uploadedd atf file - basketNameFromFile, numberOfFiles=splitatf(upload,dir) + basketNameFromFile, numberOfFiles=splitatf(upload,dir,ext=self) #find basketId if not set @@ -258,12 +270,13 @@ class uploadATFThread(Thread): basketLen=getattr(ctx2.basketContainer,basketId).getLastVersion().numberOfItems() - self.result+="

I got the files

I am checking now the files

" + self.result+="""

I got the files

< + p>I am computing the differences to the exisiting files

""" #start to check the files for fn in os.listdir(dir): - self.result+="

check:%s

"%fn + self.result+="

process:%s

"%fn # check if file is in the catalog #TODO: checkCatalog is not implemented yet @@ -1041,10 +1054,11 @@ def manage_addCDLIBasketVersion(self,use else: return ob -class CDLIFileObject(versionedFileObject): +class CDLIFileObject(versionedFileObject,CatalogAware): """CDLI file object""" meta_type="CDLI File Object" + default_catalog='CDLIObjectsCatalog' security=ClassSecurityInfo() @@ -1177,8 +1191,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: @@ -1201,19 +1218,34 @@ 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') -def splitatf(fh,dir=None): +def splitatf(fh,dir=None,ext=None): """split it""" ret=None nf=None + i=0 for line in fh.readlines(): + if ext: + i+=1 + if (i%100)==0: + ext.result+="." + if i==10000: + i=0 + ext.result+="
" #check if basket name is in the first line if line.find("#atf basket")>=0: ret=line.replace('#atf basket ','') @@ -1244,7 +1276,9 @@ class CDLIFileFolder(versionedFileFolder filesMetaType=['CDLI file'] folderMetaType=['CDLI Folder'] default_catalog='CDLICatalog' + defaultFileCatalog=default_catalog #wenn dieses definiert ist, wird beim hinzufŸgen einer neuen version eines files dieser catalog neuiniziert + tmpStore2={} def setTemp(self,name,value): """set tmp""" @@ -1285,128 +1319,11 @@ 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 - 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()) - - def findObjectsFromList(self,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None): + def findObjectsFromList(self,display=False,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None): """findObjectsFromList (, TAB oder LINE separated)""" @@ -1443,9 +1360,18 @@ class CDLIFileFolder(versionedFileFolder ret+=self.CDLICatalog({'title':fileId}) #TODO: get rid of one of these.. - self.REQUEST.SESSION['fileIds']=[x.getObject().getId() for x in ret]#store fieldIds in session for further usage + ids=[x.getObject().getId() for x in ret] + self.REQUEST.SESSION['fileIds']=ids#store fieldIds in session for further usage self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds'] - return ret + + if display: + pt=getattr(self,'filelist.html') + + return pt(search=ids) + else: + return ret + + if start: RESPONSE.redirect("filelist.html?start:int="+str(start)) @@ -1529,8 +1455,208 @@ 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 getChangesByAuthor(self,author): + """getChangesByAuthor""" + zcat=self.CDLICatalog + return zcat({'lastEditor':author, + 'sort_on':'getTime', + 'sort_order':'descending', + 'sort_limit':n})[:n ] + + def getLastChanges(self,n=100): + """get the last n changes""" + n=int(n) + zcat=self.CDLICatalog + return zcat({'sort_on':'getLastChangeDate', + 'sort_order':'descending', + 'sort_limit':n})[:n ] + + + def getLastChanges_html(self,n=100): + """get the last n changes""" + list = [x.getId for x in self.getLastChanges(n)] + return self.cdli_main.findObjectsFromList(list=list,display=True) + + def refreshTxt(self,txt="",threadName=None): + """txt fuer refresh""" + + return """ 2;url=%s?repeat=%s """%(self.absolute_url()+txt,threadName) + + + def getResult(self,threadName=None): + """result of thread""" + try: + return self._v_uploadATF[threadName].getResult() + except: + return "One moment, please" + + + def checkThreads(self): + """check threads""" + return threading.enumerate() + + 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() + threadName=thread.getName()[0:] + if not hasattr(self,'_v_uploadATF'): + self._v_uploadATF={} + + 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']) + #thread.start() + self._v_uploadATF[threadName].start() + + + self.threadName=self._v_uploadATF[threadName].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',threadName=threadName) + #_v_xmltrans.run() + + else: + #recover thread, if lost + if not hasattr(self,'_v_uploadATF'): + self._v_uploadATF={} + if not self._v_uploadATF.get(threadName,None): + for thread in threading.enumerate(): + if threadName == thread.getName(): + self._v_uploadATF[threadName]=thread + + if not self._v_uploadATF[threadName].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',threadName=threadName) + + else: +# tmp={} +# for key in self._v_uploadATF[threadName].returnValue.keys(): +# t=self._v_uploadATF[threadName].returnValue[key] +# if type(t) is ListType: +# tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:] +# else: +# tmp[key]=self._v_uploadATF[threadName].returnValue[key] + + tmp=self.cdli_main.tmpStore2[threadName] + del(self.cdli_main.tmpStore2[threadName]) + self._v_uploadATF[threadName].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=="": + thread=uploadATFfinallyThread() + threadName=thread.getName()[0:] + 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']) + + self._v_uploadATF[threadName].start() + + + + 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',threadName=threadName) + #_v_xmltrans.run() + + else: + #recover thread, if lost + if not hasattr(self,'_v_uploadATF'): + self._v_uploadATF={} + if not self._v_uploadATF.get(threadName,None): + for thread in threading.enumerate(): + if threadName == thread.getName(): + self._v_uploadATF[threadName]=thread + + if self._v_uploadATF.get(threadName,None) and (self._v_uploadATF[threadName] is not None) and (not self._v_uploadATF[threadName].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',threadName=threadName) + 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) @@ -1538,14 +1664,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] @@ -1571,11 +1697,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): @@ -1585,7 +1712,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) @@ -1602,5 +1729,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) +