cdli/cdli_files.py - diff

Return to cdli_files.py CVS log

Up to [Repository] / cdli

version 1.30, 2006/06/20 13:13:55	version 1.31, 2006/07/04 08:47:10
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']