version 1.26, 2006/06/17 14:53:35
|
version 1.31, 2006/07/04 08:47:10
|
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 295 class uploadATFThread(Thread):
|
Line 295 class uploadATFThread(Thread):
|
#analyse the differences to the actual file |
#analyse the differences to the actual file |
obj=found.getObject() |
obj=found.getObject() |
|
|
if (not obj.lockedBy=='') and (not obj.lockedBy==self.username): |
if (not (str(obj.lockedBy))=='') and (not (str(obj.lockedBy)==str(self.username))): |
errors.append(obj) |
errors.append(obj) |
else: |
else: |
data=file(os.path.join(dir,fn)).read() |
data=file(os.path.join(dir,fn)).read() |
Line 689 class CDLIBasketContainer(OrderedFolder)
|
Line 689 class CDLIBasketContainer(OrderedFolder)
|
baskets.sort(sortAuthor) |
baskets.sort(sortAuthor) |
elif sortField=='comment': |
elif sortField=='comment': |
baskets.sort(sortComment) |
baskets.sort(sortComment) |
|
print "got the baskets" |
return baskets |
return baskets |
|
|
|
|
Line 963 class CDLIBasketVersion(SimpleItem):
|
Line 963 class CDLIBasketVersion(SimpleItem):
|
for object in self.basketContent: |
for object in self.basketContent: |
|
|
if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']): |
if (procedure=="downloadAll") or (object[1].lockedBy=='') or (object[1].lockedBy==self.REQUEST['AUTHENTICATED_USER']): |
ret+=object[0].data |
ret+=str(object[0].data) |
|
|
if lock and object[1].lockedBy=='': |
if lock and object[1].lockedBy=='': |
object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER'] |
object[1].lockedBy=self.REQUEST['AUTHENTICATED_USER'] |
Line 1054 def manage_addCDLIBasketVersion(self,use
|
Line 1054 def manage_addCDLIBasketVersion(self,use
|
else: |
else: |
return ob |
return ob |
|
|
class CDLIFileObject(versionedFileObject,CatalogAware): |
class CDLIFileObject(CatalogAware,versionedFileObject): |
"""CDLI file object""" |
"""CDLI file object""" |
|
|
meta_type="CDLI File Object" |
meta_type="CDLI File Object" |
Line 1065 class CDLIFileObject(versionedFileObject
|
Line 1065 class CDLIFileObject(versionedFileObject
|
|
|
security.declarePublic('makeThisVersionCurrent') |
security.declarePublic('makeThisVersionCurrent') |
|
|
|
def PrincipiaSearchSource(self): |
|
"""Return cataloguable key for ourselves.""" |
|
return str(self) |
|
|
def makeThisVersionCurrent_html(self): |
def makeThisVersionCurrent_html(self): |
"""form for making this version current""" |
"""form for making this version current""" |
|
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','makeThisVersionCurrent.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','makeThisVersionCurrent.zpt')).__of__(self) |
return pt() |
return pt() |
def makeThisVersionCurrent(self,comment,author): |
def makeThisVersionCurrent(self,comment,author,RESPONSE=None): |
"""copy this version to current""" |
"""copy this version to current""" |
parent=self.aq_parent |
parent=self.aq_parent |
|
|
|
|
newversion=parent.manage_addCDLIFileObject('',comment,author) |
newversion=parent.manage_addCDLIFileObject('',comment,author) |
newversion.data=self.data[0:] |
newversion.data=self.data[0:] |
|
|
|
if RESPONSE is not None: |
|
RESPONSE.redirect(self.aq_parent.absolute_url()+'/history') |
|
|
|
|
return True |
return True |
|
|
security.declarePublic('view') |
security.declarePublic('view') |
Line 1664 class CDLIRoot(Folder):
|
Line 1673 class CDLIRoot(Folder):
|
# 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) |
|
# |
|
# # |
|
#tmp=self.cdli_main.tmpStore2[threadName] |
|
tmp=self._v_uploadATF[threadName].returnValue |
|
|
|
#self._v_uploadATF[threadName].continueVar=False |
|
|
tmp=self.cdli_main.tmpStore2[threadName] |
|
del(self.cdli_main.tmpStore2[threadName]) |
|
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]) |
|
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']) |