--- cdli/cdli_files.py 2005/12/08 17:11:31 1.3 +++ cdli/cdli_files.py 2006/03/28 15:10:02 1.13 @@ -6,22 +6,27 @@ import os.path import os from types import * import urlparse +from OFS.OrderedFolder import OrderedFolder +from OFS.SimpleItem import SimpleItem +import time +from OFS.Folder import manage_addFolder +import re -class Basket(Folder): - """shopping basket""" +class Basket_old(Folder): + """shopping basket - alte fassung """ meta_type="Basket" _v_stack={} def getObjUrl(self,objId): """getUrl""" - founds=self.CDLICatalog.search({'path':objId}) + founds=self.CDLICatalog.search({'title':objId}) if len(founds)>0: return founds[0].getObject().absolute_url() - else: #assume version + else: #assume version number splitted=objId.split("_") - founds=self.CDLICatalog.search({'path':splitted[1]}) + founds=self.CDLICatalog.search({'title':splitted[1]}) return founds[0].getObject().absolute_url()+'/'+objId def storeAllLink(self,results): @@ -89,7 +94,7 @@ class Basket(Folder): user=self.REQUEST.SESSION.get('basketUser',None) if not user: - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','authorizeBasketUser.zpt')).__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','orizeBasketUser.zpt')).__of__(self) return pt() else: baskets=self.ZopeFind(self,obj_ids=[user]) @@ -103,12 +108,12 @@ class Basket(Folder): return pt() -def manage_addBasketForm(self): +def manage_addBasket_oldForm(self): """add the basket form""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addBasket.zpt')).__of__(self) return pt() -def manage_addBasket(self,id,title,RESPONSE=None): +def manage_addBasket_old(self,id,title,RESPONSE=None): """add the basket""" ob=Basket() @@ -121,8 +126,8 @@ def manage_addBasket(self,id,title,RESPO RESPONSE.redirect('manage_main') -class BasketObject(Folder): - """Basket Object""" +class BasketObject_old(Folder): + """Basket Object - alte fassung""" meta_type="basketObject" def __init__(self): @@ -137,7 +142,7 @@ class BasketObject(Folder): """addObjects""" for id in ids: - founds=self.CDLICatalog.search({'path':id}) + founds=self.CDLICatalog.search({'title':id}) for found in founds: if found.getObject() not in self.contents: tm=self.contents[0:] @@ -220,11 +225,11 @@ class BasketObject(Folder): self.REQUEST.RESPONSE.write(ret) -def manage_addBasketObjectForm(self): +def manage_addBasket_oldObjectForm(self): """add form""" pass -def manage_addBasketObject(self,id,title='',RESPONSE=None): +def manage_addBasket_oldObject(self,id,title='',RESPONSE=None): """add""" ob=BasketObject() @@ -237,17 +242,534 @@ def manage_addBasketObject(self,id,title if RESPONSE is not None: RESPONSE.redirect('manage_main') + +class CDLIBasketContainer(OrderedFolder): + """contains the baskets""" + + + security=ClassSecurityInfo() + meta_type="CDLIBasketContainer" + + def deleteBaskets(self,ids=None): + """delete baskets, i.e. move them into trash folder""" + + + found=self.ZopeFind(self,obj_ids=['trash']) + + if len(found)<1: + manage_addFolder(self, 'trash') + trash=self._getOb('trash') + else: + trash=found[0][1] + + if type(ids) is not ListType: + ids=[ids] + cut=self.manage_cutObjects(ids) + trash.manage_pasteObjects(cut) + + def manageBaskets(self,ids,submit,REQUEST=None,RESPONSE=None): + """manage baskets, delete or copy""" + if submit=="delete": + self.deleteBaskets(ids) + + + + if RESPONSE: + RESPONSE.redirect(self.absolute_url()) + def getBasketIdfromName(self,basketname): + """get id from name""" + + for basket in self.ZopeFind(self,obj_metatypes=["CDLIBasket"]): + if basket[1].title==basketname: + return basket[0] + else: + None + + security.declareProtected('manage','uploadBasket_html') + + def uploadBasket_html(self,basketId='0'): + """upload an atf file, html form""" + + + basketId=str(basketId) + if not basketId=='0': + basketName=getattr(self.basketContainer,basketId).title + else: + basketName="" + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadBasket_html.zpt')).__of__(self) + return pt(basketId=basketId,basketName=basketName) + + + + def index_html(self): + """stanadard ansicht""" + + + + ext=self.ZopeFind(self,obj_ids=["index.html"]) + if ext: + return ext[0][1]() + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketContainerMain')).__of__(self) + return pt() + + def getStorageFolderRoot(self): + """root des storage folders""" + return self.cdli_main + + def __init__(self,id,title): + """ init basket container""" + self.id=id + self.title=title + + + def getBaskets(self,sortField='title'): + """get all baskets files""" + + def sortName(x,y): + return cmp(x[1].title.lower(),y[1].title.lower()) + + def sortDate(x,y): + return cmp(y[1].getLastVersion().getTime(),x[1].getLastVersion().getTime()) + + + def sortComment(x,y): + + + + try: + xc=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower() + except: + xc='ZZZZZZZZZZZZZ'.lower() + try: + yc=getattr(y[1],'comment','ZZZZZZZZZZZZZ').lower() + except: + yc='ZZZZZZZZZZZZZ'.lower() + + + if (xc=='') or (xc=='ZZZZZZZZZZZZZ'.lower()): + + try: + xc=x[1].getLastVersion().getComment().lower() + except: + xc='ZZZZZZZZZZZZZ'.lower() + + if (yc=='') or (yc=='ZZZZZZZZZZZZZ'.lower()): + try: + yc=y[1].getLastVersion().getComment().lower() + except: + yc='ZZZZZZZZZZZZZ'.lower() + + + return cmp(xc,yc) + + def sortAuthor(x,y): + + return cmp(x[1].getLastVersion().getUser().lower(),y[1].getLastVersion().getUser().lower()) + + baskets=self.ZopeFind(self,obj_metatypes=['CDLIBasket']) + + + if sortField=='title': + baskets.sort(sortName) + elif sortField=='date': + baskets.sort(sortDate) + elif sortField=='author': + baskets.sort(sortAuthor) + elif sortField=='comment': + baskets.sort(sortComment) + + return baskets + + + + def getNewId(self): + """createIds""" + last=getattr(self,'last',0) + last +=1 + while len(self.ZopeFind(self,obj_ids=[str(last)]))>0: + last+=1 + + self.last=last + return last + + def setActiveBasket(self,basketId,REQUEST=None): + """store active basketId in a cookie""" + self.REQUEST.RESPONSE.setCookie("CDLIActiveBasket",basketId,path="/") + + if REQUEST: + REQUEST.RESPONSE.redirect(REQUEST['URL1']+'?'+REQUEST['QUERY_STRING']) + + def getActiveBasket(self): + """get active basket from cookie""" + + id= self.REQUEST.cookies.get('CDLIActiveBasket',None) + if id: + obj=getattr(self,str(id),None) + else: + obj=None + return obj + + def getActualUserName(self): + """get name of the actualuser""" + return str(self.REQUEST['AUTHENTICATED_USER']) + + + def addBasket(self,newBasketName): + """add a new basket""" + + ob=manage_addCDLIBasket(self,newBasketName) + return ob + + def storeInBasket(self,submit,ids=None,newBasketName=None,fromFileList=None,RESPONSE=None,REQUEST=None): + """store it""" + if not ids: + ids=self.REQUEST.SESSION['fileIds'] + + if type(ids) is not ListType: + ids=[ids] + + if (submit.lower()=="store in new basket") or (submit.lower()=="new basket"): + basketRet=self.addBasket(newBasketName) + self.setActiveBasket(basketRet.getId()) + basket=getattr(self,basketRet.getId()) + elif (submit.lower()=="store in active basket") or (submit.lower()=="active basket"): + basket=self.getActiveBasket() + + added=basket.addObjects(ids) + back=self.REQUEST['HTTP_REFERER'].split("?")[0]+"?basketName="+basket.title+"&numberOfObjects="+str(added) + + + if fromFileList: + + return self.cdli_main.findObjectsFromList(list=self.REQUEST.SESSION['fileIds'],basketName=basket.title,numberOfObjects=added) + + if RESPONSE: + + RESPONSE.redirect(back) + + return True + +def manage_addCDLIBasketContainerForm(self): + """add the CDLIBasketContainer form""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addCDLIBasketContainer.zpt')).__of__(self) + return pt() + +def manage_addCDLIBasketContainer(self,id,title,RESPONSE=None): + """add the basket""" + ob=CDLIBasketContainer(id,title) + + self._setObject(id, ob) + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + +class CDLIBasket(Folder,CatalogAware): + """basket""" + + meta_type="CDLIBasket" + default_catalog="CDLIBasketCatalog" + + def getFile(self,obj): + return obj[1] + + def getFileLastVersion(self,obj): + return obj[0] + + def getFileNamesInLastVersion(self): + """get content of the last version as list""" + + 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 and founds[0].getObject().aq_parent.getId()==".trash": + return False, -1 + + if actualNo==storedNo: + return True , 0 + else: + return False, actualNo + + 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','BasketHistory')).__of__(self) + return pt() + + def getStorageFolderRoot(self): + """root des storage folders""" + return self.aq_parent.cdli_main + + def __init__(self,id,title,shortDescription="",comment=""): + """init a CDLIBasket""" + + self.id=id + self.title=title + self.shortDescription=shortDescription + self.comment=comment + + + + def getLastVersion(self): + """hole letzte version""" + ids=[int(x[0]) for x in self.ZopeFind(self,obj_metatypes=["CDLIBasketVersion"])] + ids.sort() + if len(ids)==0: + return None + else: + ob=getattr(self,str(ids[-1])) + return ob + + def getVersions(self): + """get versions""" + versions=self.ZopeFind(self,obj_metatypes=["CDLIBasketVersion"]) + return versions + + + + def addObjects(self,ids,deleteOld=None): + """generate a new version of the basket with objects added""" + + lastVersion=self.getLastVersion() + + if lastVersion is None: + oldContent=[] + else: + oldContent=lastVersion.basketContent[0:] + + if deleteOld: + oldContent=[] + + newContent=[] + added=0 + 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())) + added+=1 + + content=oldContent+newContent + + user=self.getActualUserName() + + ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=content) + + return added + + def deleteObjects(self,ids,RESPONSE=None,REQUEST=None): + """delete objects""" + + if type(ids) is not ListType: + ids=[ids] + + lastVersion=self.getLastVersion() + oldContent=lastVersion.basketContent[0:] + newContent=[] + for obj in oldContent: + if obj[1].getId() not in ids: + newContent.append(obj) + + + user=self.getActualUserName() + + ob=manage_addCDLIBasketVersion(self,user,comment="",basketContent=newContent) + + if RESPONSE: + obj=self._getOb(ob.getId()) + RESPONSE.redirect(obj.absolute_url()) + +def manage_addCDLIBasketForm(self): + """add the CDLIBasketContainer form""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addCDLIBasket.zpt')).__of__(self) + return pt() + +def manage_addCDLIBasket(self,title,shortDescription="",comment="",RESPONSE=None): + """add the basket""" + + id=str(self.getNewId()) + + ob=CDLIBasket(id,title,shortDescription,comment) + + self._setObject(id, ob) + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + else: + return ob + +class CDLIBasketVersion(SimpleItem): + """version of a basket""" + + meta_type="CDLIBasketVersion" + + def downloadObjectsAsOneFile(self,lock=None,procedure=None,REQUEST=None): + """download all selected files in one file""" + + ret="" + lockedObjects={} + + + if lock: + + if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User': + + return "please login first" + + #check if a locked object exist in the basket. + lockedObjects={} + for object in self.basketContent: + + if not object[1].lockedBy=="": + lockedObjects[object[1].title]=repr(object[1].lockedBy) + + + keys=lockedObjects.keys() + + + if len(keys)>0 and (not procedure): + self.REQUEST.SESSION['lockedObjects']=lockedObjects + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','lockedObjects.zpt')).__of__(self) + return pt() + + elif not procedure: #keine fails gesperrt dann alle donwloaden + procedure="downloadAll" + + + 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 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 + ret="#atf basket %s\n"%basket_name+ret + + self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s.atf" """%basket_name) + self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + length=len(ret) + self.REQUEST.RESPONSE.setHeader("Content-Length",length) + self.REQUEST.RESPONSE.write(ret) + + + def numberOfItems(self): + """return anzahl der elemente im basket""" + return len(self.basketContent) + + def getTime(self): + """getTime""" + #return self.bobobase_modification_time().ISO() + + if hasattr(self,'time'): + return time.strftime("%Y-%m-%d %H:%M:%S",self.time) + elif hasattr(self,'timefixed'): + return self.timefixed + else: + setattr(self,'timefixed',self.bobobase_modification_time().ISO()) + return self.bobobase_modification_time().ISO() + + def getContent(self): + """get Basket Content""" + return self.basketContent + + + def __init__(self,id,user,comment="",basketContent=[]): + """ init a basket version""" + self.id=id + self.coment=comment + self.basketContent=basketContent[0:] + self.user=user + self.time=time.localtime() + + def getUser(self): + """get user""" + return self.user + + def getComment(self): + """get Comment""" + return self.comment + + def index_html(self): + """view the basket""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','BasketVersionMain.zpt')).__of__(self) + return pt() + + def getObjUrl(self,result): + """getUrl of the version of the object""" + objId=result[1].getTitle() + founds=self.CDLICatalog.search({'title':objId}) + if len(founds)>0: + return founds[0].getObject().getLastVersion().absolute_url() + + else: #assume version number + splitted=objId.split("_") + founds=self.CDLICatalog.search({'title':splitted[1]}) + return founds[0].getObject().getLastVersion().absolute_url()+'/'+objId + +def manage_addCDLIBasketVersion(self,user,comment="",basketContent=[],RESPONSE=None): + """add a version""" + + #check for already existing versions + + lastVersion=self.getLastVersion() + if lastVersion is None: + newId=str(1) + else: + newId=str(int(lastVersion.getId())+1) + + ob=CDLIBasketVersion(newId,user,comment,basketContent) + + self._setObject(newId, ob) + + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + else: + return ob + class CDLIFileObject(versionedFileObject): """CDLI file object""" meta_type="CDLI File Object" - + security=ClassSecurityInfo() + def view(self): """view file""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self) return pt() + security.declarePublic('getDesignation') + def getDesignation(self): + """get the designation out of the file""" + try: + txt=re.search("&[Pp](.*)= (.*)",self.data[0:]) + except: + print self.getId() + txt=self.data[0:] + print str(txt) + + return "ERROR" + try: + return txt.group(2) + except: + return "ERROR" + manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1') def manage_addCDLIFileObject(self,id,vC='',author='', file='',title='',precondition='', content_type='', @@ -287,7 +809,40 @@ class CDLIFile(versionedFile,CatalogAwar meta_type="CDLI file" default_catalog='CDLICatalog' - + + + + def isContainedInBaskets(self,context=None): + """check is this file is part of any basket + @param context: (optional) necessessary if CDLIBasketCatalog is not an (inherited) attribute of self, context.CDLIBasketCatalog + has to exist. + """ + + if not context: + context=self + + ret=[] + for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()}): + #if the basket x is deleted it seemes to be that x is sometimes still in the Catalog, why? + try: + ret.append(x.getObject()) + except: + pass + return ret + #return [x.getObject() for x in context.CDLIBasketCatalog.search({'getFileNamesInLastVersion':self.getId()})] + + + def addCDLIFileObjectForm(self): + """add a new version""" + + if str(self.REQUEST['AUTHENTICATED_USER']) in ["Anonymous User"]: + return "please login first" + if (self.lockedBy==self.REQUEST['AUTHENTICATED_USER']) or (self.lockedBy==''): + out=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject',version=self.getVersion()).__of__(self) + return out() + 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): """add""" try: #TODO: der ganze vC unsinn muss ueberarbeitet werden @@ -295,7 +850,6 @@ class CDLIFile(versionedFile,CatalogAwar except: pass - author=self.REQUEST['author'] if changeName=="yes": filename=file.filename @@ -336,7 +890,7 @@ class CDLIFile(versionedFile,CatalogAwar return pt() else: - RESPONSE.redirect(self.REQUEST['URL2']) + RESPONSE.redirect(self.REQUEST['URL2']+'?uploaded=%s'%self.title) else: return self.ZopeFind(self,obj_ids=[id])[0][1] @@ -360,45 +914,99 @@ def manage_addCDLIFile(self,id,title,loc def splitatf(fh,dir=None): """split it""" - + ret=None nf=None for line in fh.readlines(): - - if (len(line.lstrip())>0) and (line.lstrip()[0]=="&"): #newfile - if nf: - nf.close() #close last file - - - filename=line[1:].split("=")[0].rstrip()+".atf" - if dir: - filename=os.path.join(dir,filename) - nf=file(filename,"w") + #check if basket name is in the first line + if line.find("#atf basket")>=0: + ret=line.replace('#atf basket ','') + ret=ret.split('_')[0] + else: + if (len(line.lstrip())>0) and (line.lstrip()[0]=="&"): #newfile + if nf: + nf.close() #close last file - nf.write(line) - + + filename=line[1:].split("=")[0].rstrip()+".atf" + if dir: + filename=os.path.join(dir,filename) + nf=file(filename,"w") + if nf: + nf.write(line) + nf.close() fh.close() - + return ret,len(os.listdir(dir)) + class CDLIFileFolder(versionedFileFolder): - """CDLI folder""" + """CDLI File Folder""" meta_type="CDLI Folder" filesMetaType=['CDLI file'] folderMetaType=['CDLI Folder'] default_catalog='CDLICatalog' - def uploadATF(self,upload,RESPONSE=None): + def delete(self,ids): + """delete this file, i.e. move into a trash folder""" + + found=self.ZopeFind(self,obj_ids=['.trash']) + + if len(found)<1: + manage_addCDLIFileFolder(self, '.trash',title="Trash") + trash=self._getOb('.trash') + else: + trash=found[0][1] + + if type(ids) is not ListType: + ids=[ids] + cut=self.manage_cutObjects(ids) + trash.manage_pasteObjects(cut) + + def getVersionNumbersFromIds(self,ids): + """get the numbers of the current versions of documents described by their ids""" + + ret=[] + searchStr=" OR ".join(ids) + + founds=self.CDLICatalog.search({'title':searchStr}) + + for found in founds: + lastVersion=found.getObject().getLastVersion() + ret.append((found.getId,lastVersion)) + + 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=[] - splitatf(upload,dir) - + basketNameFromFile, numberOfFiles=splitatf(upload,dir) + + if basketId == '0': + basketObj=self.basketContainer.getActiveBasket() + if basketObj: + basketId=basketObj.getId() + + 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({'path':fn}) + founds=self.CDLICatalog.search({'title':fn}) + if len(founds)==0: newPs.append(fn) @@ -418,11 +1026,12 @@ class CDLIFileFolder(versionedFileFolder self.REQUEST.SESSION['errors']=[x.getId() for x in errors] self.REQUEST.SESSION['newPs']=newPs self.REQUEST.SESSION['tmpdir']=dir - + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self) - return pt(changed=changed,errors=errors,dir=dir,newPs=newPs) + 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="",unlock=None,RESPONSE=None): + def uploadATFfinally(self,procedure,comment="",basketname='',unlock=None,RESPONSE=None): """upload the files""" if procedure=="uploadchanged": @@ -437,10 +1046,11 @@ class CDLIFileFolder(versionedFileFolder uploadFns=[] for fn in uploadFns: - founds=self.CDLICatalog.search({'path':fn}) + founds=self.CDLICatalog.search({'title':fn}) if len(founds)>0: - self.REQUEST['author']=str(self.REQUEST['AUTHENTICATED_USER']) - founds[0].getObject().manage_addCDLIFileObject('',comment,self.REQUEST['author'],file=file(os.path.join(self.REQUEST.SESSION['tmpdir'],fn))) + self.REQUEST.SESSION['author']=str(self.REQUEST['AUTHENTICATED_USER']) + + founds[0].getObject().manage_addCDLIFileObject('',comment,self.REQUEST.SESSION['author'],file=file(os.path.join(self.REQUEST.SESSION['tmpdir'],fn))) @@ -460,30 +1070,67 @@ class CDLIFileFolder(versionedFileFolder unlockFns.append(x) for fn in unlockFns: - founds=self.CDLICatalog.search({'path':fn}) + founds=self.CDLICatalog.search({'title':fn}) if len(founds)>0: - self.REQUEST['author']=str(self.REQUEST['AUTHENTICATED_USER']) + 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) + if RESPONSE is not None: RESPONSE.redirect(self.aq_parent.absolute_url()) - def findObjectsFromList(self,upload,RESPONSE): + def findObjectsFromList(self,start=None,upload=None,list=None,basketName=None,numberOfObjects=None,RESPONSE=None): """findObjectsFromList (, TAB oder LINE separated)""" - txt=upload.read() - txt=txt.replace(",","\n") - txt=txt.replace("\t","\n") - idsTmp=txt.split("\n") - ids=[] - for id in idsTmp: # make sure that no empty lines - idTmp=id.lstrip().rstrip() - if len(idTmp)>0: - ids.append(idTmp) - #self.REQUEST.SESSION['ids']=" OR ".join(ids) + if upload: # list from file upload + txt=upload.read() + txt=txt.replace(",","\n") + txt=txt.replace("\t","\n") + txt=txt.replace("\r","\n") + idsTmp=txt.split("\n") + ids=[] + for id in idsTmp: # make sure that no empty lines + idTmp=id.lstrip().rstrip() + if len(idTmp)>0: + + ids.append(idTmp) + + #self.REQUEST.SESSION['ids']=" OR ".join(ids) + + pt=getattr(self,'filelist.html') + self.REQUEST.SESSION['searchList']=ids + return pt(search=ids) + + if basketName: + #TODO: get rid of one of these.. + + pt=getattr(self,'filelist.html') + return pt(basketName=basketName,numberOfObjects=numberOfObjects) + + if list: # got already a list + ret=[] + for fileId in list: + if 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 + self.REQUEST.SESSION['searchList']=self.REQUEST.SESSION['fileIds'] + return ret - RESPONSE.redirect("filelist.html?path=%s"%" OR ".join(ids)) + if start: + RESPONSE.redirect("filelist.html?start:int="+str(start)) def createAllFilesAsSingleFile(self,RESPONSE=None): """download all files""" @@ -508,7 +1155,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