--- documentViewer/MpdlXmlTextServer.py 2010/10/15 13:05:47 1.149 +++ documentViewer/MpdlXmlTextServer.py 2010/10/15 13:39:15 1.156 @@ -178,17 +178,21 @@ class MpdlXmlTextServer(SimpleItem): logging.debug("getALLGisPlaces :%s"%(myList)) return myList - def getOrigPages (self, docinfo=None, pageinfo=None, viewMode=None, pn=1): + def getOrigPages (self, docinfo=None, pageinfo=None): """Show original page """ docpath = docinfo['textURLPath'] #url = docinfo['url'] selfurl = self.absolute_url() pn =pageinfo['current'] viewMode= pageinfo['viewMode'] - text = self.getServerData("page-fragment.xql","document=%s&mode=%s&pn=%s"%(docinfo['textURLPath'], mode, pn)) + text = self.getServerData("page-fragment.xql","document=%s&mode=%s&pn=%s"%(docinfo['textURLPath'], 'text', pn)) dom =Parse(text) pagedivs = dom.xpath("//div[@class='pageNumberOrig']") logging.debug("getOrigPages :%s"%(pagedivs)) + for l in pagedivs: + hrefNode = l.getAttributeNodeNS(None, u"div") + href=hrefNode.nodeValue + logging.debug("XXXXXXXXXXXgetOrigPagesXXXXXXXX :%s"%(href)) return "pagedivs" def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""):