--- ECHO_content/ECHO_xslt.py 2007/01/31 14:12:39 1.19 +++ ECHO_content/ECHO_xslt.py 2008/12/17 12:12:27 1.22 @@ -26,7 +26,7 @@ import transaction import os.path import urllib,cgi - +import logging try: from Ft.Xml.Xslt.Processor import Processor from Ft.Xml import InputSource, EMPTY_NAMESPACE,Parse @@ -35,7 +35,7 @@ except: print "4suite has to be installed" -class getXML(Implicit): +class getXML(Thread): """get XML thread""" def set(self,qs,xsl,result): @@ -63,6 +63,7 @@ class getXML(Implicit): def __call__(self): """wait""" + self.run() return True def run(self): @@ -71,16 +72,17 @@ class getXML(Implicit): try: - urlH=urllib.urlopen(self._v_qs) - xml=urlH.read() - urlH.close() + #urlH=urllib.urlopen(self._v_qs) + #xml=urlH.read() + #urlH.close() xsltproc=Processor() - document = InputSource.DefaultFactory.fromString(xml) + logging.debug("start XML") + document = InputSource.DefaultFactory.fromUri(self._v_qs) stylesheet = InputSource.DefaultFactory.fromUri(self.xsl) - + logging.debug("got all files XML") xsltproc.appendStylesheet(stylesheet) - + logging.debug("got all files do the transform") #print self.xsl #< xsltproc.run(document) @@ -106,11 +108,16 @@ from ZODB.FileStorage import FileStorage class ECHO_cache: def __init__(self): """init the storage""" - self.storage=FileStorage(os.path.join(INSTANCE_HOME,"var/echo_cache.fs")) - self.db=DB(self.storage) - self.connection=self.db.open() - self.root=self.connection.root() - + + try: + self.storage=FileStorage(os.path.join(INSTANCE_HOME,"var/echo_cache.fs")) + + self.db=DB(self.storage) + self.connection=self.db.open() + self.root=self.connection.root() + except: + pass + def deleteObject(self,name,pn=None): """delete an object from cache""" fileStore=self.root.get(name,None) @@ -219,15 +226,18 @@ class ECHO_xslt(ECHO_pageTemplate,ECHO_l qs="%s%s"%(self.cgiUrl,self.REQUEST['QUERY_STRING']) xsl=self.absolute_url()+"/xslt" - self._v_xmltrans=getXML().__of__(self) + #self._v_xmltrans=getXML().__of__(self) + self._v_xmltrans=getXML() #self._xmltrans.start() - thread=Thread(target=self._v_xmltrans) - thread.start() + #thread=Thread(target=self._v_xmltrans) + #thread.start() + logging.debug("Thread prepared") self._v_xmltrans.set(qs,xsl,None) - self._v_xmltrans.run() - + self._v_xmltrans.start() + logging.debug("Thread started") - self.threadName=thread.getName()[0:] + #self.threadName=thread.getName()[0:] + self.threadName=self._v_xmltrans.getName()[0:] wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template']) if wait_template: return wait_template[0][1]()