--- ECHO_content/ECHO_xslt.py 2006/09/14 14:31:53 1.11 +++ ECHO_content/ECHO_xslt.py 2006/10/11 16:55:26 1.12 @@ -137,6 +137,7 @@ class ECHO_cache: if not fileStore: return None else: + return self.root[name].get(pn,None) @@ -263,6 +264,7 @@ class ECHO_xslt(ECHO_pageTemplate,ECHO_l fn=self.REQUEST['fn'] if not _id: + fromCache=self.cache.retrieveObject(fn,_pn) if fromCache and _caching=="yes": @@ -288,6 +290,8 @@ class ECHO_xslt(ECHO_pageTemplate,ECHO_l tmp=xsltproc.run(document) #bugfix for digilib images which doesn't accept & tmp=tmp.replace("&","&") + + return tmp[0:] def getTextInput(self): @@ -338,6 +342,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