--- cdli/cdli_files.py 2006/06/13 20:59:56 1.21 +++ cdli/cdli_files.py 2006/07/18 13:42:52 1.39 @@ -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 * @@ -13,13 +13,35 @@ from OFS.Folder import manage_addFolder import re from AccessControl import ClassSecurityInfo from Acquisition import Implicit +from Globals import Persistent from threading import Thread from ZPublisher.HTTPRequest import HTTPRequest from ZPublisher.HTTPResponse import HTTPResponse from ZPublisher.BaseRequest import RequestContainer import threading -global tmpVar + +class BasketContent(SimpleItem): + """classe fuer den Inhalt eines Baskets""" + + def __init__(self,content=[]): + """content""" + self.contentList=content[0:] + + def getContent(self): + """get content""" + + return self.contentList + + def setContent(self,content): + self.contentList=content[0:] + + def numberOfItems(self): + """number""" + + return len(self.getContent()) + + class uploadATFfinallyThread(Thread): """class for adding uploaded filed (temporarily stored in the staging area at /tmp""" @@ -57,7 +79,7 @@ class uploadATFfinallyThread(Thread): req = HTTPRequest(None, env, resp) return app.__of__(RequestContainer(REQUEST = req)) - + def run(self): """run""" @@ -78,6 +100,11 @@ class uploadATFfinallyThread(Thread): self.end=True return True + def __del__(self): + """delete""" + + + def getResult(self): """method for accessing result""" @@ -123,7 +150,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) @@ -145,7 +173,7 @@ class uploadATFfinallyThread(Thread): #if a basketname is give, add files to the basket if not (basketname ==''): self.result+="Add basket
" - basketId=ctx2.basketContainer.getBasketIdfromName(basketname) + basketId=ctx2.basketContainer.ketIdfromName(basketname) if not basketId: # create new basket ob=ctx2.basketContainer.addBasket(basketname) @@ -207,12 +235,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 +254,8 @@ class uploadATFThread(Thread): """upload an atf file""" #TODO: add comments #TODO: finish uploadATF - self.result="" + #make sure that id is a string and not an integer basketId=str(basketId) @@ -239,7 +272,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 +291,13 @@ class uploadATFThread(Thread): basketLen=getattr(ctx2.basketContainer,basketId).getLastVersion().numberOfItems() - self.result+="
I am checking now the files
" + self.result+="""check:%s
"%fn + self.result+="process:%s
"%fn # check if file is in the catalog #TODO: checkCatalog is not implemented yet @@ -281,8 +315,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() @@ -433,7 +467,9 @@ class BasketObject_old(Folder): def numberOfItems(self): """return anzahl der elemente im basket""" - return len(self.contents) + num=len(self.contents) + + return num def addObjects(self,ids): """addObjects""" @@ -547,6 +583,15 @@ class CDLIBasketContainer(OrderedFolder) security=ClassSecurityInfo() meta_type="CDLIBasketContainer" + def upDateBaskets(self): + """update content in to objects""" + + founds=self.ZopeFind(self,obj_metatypes=['CDLIBasketVersion'],search_sub=1) + + for found in founds: + found[1].updateBasket() + + security.declareProtected('manage','deleteBaskets') def deleteBaskets(self,ids=None): """delete baskets, i.e. move them into trash folder""" @@ -564,6 +609,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": @@ -573,6 +619,8 @@ class CDLIBasketContainer(OrderedFolder) if RESPONSE: RESPONSE.redirect(self.absolute_url()) + + security.declareProtected('View','getBasketIdfromName') def getBasketIdfromName(self,basketname): """get id from name""" @@ -598,7 +646,7 @@ class CDLIBasketContainer(OrderedFolder) return pt(basketId=basketId,basketName=basketName) - + security.declareProtected('View','index_html') def index_html(self): """stanadard ansicht""" @@ -768,6 +816,7 @@ class CDLIBasket(Folder,CatalogAware): meta_type="CDLIBasket" default_catalog="CDLIBasketCatalog" + def getFile(self,obj): return obj[1] @@ -779,12 +828,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 @@ -819,12 +872,22 @@ class CDLIBasket(Folder,CatalogAware): def getLastVersion(self): """hole letzte version""" - ids=[int(x[0]) for x in self.ZopeFind(self,obj_metatypes=["CDLIBasketVersion"])] + + ids=[] + idsTmp= self.objectIds() + for x in idsTmp: + try: + ids.append(int(x)) + except: + pass ids.sort() + if len(ids)==0: return None else: ob=getattr(self,str(ids[-1])) + + return ob def getVersions(self): @@ -833,6 +896,41 @@ 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.content.getContent() + 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 dazufgt, 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) + + obj=self._getOb(ob.getId()) + if RESPONSE: + + RESPONSE.redirect(obj.absolute_url()) + + return obj def addObjects(self,ids,deleteOld=None,username=None): """generate a new version of the basket with objects added""" @@ -842,7 +940,7 @@ class CDLIBasket(Folder,CatalogAware): if lastVersion is None: oldContent=[] else: - oldContent=lastVersion.basketContent[0:] + oldContent=lastVersion.content.getContent() if deleteOld: oldContent=[] @@ -868,6 +966,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""" @@ -875,7 +980,7 @@ class CDLIBasket(Folder,CatalogAware): ids=[ids] lastVersion=self.getLastVersion() - oldContent=lastVersion.basketContent[0:] + oldContent=lastVersion.content.getContent() newContent=[] for obj in oldContent: if obj[1].getId() not in ids: @@ -909,14 +1014,42 @@ def manage_addCDLIBasket(self,title,shor else: return ob -class CDLIBasketVersion(SimpleItem): +class CDLIBasketVersion(Implicit,Persistent,Folder): """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 updateBasket(self): + """update""" + try: + self._setObject('content',BasketContent(self.basketContent)) + except: + try: + if len(self.basketContent)>0: + self.content.setContent(self.basketContent) + except: + print "error",self.getId(),self.aq_parent.getId() + self.basketContent=[] + + + 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={} @@ -929,7 +1062,7 @@ class CDLIBasketVersion(SimpleItem): #check if a locked object exist in the basket. lockedObjects={} - for object in self.basketContent: + for object in self.content.getContent(): if not object[1].lockedBy=="": lockedObjects[object[1].title]=repr(object[1].lockedBy) @@ -947,14 +1080,20 @@ class CDLIBasketVersion(SimpleItem): procedure="downloadAll" - for object in self.basketContent: + for object in self.content.getContent(): 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 @@ -969,7 +1108,7 @@ class CDLIBasketVersion(SimpleItem): def numberOfItems(self): """return anzahl der elemente im basket""" - return len(self.basketContent) + return self.content.numberOfItems() def getTime(self): """getTime""" @@ -985,14 +1124,15 @@ class CDLIBasketVersion(SimpleItem): def getContent(self): """get Basket Content""" - return self.basketContent + return self.content.getContent() def __init__(self,id,user,comment="",basketContent=[]): """ init a basket version""" self.id=id self.coment=comment - self.basketContent=basketContent[0:] + self._setObject('content',BasketContent(basketContent)) + #self.basketContent=basketContent[0:]a self.user=user self.time=time.localtime() @@ -1004,8 +1144,15 @@ 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): + ob=self.aq_parent.updateObjects(self.REQUEST['change']) + + self.REQUEST.RESPONSE.redirect(ob.absolute_url())#go to new basket, because changing generates a new basket + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketVersionMain.zpt')).__of__(self) return pt() @@ -1041,13 +1188,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) @@ -1107,7 +1283,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 @@ -1140,7 +1327,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'] @@ -1161,8 +1353,7 @@ class CDLIFile(versionedFile,CatalogAwar - - + positionVersionNum=getattr(self,'positionVersionNum','front') if positionVersionNum=='front': @@ -1174,12 +1365,17 @@ 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())) - 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: self.REQUEST.SESSION['objID']=obj.getId() @@ -1187,7 +1383,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] @@ -1201,19 +1400,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+="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 +1955,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 +1970,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 +1987,5 @@ 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) +