--- cdli/cdli_files.py 2006/06/14 18:50:09 1.23 +++ cdli/cdli_files.py 2006/07/14 19:08:30 1.37 @@ -18,7 +18,7 @@ from ZPublisher.HTTPRequest import HTTPR from ZPublisher.HTTPResponse import HTTPResponse from ZPublisher.BaseRequest import RequestContainer import threading - + class uploadATFfinallyThread(Thread): @@ -58,7 +58,7 @@ class uploadATFfinallyThread(Thread): req = HTTPRequest(None, env, resp) return app.__of__(RequestContainer(REQUEST = req)) - + def run(self): """run""" @@ -214,7 +214,9 @@ class uploadATFThread(Thread): app = root['Application'] ctx = self.getContext(app,serverport=self.serverport) self.uploadATFThread(ctx,self.upload,self.basketId) - ctx.cdliRoot.cdli_main.tmpStore=self.returnValue + + #ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue + get_transaction().commit() while self.continueVar: @@ -231,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) @@ -248,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 @@ -267,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 @@ -290,8 +294,8 @@ class uploadATFThread(Thread): for found in founds: #analyse the differences to the actual file obj=found.getObject() - - if (not obj.lockedBy=='') and (not obj.lockedBy==self.username): + + if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))): errors.append(obj) else: data=file(os.path.join(dir,fn)).read() @@ -556,6 +560,7 @@ class CDLIBasketContainer(OrderedFolder) security=ClassSecurityInfo() meta_type="CDLIBasketContainer" + security.declareProtected('manage','deleteBaskets') def deleteBaskets(self,ids=None): """delete baskets, i.e. move them into trash folder""" @@ -573,6 +578,7 @@ class CDLIBasketContainer(OrderedFolder) cut=self.manage_cutObjects(ids) trash.manage_pasteObjects(cut) + security.declareProtected('manage','manageBaskets') def manageBaskets(self,ids,submit,REQUEST=None,RESPONSE=None): """manage baskets, delete or copy""" if submit=="delete": @@ -582,6 +588,8 @@ class CDLIBasketContainer(OrderedFolder) if RESPONSE: RESPONSE.redirect(self.absolute_url()) + + security.declareProtected('View','getBasketIdfromName') def getBasketIdfromName(self,basketname): """get id from name""" @@ -607,7 +615,7 @@ class CDLIBasketContainer(OrderedFolder) return pt(basketId=basketId,basketName=basketName) - + security.declareProtected('View','index_html') def index_html(self): """stanadard ansicht""" @@ -685,7 +693,7 @@ class CDLIBasketContainer(OrderedFolder) baskets.sort(sortAuthor) elif sortField=='comment': baskets.sort(sortComment) - + print "got the baskets" return baskets @@ -788,12 +796,16 @@ class CDLIBasket(Folder,CatalogAware): return [x[1].getId() for x in self.getLastVersion().getContent()] + def isActual(self,obj): """teste ob im basket die aktuelle version ist""" actualNo=obj[1].getLastVersion().getVersionNumber() storedNo=obj[0].getVersionNumber() founds=self.CDLICatalog.search({'title':obj[0].getId()}) + if len(founds)>0: + actualNo=founds[0].getObject().getLastVersion().getVersionNumber() + if len(founds)>0 and founds[0].getObject().aq_parent.getId()==".trash": return False, -1 @@ -842,7 +854,39 @@ class CDLIBasket(Folder,CatalogAware): return versions - + def updateObjects(self,ids,RESPONSE=None,REQUEST=None): + """update ids, ids not in the basket the add""" + if type(ids) is not ListType: + ids=[ids] + + lastVersion=self.getLastVersion() + oldContent=lastVersion.basketContent[0:] + newContent=[] + + #first copy the old + for obj in oldContent: + if obj[1].getId() not in ids: + newContent.append(obj) + #now add the new + + for id in ids: + founds=self.CDLICatalog.search({'title':id}) + + for found in founds: + if found.getObject() not in oldContent: + #TODO: was passiert wenn, man eine Object dazufŸgt, das schon da ist aber eine neuere version + newContent.append((found.getObject().getLastVersion(),found.getObject())) + + + content=newContent + user=self.getActualUserName() + + ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=newContent) + + if RESPONSE: + obj=self._getOb(ob.getId()) + RESPONSE.redirect(obj.absolute_url()) + def addObjects(self,ids,deleteOld=None,username=None): """generate a new version of the basket with objects added""" @@ -877,6 +921,13 @@ class CDLIBasket(Folder,CatalogAware): return added + def changeBasket(self,ids,submit,RESPONSE=None,REQUEST=None): + """change a basket""" + if submit=="update": + return self.updateObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST) + elif submit=="delete": + return self.deleteObjects(ids,RESPONSE=RESPONSE,REQUEST=REQUEST) + def deleteObjects(self,ids,RESPONSE=None,REQUEST=None): """delete objects""" @@ -922,10 +973,25 @@ class CDLIBasketVersion(SimpleItem): """version of a basket""" meta_type="CDLIBasketVersion" + security=ClassSecurityInfo() - def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None): - """download all selected files in one file""" + def containsNonActualFiles(self): + """returns True if basket contains one or more non current files""" + objs=self.getContent() + for obj in objs: + if not self.isActual(obj)[0]: + return True + return False + + security.declareProtected('View','downloadObjectsAsOneFile') + def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None,check="yes",current="no"): + """download all selected files in one file""" + + if (check=="yes") and self.containsNonActualFiles(): + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadObjectAsOneFile_check.zpt')).__of__(self) + return pt(lock=lock) + ret="" lockedObjects={} @@ -959,11 +1025,17 @@ class CDLIBasketVersion(SimpleItem): for object in self.basketContent: if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']): - ret+=object[0].data - + if current=="no": #version as they are in the basket + ret+=str(object[0].data)+"\n" + elif current=="yes": + #search current object + founds=self.CDLICatalog.search({'title':object[0].getId()}) + if len(founds)>0: + ret+=str(founds[0].getObject().getLastVersion().data)+"\n" + if lock and object[1].lockedBy=='': object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER'] - + basket_name=self.aq_parent.title+"_V"+self.getId() #write basketname to header of atf file @@ -1013,8 +1085,14 @@ class CDLIBasketVersion(SimpleItem): """get Comment""" return self.comment + security.declareProtected('View','index_html') def index_html(self): """view the basket""" + + if self.REQUEST.get('change',False): + + self.aq_parent.updateObjects(self.REQUEST['change']) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketVersionMain.zpt')).__of__(self) return pt() @@ -1050,13 +1128,42 @@ def manage_addCDLIBasketVersion(self,use else: return ob -class CDLIFileObject(versionedFileObject): +class CDLIFileObject(CatalogAware,versionedFileObject): """CDLI file object""" meta_type="CDLI File Object" + default_catalog='CDLIObjectsCatalog' security=ClassSecurityInfo() + + security.declarePublic('makeThisVersionCurrent') + + def PrincipiaSearchSource(self): + """Return cataloguable key for ourselves.""" + return str(self) + + def makeThisVersionCurrent_html(self): + """form for making this version current""" + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','makeThisVersionCurrent.zpt')).__of__(self) + return pt() + def makeThisVersionCurrent(self,comment,author,RESPONSE=None): + """copy this version to current""" + parent=self.aq_parent + + + newversion=parent.manage_addCDLIFileObject('',comment,author) + newversion.data=self.data[0:] + + if RESPONSE is not None: + RESPONSE.redirect(self.aq_parent.absolute_url()+'/history') + + + return True + + security.declarePublic('view') + def view(self): """view file""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self) @@ -1116,7 +1223,18 @@ class CDLIFile(versionedFile,CatalogAwar meta_type="CDLI file" default_catalog='CDLICatalog' - + #security.declarePublic('history') + def history(self): + """history""" + + ext=self.ZopeFind(self.aq_parent,obj_ids=["history_template.html"]) + if ext: + return getattr(self,ext[0][1].getId())() + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','versionHistory')).__of__(self) + return pt() + + def isContainedInBaskets(self,context=None): """check is this file is part of any basket @@ -1149,7 +1267,12 @@ class CDLIFile(versionedFile,CatalogAwar else: return "Sorry file is locked by somebody else" - def manage_addCDLIFileObject(self,id,vC,author,file='',title='',precondition='', content_type='',changeName='no',newName='', RESPONSE=None): + def manage_addCDLIFileObject(self,id,vC,author, + file='',title='', + precondition='', + content_type='', + changeName='no',newName='', + come_from=None,RESPONSE=None): """add""" try: #TODO: der ganze vC unsinn muss ueberarbeitet werden vC=self.REQUEST['vC'] @@ -1170,8 +1293,7 @@ class CDLIFile(versionedFile,CatalogAwar - - + positionVersionNum=getattr(self,'positionVersionNum','front') if positionVersionNum=='front': @@ -1183,7 +1305,7 @@ class CDLIFile(versionedFile,CatalogAwar else: id=tmp[0]+"_V%i"%self.getVersion() - + manage_addCDLIFileObject(self,id,vC,author,file,id,precondition, content_type) objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) try: @@ -1191,7 +1313,9 @@ class CDLIFile(versionedFile,CatalogAwar self.REQUEST.SESSION['objID_parent']=self.getId() except: pass + if RESPONSE: + obj=self.ZopeFind(self,obj_ids=[id])[0][1] if obj.getSize()==0: self.REQUEST.SESSION['objID']=obj.getId() @@ -1199,7 +1323,10 @@ class CDLIFile(versionedFile,CatalogAwar return pt() else: - RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title) + if come_from and (come_from!=""): + RESPONSE.redirect(come_from+"?change="+self.getId()) + else: + RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title) else: return self.ZopeFind(self,obj_ids=[id])[0][1] @@ -1228,11 +1355,19 @@ def manage_addCDLIFile(self,id,title,loc -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 ','') @@ -1263,7 +1398,9 @@ class CDLIFileFolder(versionedFileFolder filesMetaType=['CDLI file'] folderMetaType=['CDLI Folder'] default_catalog='CDLICatalog' - tmpStore=None + 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""" @@ -1306,14 +1443,34 @@ class CDLIFileFolder(versionedFileFolder - - - def findObjectsFromList(self,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None): + def findObjectsFromListWithVersion(self,list): + """find objects from a list with versions + @param list: list of tuples (cdliFile,version) + """ + + + + #self.REQUEST.SESSION['fileIds']=list#store fieldIds in session for further usage + #self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds'] + + + pt=getattr(self,'filelistVersioned.html') + + return pt(search=list) + + + + def findObjectsFromList(self,enterList=None,display=False,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() + + if enterList: + txt=enterList + + if upload or enterList: txt=txt.replace(",","\n") txt=txt.replace("\t","\n") txt=txt.replace("\r","\n") @@ -1340,14 +1497,25 @@ class CDLIFileFolder(versionedFileFolder if list is not None: # got already a list ret=[] for fileId in list: - if len(fileId.split("."))==1: + if fileId.find("*"): #check for wildcards + fileId=fileId + elif len(fileId.split("."))==1: fileId=fileId+".atf" - + 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)) @@ -1421,7 +1589,7 @@ class CDLIFileFolder(versionedFileFolder len(getattr(self,self.default_catalog)({'path':folder[0]})) )) return ret - + security.declareProtected('View','index_html') def index_html(self): """main""" ext=self.ZopeFind(self,obj_ids=["index.html"]) @@ -1469,19 +1637,82 @@ class CDLIRoot(Folder): meta_type="CDLIRoot" - def refreshTxt(self,txt=""): + def URLquote(self,str): + """quote url""" + return urllib.quote(str) + + def URLunquote(self,str): + """unquote url""" + return urllib.unquote(str) + + + def forceunlock(self): + "break all locks" + ret=[] + for f in self.ZopeFind(self,obj_metatypes="CDLI file",search_sub=1): + un=f[1].forceunlock() + print un + if un and un !="": + ret.append((f[0],un)) + print ret + return ret + + def getChangesByAuthor(self,author,n=100): + """getChangesByAuthor""" + zcat=self.CDLIObjectsCatalog + res=zcat({'lastEditor':author, + 'sort_on':'getTime', + 'sort_order':'descending', + 'sort_limit':n})[:n ] + + return res + + def getChangesByAuthor_html(self,author,n=100): + """html output for changes by author""" + tmp={} + list=[] + for x in self.getChangesByAuthor(author): + nr=x.getObject().getVersionNumber() + id=x.getObject().aq_parent.getId() + #hinzufuegen, wenn Version neuer als die + if tmp.get(id,(0,0))[1] < nr: + tmp[id]=(x.getObject().aq_parent,nr) + + + return self.cdli_main.findObjectsFromListWithVersion(list=tmp.values()) + + 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,self.threadName) + return """ 2;url=%s?repeat=%s """%(self.absolute_url()+txt,threadName) - def getResult(self): + def getResult(self,threadName=None): """result of thread""" try: - return self._v_uploadATF.getResult() + 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 @@ -1489,33 +1720,40 @@ class CDLIRoot(Folder): threadName=repeat if not threadName or threadName=="": tmpVar=False + thread=uploadATFThread() - self._v_uploadATF=thread + 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.set(upload,basketId,self.REQUEST['AUTHENTICATED_USER'],serverport=self.REQUEST['SERVER_PORT']) + self._v_uploadATF[threadName].set(upload,basketId,self.REQUEST['AUTHENTICATED_USER'],serverport=self.REQUEST['SERVER_PORT']) #thread.start() - self._v_uploadATF.start() + self._v_uploadATF[threadName].start() - self.threadName=self._v_uploadATF.getName()[0:] + 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') + return pt(txt='/uploadATF',threadName=threadName) #_v_xmltrans.run() else: #recover thread, if lost - if not hasattr(self,'_v_uploadATF'): + 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=thread - - if not self._v_uploadATF.returnValue: + 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']) @@ -1524,28 +1762,43 @@ class CDLIRoot(Folder): pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadATFWait.zpt')).__of__(self) - return pt(txt='/uploadATF') + return pt(txt='/uploadATF',threadName=threadName) else: # tmp={} -# for key in self._v_uploadATF.returnValue.keys(): -# t=self._v_uploadATF.returnValue[key] +# 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.returnValue[key][0:] +# tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:] # else: -# tmp[key]=self._v_uploadATF.returnValue[key] - tmp=self.cdli_main.tmpStore - - self._v_uploadATF.continueVar=False +# tmp[key]=self._v_uploadATF[threadName].returnValue[key] +# print repr(tmp[key]),repr(key) +# +# # + #tmp=self.cdli_main.tmpStore2[threadName] + tmp=self._v_uploadATF[threadName].returnValue + + #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'] - + #del(self.cdli_main.tmpStore2[threadName]) + print "here the templates" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self) + print "init p" 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 redoUpload(self,threadName): + """redo the upload""" + tmp=self.cdli_main.tmpStore2[threadName] + 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""" @@ -1553,41 +1806,47 @@ class CDLIRoot(Folder): threadName=repeat if not threadName or threadName=="": - - - self._v_uploadATF=uploadATFfinallyThread() + thread=uploadATFfinallyThread() + threadName=thread.getName()[0:] + + if (not hasattr(self,'_v_uploadATF')): + self._v_uploadATF={} + + self._v_uploadATF[threadName]=thread - 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[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.start() + self._v_uploadATF[threadName].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') + 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=thread + self._v_uploadATF[threadName]=thread - if hasattr(self,'_v_uploadATF') and (self._v_uploadATF is not None) and (not self._v_uploadATF.end) : + 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') + return pt(txt='/uploadATFfinally',threadName=threadName) else: if RESPONSE is not None: @@ -1670,4 +1929,3 @@ def manage_addCDLIRoot(self, id, title=' if REQUEST is not None: return self.manage_main(self, REQUEST, update_menu=1) -