--- ECHO_content/ECHO_xslt.py 2005/04/10 11:52:54 1.3 +++ ECHO_content/ECHO_xslt.py 2005/10/23 09:46:26 1.4 @@ -1,13 +1,21 @@ ### XSLT Class ### ### setzt 4 suite vorraus ### - +from Acquisition import Implicit from Products.PageTemplates.PageTemplateFile import PageTemplateFile from Globals import DTMLFile from ECHO_Nav import ECHO_pageTemplate from threading import Thread,Timer +import threading +from ECHO_helpers import * +import sys +import urllib +import urlparse + + from Globals import package_home + import os.path import urllib @@ -20,34 +28,71 @@ except: print "4suite has to be installed" -class getXML: +class getXML(Implicit): """get XML thread""" - def __init__(self,qs,xsl): - - self.qs=qs + def set(self,qs,xsl,result): + """set""" + + self._v_qs=qs self.xsl=xsl - self.result=None + self.result=None +# def acquireLock(self): +# +# lock=getattr(self, "_v_lock", None) +# if not lock: +# self._v_lock=threading.Lock() +# lock=self._v_lock +# lock.acquire() +# +# def releaseLock(self): +# # acquire() should have been called +# # about one second before. This means the volatile lock +# # should still be there +# +# self._v_lock.release() +# + def __call__(self): + """wait""" + return True + + def run(self): + """call it""" + xml="" + try: - 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) + + urlH=urllib.urlopen(self._v_qs) + xml=urlH.read() + urlH.close() + xsltproc=Processor() + document = InputSource.DefaultFactory.fromString(xml) + + stylesheet = InputSource.DefaultFactory.fromUri(self.xsl) + + xsltproc.appendStylesheet(stylesheet) + + + #print self.xsl + #print xsltproc.run(document) + tmp=xsltproc.run(document) + + self.result=tmp[0:] + - self.result=xsltproc.run(document) except: - self.result="error" + + self.result="error: %s %s
"%sys.exc_info()[0:2] + self.result+=xml + self.result+="" + + def getResult(self): - return self.result + return self.result @@ -55,31 +100,56 @@ class ECHO_xslt(ECHO_pageTemplate): """ECHO_xslt classe""" meta_type="ECHO_xslt" + + results={} + manage_options=ECHO_pageTemplate.manage_options+( + {'label':'Change xml-ressource','action':'change_ECHO_xsltForm'},) + def refreshTxt(self): """txt fuer refresh""" return """ 2;url=%s?repeat=%s """%(self.absolute_url(),self.threadName) def xslt(self): """xslt""" - return self.pt_render() - + return self.document_src() + def change_ECHO_xsltForm(self): + """change form""" + pt=zptFile(self, 'zpt/ChangeECHO_xsltForm.zpt') + return pt() + + def addChanges(self,cgiUrl,RESPONSE=None): + """change the xslt, ueberschriebt addChanges in ECHO_PageTemplate""" + if urlparse.urlparse(cgiUrl)[0]=="":#relative url in absolute + self.cgiUrl=urlparse.urljoin(self.absolute_url(), cgiUrl) + else: + self.cgiUrl=cgiUrl + + if RESPONSE: + RESPONSE.redirect("manage_main") def index_html(self,repeat=None): """standard ausgabe""" + threadName=repeat - if not threadName or threadName=="": - self.cgiUrl="http://medea.mpiwg-berlin.mpg.de/cgi-bin/search/q1" - + + #abwaertskompatibilitŠt mit altem nivht konfigurierbaren prototypen + + if getattr(self,'cgiUrl','')=='': + self.cgiUrl="http://medea.mpiwg-berlin.mpg.de/cgi-bin/search/q1" + qs="%s?%s"%(self.cgiUrl,self.REQUEST['QUERY_STRING']) xsl=self.absolute_url()+"/xslt" - self.xmltrans=getXML(qs,xsl) - thread=Thread(target=self.xmltrans) - + self._v_xmltrans=getXML().__of__(self) + #self._xmltrans.start() + thread=Thread(target=self._v_xmltrans) thread.start() + self._v_xmltrans.set(qs,xsl,None) + self._v_xmltrans.run() + self.threadName=thread.getName()[0:] wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template']) @@ -87,11 +157,11 @@ class ECHO_xslt(ECHO_pageTemplate): return wait_template[0][1]() pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','xsltWait.zpt')).__of__(self) return pt() - #xmltrans.run() + #_v_xmltrans.run() else: - if (self.xmltrans.getResult()==None): + if (self._v_xmltrans.getResult()==None): wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template']) if wait_template: @@ -100,8 +170,7 @@ class ECHO_xslt(ECHO_pageTemplate): pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','xsltWait.zpt')).__of__(self) return pt() else: - return self.xmltrans.getResult() - + return self._v_xmltrans.getResult() def manage_addECHO_xsltForm(self): @@ -112,7 +181,7 @@ def manage_addECHO_xsltForm(self): from urllib import quote -def manage_addECHO_xslt(self, id, label, weight= 0,contentType=0,title=None, text=None, +def manage_addECHO_xslt(self, id, label, weight= 0,contentType=0,title=None, text=None, cgiUrl=None, REQUEST=None, submit=None): "Add a Page Template with optional file content." @@ -127,6 +196,7 @@ def manage_addECHO_xslt(self, id, label, if title: ob.pt_setTitle(title) return ob + setattr(ob,'cgiUrl',cgiUrl) else: file = REQUEST.form.get('file') headers = getattr(file, 'headers', None) @@ -139,6 +209,7 @@ def manage_addECHO_xslt(self, id, label, ob = getattr(self, id) setattr(ob,'weight',weight) setattr(ob,'label',label) + setattr(ob,'cgiUrl',cgiUrl) if title: ob.pt_setTitle(title)