# HG changeset patch # User abukhman # Date 1308045431 -7200 # Node ID 93b9a5dddb8b2976c128481c696eac44acc64fa7 # Parent f160791b00747ca9cae688bba533c8ab7313834c *** empty log message *** diff -r f160791b0074 -r 93b9a5dddb8b MpdlXmlTextServer.py --- a/MpdlXmlTextServer.py Tue May 17 15:02:57 2011 +0200 +++ b/MpdlXmlTextServer.py Tue Jun 14 11:57:11 2011 +0200 @@ -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 @@ 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 @@ 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() diff -r f160791b0074 -r 93b9a5dddb8b documentViewer.py --- a/documentViewer.py Tue May 17 15:02:57 2011 +0200 +++ b/documentViewer.py Tue Jun 14 11:57:11 2011 +0200 @@ -7,7 +7,7 @@ from Globals import package_home from Products.zogiLib.zogiLib import browserCheck -from Ft.Xml import EMPTY_NAMESPACE, Parse +from Ft.Xml import EMPTY_NAMESPACE, Parse import Ft.Xml.Domlette import os.path import sys