# HG changeset patch # User abukhman # Date 1287144106 -7200 # Node ID 80ae2324562bed29ecc9dba250820f98bef52f83 # Parent ea18683b2bff512deb8db2267cc538c2bf204e2a *** empty log message *** diff -r ea18683b2bff -r 80ae2324562b MpdlXmlTextServer.py --- a/MpdlXmlTextServer.py Fri Oct 15 12:30:52 2010 +0200 +++ b/MpdlXmlTextServer.py Fri Oct 15 14:01:46 2010 +0200 @@ -42,8 +42,6 @@ """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'] @@ -180,6 +178,18 @@ 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"%(docpath, mode, pn)) + dom =Parse(text) + pagedivs = dom.xpath("//div[@class='pageNumberOrig']") + logging.debug("getOrigPages :%s"%(pagedivs)) + return pagedivs 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""" diff -r ea18683b2bff -r 80ae2324562b documentViewer.py --- a/documentViewer.py Fri Oct 15 12:30:52 2010 +0200 +++ b/documentViewer.py Fri Oct 15 14:01:46 2010 +0200 @@ -191,9 +191,13 @@ return self.template.fulltextclient.getGisPlaces(**args) def getAllGisPlaces(self, **args): - """get all gis places""" - return self.template.fulltextclient.getGisPlaces(**args) - + """get all gis places """ + return self.template.fulltextclient.getAllGisPlaces(**args) + + def getOrigPages(self, **args): + """get original page number """ + return self.template.fulltextclient.getOrigPages(**args) + def getNumPages(self, docinfo): """get numpages""" return self.template.fulltextclient.getNumPages(docinfo)