--- cdli/cdli_files.py 2006/07/18 13:42:52 1.39 +++ cdli/cdli_files.py 2006/08/24 09:04:51 1.42 @@ -173,7 +173,7 @@ class uploadATFfinallyThread(Thread): #if a basketname is give, add files to the basket if not (basketname ==''): self.result+="

Add basket

" - basketId=ctx2.basketContainer.ketIdfromName(basketname) + basketId=ctx2.basketContainer.getBasketIdfromName(basketname) if not basketId: # create new basket ob=ctx2.basketContainer.addBasket(basketname) @@ -1229,6 +1229,20 @@ class CDLIFileObject(CatalogAware,versio pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self) 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') def getDesignation(self): """get the designation out of the file""" @@ -1771,7 +1785,13 @@ class CDLIRoot(Folder): def checkThreads(self): """check threads""" - return threading.enumerate() + ret="" + for thread in threading.enumerate(): + ret+="

%s : %s

"%(repr(thread),thread.isAlive()) + + return ret + + def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None): """standard ausgabe"""