version 1.87, 2008/10/01 15:58:11
|
version 1.91, 2008/10/06 12:57:12
|
Line 1428 class CDLIBasketVersion(Implicit,Persist
|
Line 1428 class CDLIBasketVersion(Implicit,Persist
|
logging.debug("dwonloadfinally:"+repr(self)) |
logging.debug("dwonloadfinally:"+repr(self)) |
basketID=self.aq_parent.aq_parent.getId() |
basketID=self.aq_parent.aq_parent.getId() |
versionNumber=self.aq_parent.getId() |
versionNumber=self.aq_parent.getId() |
self._v_downloadBasket[threadName].set(lock,procedure,REQUEST,current,basketID,versionNumber) |
|
|
if lock: |
|
logging.debug("-----start locking") |
|
for object in self.content.getContent(): |
|
if object[1].lockedBy =='': |
|
object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER'] |
|
logging.debug("-----finished locking") |
|
|
|
#obj.lockedBy=user |
|
self._v_downloadBasket[threadName].set(lock,procedure,self.REQUEST['AUTHENTICATED_USER'],current,basketID,versionNumber) |
|
|
self._v_downloadBasket[threadName].start() |
self._v_downloadBasket[threadName].start() |
|
|
Line 1440 class CDLIBasketVersion(Implicit,Persist
|
Line 1449 class CDLIBasketVersion(Implicit,Persist
|
return wait_template[0][1]() |
return wait_template[0][1]() |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadBasketWait.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadBasketWait.zpt')).__of__(self) |
|
|
return pt(txt=self.absolute_url()+'/downloadObjectsAsOneFileFinally',threadName=threadName) |
return pt(txt=self.absolute_url()+'/downloadObjectsAsOneFileFinally',threadName=threadName, |
|
counter=self._v_downloadBasket[threadName].getCounter(), |
|
number=self._v_downloadBasket[threadName].getNumberOfFiles()) |
#_v_xmltrans.run() |
#_v_xmltrans.run() |
|
|
else: |
else: |
Line 1459 class CDLIBasketVersion(Implicit,Persist
|
Line 1470 class CDLIBasketVersion(Implicit,Persist
|
return wait_template[0][1]() |
return wait_template[0][1]() |
|
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadBasketWait.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','downloadBasketWait.zpt')).__of__(self) |
return pt(txt=self.absolute_url()+'/downloadObjectsAsOneFileFinally',threadName=threadName) |
return pt(txt=self.absolute_url()+'/downloadObjectsAsOneFileFinally',threadName=threadName, |
|
counter=self._v_downloadBasket[threadName].getCounter(), |
|
number=self._v_downloadBasket[threadName].getNumberOfFiles()) |
else: |
else: |
|
|
|
|
Line 1471 class CDLIBasketVersion(Implicit,Persist
|
Line 1484 class CDLIBasketVersion(Implicit,Persist
|
|
|
#files = self._v_downloadBasket[threadName].result |
#files = self._v_downloadBasket[threadName].result |
files=self.basketContainer.resultHash[threadName] |
files=self.basketContainer.resultHash[threadName] |
|
lockedFiles=self.basketContainer.resultLockedHash[threadName] |
|
logging.error(files) |
# fh=file("/var/tmp/test") |
# fh=file("/var/tmp/test") |
#ret =fh.read() |
#ret =fh.read() |
|
|
Line 1488 class CDLIBasketVersion(Implicit,Persist
|
Line 1503 class CDLIBasketVersion(Implicit,Persist
|
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") |
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") |
#length=len(ret) |
#length=len(ret) |
#self.REQUEST.RESPONSE.setHeader("Content-Length",length) |
#self.REQUEST.RESPONSE.setHeader("Content-Length",length) |
|
|
ret="#basket: %s\n"%basket_name |
ret="#basket: %s\n"%basket_name |
self.REQUEST.RESPONSE.write(ret) |
self.REQUEST.RESPONSE.write(ret) |
|
|
for fileName in files: |
for fileName in files: |
|
try: |
self.REQUEST.RESPONSE.write(file(fileName).read()) |
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\n"%fileName) |
|
|
|
self.REQUEST.RESPONSE.write("# locked files end\n") |
|
|
del self.basketContainer.resultHash[threadName] |
del self.basketContainer.resultHash[threadName] |
|
del self.basketContainer.resultLockedHash[threadName] |
|
|
def numberOfItems(self): |
def numberOfItems(self): |
"""return anzahl der elemente im basket""" |
"""return anzahl der elemente im basket""" |
Line 1597 class CDLIFileObject(CatalogAware,extVer
|
Line 1625 class CDLIFileObject(CatalogAware,extVer
|
"""Return cataloguable key for ourselves.""" |
"""Return cataloguable key for ourselves.""" |
return str(self) |
return str(self) |
|
|
|
def setAuthor(self, author): |
|
"""change the author""" |
|
self.author = author |
|
|
def makeThisVersionCurrent_html(self): |
def makeThisVersionCurrent_html(self): |
"""form for mthis version current""" |
"""form for mthis version current""" |
|
|