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""" @@ -1295,6 +1309,18 @@ class CDLIFile(versionedFile,CatalogAwar return pt() + def getBasketFromId(self,basketid, context=None): + """get basket from id""" + + if not context: + context=self + + for basket in self.ZopeFind(context,obj_metatypes=["CDLIBasket"]): + if basket[0]==basketid: + return basket[1] + else: + None + def isContainedInBaskets(self,context=None): """check is this file is part of any basket @@ -1771,7 +1797,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""" @@ -1872,6 +1904,7 @@ class CDLIRoot(Folder): if (not hasattr(self,'_v_uploadATF')): self._v_uploadATF={} + self._v_uploadATF[threadName]=thread @@ -1925,7 +1958,7 @@ class CDLIRoot(Folder): obj=self.ZopeFind(root,obj_ids=[folder]) if ext: - ext.result+="Adding: %s
"%f + ext.result+="adding: %s
"%f if not obj: manage_addCDLIFileFolder(root,folder,folder) fobj=getattr(root,folder)