--- cdli/cdli_files.py 2008/10/07 07:00:11 1.94 +++ cdli/cdli_files.py 2008/10/08 14:35:56 1.95 @@ -1428,9 +1428,22 @@ class CDLIBasketVersion(Implicit,Persist self._v_downloadBasket[threadName]=thread logging.debug("dwonloadfinally:"+repr(self)) - basketID=self.aq_parent.aq_parent.getId() - versionNumber=self.aq_parent.getId() - + if isinstance(self,CDLIBasketVersion): + obj=self + else: + obj=self.aq_parent + logging.debug("dwonloadfinally2:"+repr(obj)) + logging.debug("dwonloadfinally2:"+repr(obj.aq_parent)) + + obj2=obj.aq_parent + if not isinstance(obj2,CDLIBasket): + obj2=obj2.aq_parent + + basketID=obj2.getId() + versionNumber=obj.getId() + logging.debug("dwonloadfinally2:"+repr(basketID)) + logging.debug("dwonloadfinally2:"+repr(versionNumber)) + if lock: logging.debug("-----start locking") for object in self.content.getContent(): @@ -2354,7 +2367,7 @@ class CDLIRoot(Folder): def getFileObjectLastVersion(self,fileId): """get an object""" x=self.v_files_lastVersion.get(fileId) - l#ogging.debug("lastVersion: "+repr(x)) + #logging.debug("lastVersion: "+repr(x)) return x def showFileIds(self):