--- cdli/cdli_files.py 2006/06/15 20:08:44 1.24 +++ cdli/cdli_files.py 2006/07/14 19:18:48 1.38 @@ -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""" @@ -215,7 +215,7 @@ class uploadATFThread(Thread): ctx = self.getContext(app,serverport=self.serverport) self.uploadATFThread(ctx,self.upload,self.basketId) - ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue + #ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue get_transaction().commit() @@ -233,7 +233,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) @@ -250,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 @@ -269,12 +270,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 @@ -292,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() @@ -558,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""" @@ -575,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": @@ -584,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""" @@ -609,7 +615,7 @@ class CDLIBasketContainer(OrderedFolder) return pt(basketId=basketId,basketName=basketName) - + security.declareProtected('View','index_html') def index_html(self): """stanadard ansicht""" @@ -687,7 +693,7 @@ class CDLIBasketContainer(OrderedFolder) baskets.sort(sortAuthor) elif sortField=='comment': baskets.sort(sortComment) - + print "got the baskets" return baskets @@ -790,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 @@ -844,6 +854,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.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 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""" @@ -879,6 +924,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""" @@ -924,10 +976,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={} @@ -961,11 +1028,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 @@ -1015,8 +1088,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() @@ -1052,13 +1132,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) @@ -1118,7 +1227,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 @@ -1151,7 +1271,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'] @@ -1172,8 +1297,7 @@ class CDLIFile(versionedFile,CatalogAwar - - + positionVersionNum=getattr(self,'positionVersionNum','front') if positionVersionNum=='front': @@ -1185,7 +1309,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: @@ -1193,7 +1317,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() @@ -1201,7 +1327,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] @@ -1230,11 +1359,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+="