--- documentViewer/MpdlXmlTextServer.py 2010/10/15 09:58:12 1.143 +++ documentViewer/MpdlXmlTextServer.py 2010/10/15 14:23:03 1.162 @@ -42,8 +42,6 @@ class MpdlXmlTextServer(SimpleItem): """get search list""" docpath = docinfo['textURLPath'] url = docinfo['url'] - logging.debug("documentViewer (gettoc) docpath: %s"%(docpath)) - logging.debug("documentViewer (gettoc) url: %s"%(url)) pagesize = pageinfo['queryPageSize'] pn = pageinfo['searchPN'] sn = pageinfo['sn'] @@ -156,10 +154,10 @@ class MpdlXmlTextServer(SimpleItem): hrefNode= l.getAttributeNodeNS(None, u"id") href= hrefNode.nodeValue hrefList.append(href) - myList = ",".join(hrefList) + myList = ",".join(hrefList) + logging.debug("getGisPlaces :%s"%(myList)) return myList - def getAllGisPlaces (self, docinfo=None, pageinfo=None): """Show all Gis Places of whole Book """ xpath ='//echo:place' @@ -177,7 +175,23 @@ class MpdlXmlTextServer(SimpleItem): href= hrefNode.nodeValue hrefList.append(href) myList = ",".join(hrefList) - return myList + logging.debug("getALLGisPlaces :%s"%(myList)) + return myList + + 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'], 'text', pn)) + dom =Parse(text) + pagedivs = dom.xpath("//div[@class='pageNumberOrig']") + if len(pagedivs)>0: + docinfo['originalPage'] = getTextFromNode(pagedivs[0]) + return docinfo def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""): """returns single page from fulltext"""