Mercurial > hg > documentViewer

changeset 445:93b9a5dddb8b Root_elementtree

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author abukhman
date Tue, 14 Jun 2011 11:57:11 +0200
parents f160791b0074
children 48f33478acec
files MpdlXmlTextServer.py documentViewer.py
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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()
--- 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