--- documentViewer/MpdlXmlTextServer.py 2010/11/25 09:03:50 1.214 +++ documentViewer/MpdlXmlTextServer.py 2010/12/06 10:41:55 1.215 @@ -214,13 +214,27 @@ class MpdlXmlTextServer(SimpleItem): 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("YYYYYYpagedivs :%s"%(pagedivs)) if len(pagedivs)>0: originalPage= getTextFromNode(pagedivs[0]) #return docinfo['originalPage'] return originalPage - + def getAllPlaces (self, docinfo=None, pageinfo=None): + """Show all Places if no places than 0""" + docpath = docinfo['textURLPath'] + selfurl = self.absolute_url() + viewMode= pageinfo['viewMode'] + text = self.getServerData("page-fragment.xql","document=%s&mode=%s"%(docinfo['textURLPath'], 'text')) + dom =Parse(text) + pagedivs = dom.xpath("//div[@class='countPlaces']") + logging.debug ("pagedivs=%s"%(pagedivs)) + #originalPage= getTextFromNode(pagedivs[0]) + #return allPlaces + if len(pagedivs)>0: + originalPage= getTextFromNode(pagedivs[0]) + #return docinfo['originalPage'] + return originalPage + def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="regPlusNorm", highlightQuery=None, sn=None, optionToggle=None): """returns single page from fulltext""" docpath = docinfo['textURLPath']