Mercurial > hg > documentViewer
changeset 240:7ed49e7a7edc
*** empty log message ***
| author | abukhman |
|---|---|
| date | Mon, 11 Oct 2010 16:41:47 +0200 |
| parents | 1f3badb3f1e2 |
| children | 8346c1eb67b3 |
| files | MpdlXmlTextServer.py |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/MpdlXmlTextServer.py Mon Oct 11 16:06:34 2010 +0200 +++ b/MpdlXmlTextServer.py Mon Oct 11 16:41:47 2010 +0200 @@ -147,9 +147,13 @@ pagedom = Parse(text) result =pagedom.xpath("//result/resultPage/") for l in result: - hrefNode= l.getAttributeNodeNS(None, u"id") - docinfo['place']=getTextFromNode(result[0]) - return docinfo + hrefNode= l.getAttributeNodeNS(None, u"place") + if hrefNode: + href= hrefNode.nodeValue + if href.startswith('id='): + hrefNode.nodeValue = href.replace('id=',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%sid="%(url,viewMode,tocMode,tocPN,pn)) + logging.debug("YYYY href%s"%href) + return serializeNode(pagenode) 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""" @@ -207,8 +211,6 @@ href=hrefNode.nodeValue if href.startswith('http://chinagis.mpiwg-berlin.mpg.de'): hrefNode.nodeValue =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/%s'%name) - #hrefNode.nodeValue =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl%s'%url) - logging.debug("YYYYY docinfo[name] %s"%docinfo['name']) l.setAttributeNS(None, 'target', '_blank') return serializeNode(pagenode)