version 1.29, 2006/06/18 12:53:56
|
version 1.30, 2006/06/20 13:13:55
|
Line 215 class uploadATFThread(Thread):
|
Line 215 class uploadATFThread(Thread):
|
ctx = self.getContext(app,serverport=self.serverport) |
ctx = self.getContext(app,serverport=self.serverport) |
self.uploadATFThread(ctx,self.upload,self.basketId) |
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() |
get_transaction().commit() |
|
|
Line 1666 class CDLIRoot(Folder):
|
Line 1666 class CDLIRoot(Folder):
|
return pt(txt='/uploadATF',threadName=threadName) |
return pt(txt='/uploadATF',threadName=threadName) |
|
|
else: |
else: |
tmp={} |
# tmp={} |
for key in self._v_uploadATF[threadName].returnValue.keys(): |
# for key in self._v_uploadATF[threadName].returnValue.keys(): |
t=self._v_uploadATF[threadName].returnValue[key] |
# t=self._v_uploadATF[threadName].returnValue[key] |
if type(t) is ListType: |
# if type(t) is ListType: |
tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:] |
# tmp[key]=self._v_uploadATF[threadName].returnValue[key][0:] |
else: |
# else: |
tmp[key]=self._v_uploadATF[threadName].returnValue[key] |
# tmp[key]=self._v_uploadATF[threadName].returnValue[key] |
print repr(tmp[key]),repr(key) |
# print repr(tmp[key]),repr(key) |
|
# |
|
# # |
#tmp=self.cdli_main.tmpStore2[threadName] |
#tmp=self.cdli_main.tmpStore2[threadName] |
|
tmp=self._v_uploadATF[threadName].returnValue |
|
|
self._v_uploadATF[threadName].continueVar=False |
#self._v_uploadATF[threadName].continueVar=False |
|
|
self.REQUEST.SESSION['changed']=[x[0].getId() for x in tmp['changed']] |
self.REQUEST.SESSION['changed']=[x[0].getId() for x in tmp['changed']] |
self.REQUEST.SESSION['errors']=[x.getId() for x in tmp['errors']] |
self.REQUEST.SESSION['errors']=[x.getId() for x in tmp['errors']] |
self.REQUEST.SESSION['newPs']=tmp['newPs'] |
self.REQUEST.SESSION['newPs']=tmp['newPs'] |
self.REQUEST.SESSION['tmpdir']=tmp['dir'] |
self.REQUEST.SESSION['tmpdir']=tmp['dir'] |
del(self.cdli_main.tmpStore2[threadName]) |
#del(self.cdli_main.tmpStore2[threadName]) |
|
print "here the templates" |
|
|
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self) |
|
print "init p" |
|
return pt(changed=tmp['changed'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'], |
|
basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId']) |
|
|
|
def redoUpload(self,threadName): |
|
"""redo the upload""" |
|
tmp=self.cdli_main.tmpStore2[threadName] |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheck.zpt')).__of__(self) |
return pt(changed=tmp['changed'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'], |
return pt(changed=tmp['changed'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'], |
basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId']) |
basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId']) |