cdli/cdli_files.py - diff

Return to cdli_files.py CVS log

Up to [Repository] / cdli

version 1.39, 2006/07/18 13:42:52	version 1.41, 2006/08/10 10:03:28
Line 173 class uploadATFfinallyThread(Thread):	Line 173 class uploadATFfinallyThread(Thread):
#if a basketname is give, add files to the basket	#if a basketname is give, add files to the basket
if not (basketname ==''):	if not (basketname ==''):
self.result+="<p>Add basket</p>"	self.result+="<p>Add basket</p>"
basketId=ctx2.basketContainer.ketIdfromName(basketname)	basketId=ctx2.basketContainer.getBasketIdfromName(basketname)

if not basketId: # create new basket	if not basketId: # create new basket
ob=ctx2.basketContainer.addBasket(basketname)	ob=ctx2.basketContainer.addBasket(basketname)
Line 1229 class CDLIFileObject(CatalogAware,versio	Line 1229 class CDLIFileObject(CatalogAware,versio
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self)
return pt()	return pt()

	security.declarePublic('getPNumber')
	def getPNumber(self):
	"""get the pnumber"""
	try:
	txt=re.match("&[Pp](\d)\s=([^\r\n]*)",self.data[0:])
	except:
	txt=self.data[0:]

	return "ERROR"
	try:
	return "P"+txt.group(1)
	except:
	return "ERROR"

security.declarePublic('getDesignation')	security.declarePublic('getDesignation')
def getDesignation(self):	def getDesignation(self):
"""get the designation out of the file"""	"""get the designation out of the file"""