--- ECHO_content/ECHO_xslt.py 2006/10/18 14:42:33 1.14 +++ ECHO_content/ECHO_xslt.py 2008/11/13 14:35:53 1.20 @@ -7,7 +7,13 @@ from ECHO_Nav import ECHO_pageTemplate from threading import Thread,Timer import threading from ECHO_helpers import * -import ECHO_language +try: + from ECHO_language import * +except: + print "no echo language" + class ECHO_language: + """leere Klasse""" + pass import sys import urllib import urlparse @@ -20,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 @@ -29,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): @@ -57,6 +63,7 @@ class getXML(Implicit): def __call__(self): """wait""" + self.run() return True def run(self): @@ -65,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) @@ -100,7 +108,7 @@ from ZODB.FileStorage import FileStorage class ECHO_cache: def __init__(self): """init the storage""" - self.storage=FileStorage("/var/tmp/echo_cache.fs") + 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() @@ -141,7 +149,7 @@ class ECHO_cache: return self.root[name].get(pn,None) -class ECHO_xslt(ECHO_pageTemplate,ECHO_language.ECHO_language): +class ECHO_xslt(ECHO_pageTemplate,ECHO_language): """ECHO_xslt classe""" meta_type="ECHO_xslt" @@ -213,15 +221,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]() @@ -401,7 +412,7 @@ class ECHO_xslt(ECHO_pageTemplate,ECHO_l - def getPageLex(self,_pn="1",_id=None,_caching=None,_links=None,_showall="no"): + def getPageLex(self,_pn="1",_id=None,_caching=None,_links=None,_showall="no",_displaylinks="yes"): """getpage mit lexikalischer analyse und xslt transform if _caching=yes dann wird die lwxikalisch analysierte seite in einem cache abgespeichert """ @@ -460,7 +471,7 @@ class ECHO_xslt(ECHO_pageTemplate,ECHO_l xsltproc.appendStylesheet(stylesheet) tmp=xsltproc.run(document) - if _links: + if _links and (_displaylinks=='yes'): _links=urllib.unquote(_links) tmp=self.addLinks(tmp,url=_links) @@ -508,7 +519,10 @@ class ECHO_xslt(ECHO_pageTemplate,ECHO_l xmlt,self.baseUri=self.getTextInput() #get the text from cache, if existing - fromCache=self.cache.retrieveObject(self.baseUri,"-1") + try: + fromCache=self.cache.retrieveObject(self.baseUri,"-1") + except: + fromCache=None if fromCache and _caching=="yes": txt = fromCache @@ -518,7 +532,7 @@ class ECHO_xslt(ECHO_pageTemplate,ECHO_l self.cache.storeObject(self.baseUri,"-1",txt) - + dom=NonvalidatingReader.parseString(txt,self.baseUri) #pb should have a namespache @@ -532,19 +546,19 @@ class ECHO_xslt(ECHO_pageTemplate,ECHO_l #suche wieviele pb for der id - idpb=dom.xpath("//*[@id='%s']/preceding::node()/mpiwg:pb"%_id,explicitNss={'html':'http://test.de','mpiwg':'http://www.mpiwg-berlin.mpg.de/namespace'}) + idpb=dom.xpath("//*[@id='%s']/preceding::node()/mpiwg:pb"%_id,explicitNss={'html':'http://www.w3.org/1999/xhtml','mpiwg':'http://www.mpiwg-berlin.mpg.de/namespace'}) if len(idpb)==0: idpb=dom.xpath("//*[@id='%s']/preceding::node()/pb"%_id) if len(idpb)==0: k=0 - for node in dom.xpath("//*[@id='%s']//preceding::node()"%_id,explicitNss={'html':'http://test.de','mpiwg':'http://www.mpiwg-berlin.mpg.de/namespace'}): + for node in dom.xpath("//*[@id='%s']//preceding::node()"%_id,explicitNss={'html':'http://www.w3.org/1999/xhtml','mpiwg':'http://www.mpiwg-berlin.mpg.de/namespace'}): if getattr(node,'tagName',"")=="mpiwg:pb": k+=1 else: k=len(idpb) + #pn=k-1 #-1 wegen Seitenzahlzaehlung startet mit 0 pn=k-1 #-1 wegen Seitenzahlzaehlung startet mit 0 - if pn > len(pbs): if REQUEST: return "Sorry, pagenumber %s does not exit"%(pn+1) @@ -568,7 +582,7 @@ class ECHO_xslt(ECHO_pageTemplate,ECHO_l if parent: parent[0].removeChild(node) except: - zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2]) + logger("ECHO_Resource (getAccessRightMD)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2]) strio = StringIO() PrettyPrint(dom,strio) xmlstr = strio.getvalue() @@ -626,4 +640,3 @@ def manage_addECHO_xslt(self, id, label, u = "%s/%s" % (u, quote(id)) REQUEST.RESPONSE.redirect(u+'/manage_main') return '' -