--- documentViewer/MpdlXmlTextServer.py 2011/05/17 13:02:57 1.237 +++ documentViewer/MpdlXmlTextServer.py 2011/06/14 09:57:11 1.238 @@ -2,6 +2,7 @@ from OFS.SimpleItem import SimpleItem from Products.PageTemplates.PageTemplateFile import PageTemplateFile from Ft.Xml import EMPTY_NAMESPACE, Parse +from Ft.Xml.Domlette import NonvalidatingReader import md5 import sys @@ -203,7 +204,7 @@ class MpdlXmlTextServer(SimpleItem): pagexml = self.getServerData("page-fragment.xql",textParam) dom = Parse(pagexml) - + #dom = NonvalidatingReader.parseStream(pagexml) #original Pages pagedivs = dom.xpath("//div[@class='pageNumberOrig']") @@ -360,9 +361,9 @@ class MpdlXmlTextServer(SimpleItem): hrefNode.nodeValue = href.replace('http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/lt/wordInfo.xql','%s/head_main_voc'%selfurl) # add target l.setAttributeNS(None, 'target', '_blank') - l.setAttributeNS(None, 'onclick',"popupWin = window.open(this.href, 'InfoWindow', 'menubar=no, location,width=500,height=600,top=180, left=700, toolbar=no, scrollbars=1'); return false;") - l.setAttributeNS(None, "ondblclick", "popupWin.focus();") - #window.open("this.href, 'InfoWindow', 'menubar=no, location,width=500,height=600,top=180, left=700, toolbar=yes, scrollbars=1'"); return false;") + #l.setAttributeNS(None, 'onclick',"popupWin = window.open(this.href, 'InfoWindow', 'menubar=no, location,width=500,height=600,top=180, left=700, toolbar=no, scrollbars=1'); return false;") + #l.setAttributeNS(None, "ondblclick", "popupWin.focus();") + #window.open("this.href, 'InfoWindow', 'menubar=no, location,width=500,height=600,top=180, left=700, toolbar=yes, scrollbars=1'"); return false;") if href.startswith('http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/lt/lemma.xql'): selfurl = self.absolute_url()