--- ECHO_content/ECHO_xslt.py 2005/04/10 11:37:03 1.2 +++ ECHO_content/ECHO_xslt.py 2005/04/10 11:52:54 1.3 @@ -30,19 +30,20 @@ class getXML: self.result=None def __call__(self): - - urlH=urllib.urlopen(self.qs) - xml=urlH.read() - urlH.close() - - - xsltproc=Processor() - document = InputSource.DefaultFactory.fromString(xml) - stylesheet = InputSource.DefaultFactory.fromUri(self.xsl) - xsltproc.appendStylesheet(stylesheet) + try: + urlH=urllib.urlopen(self.qs) + xml=urlH.read() + urlH.close() - self.result=xsltproc.run(document) + xsltproc=Processor() + document = InputSource.DefaultFactory.fromString(xml) + stylesheet = InputSource.DefaultFactory.fromUri(self.xsl) + xsltproc.appendStylesheet(stylesheet) + + self.result=xsltproc.run(document) + except: + self.result="error" def getResult(self): return self.result @@ -91,7 +92,10 @@ class ECHO_xslt(ECHO_pageTemplate): else: if (self.xmltrans.getResult()==None): - killThread(self.xmltrans) + + wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template']) + if wait_template: + return wait_template[0][1]() pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','xsltWait.zpt')).__of__(self) return pt() @@ -99,9 +103,6 @@ class ECHO_xslt(ECHO_pageTemplate): return self.xmltrans.getResult() -def killThread(thread): - print "killing" - del thread def manage_addECHO_xsltForm(self): """Form for adding"""