--- cdli/cdli_files.py 2008/10/02 11:42:42 1.88 +++ cdli/cdli_files.py 2008/10/06 13:35:39 1.92 @@ -1484,6 +1484,8 @@ class CDLIBasketVersion(Implicit,Persist #files = self._v_downloadBasket[threadName].result files=self.basketContainer.resultHash[threadName] + lockedFiles=self.basketContainer.resultLockedHash[threadName] + # fh=file("/var/tmp/test") #ret =fh.read() @@ -1501,12 +1503,25 @@ class CDLIBasketVersion(Implicit,Persist self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") #length=len(ret) #self.REQUEST.RESPONSE.setHeader("Content-Length",length) + ret="#basket: %s\n"%basket_name - self.REQUEST.RESPONSE.write(ret) + self.REQUEST.RESPONSE.write(ret) + for fileName in files: + try: self.REQUEST.RESPONSE.write(file(fileName).read()) - + except: + logging.error("downloadasonefile: cannot read %s"%fileName) + + + self.REQUEST.RESPONSE.write("\n# locked files\n") + for fileName in lockedFiles: + self.REQUEST.RESPONSE.write("# %s by %s\n"%fileName) + + self.REQUEST.RESPONSE.write("# locked files end\n") + del self.basketContainer.resultHash[threadName] + del self.basketContainer.resultLockedHash[threadName] def numberOfItems(self): """return anzahl der elemente im basket""" @@ -1610,6 +1625,10 @@ class CDLIFileObject(CatalogAware,extVer """Return cataloguable key for ourselves.""" return str(self) + def setAuthor(self, author): + """change the author""" + self.author = author + def makeThisVersionCurrent_html(self): """form for mthis version current"""