--- documentViewer/MpdlXmlTextServer.py 2010/10/11 14:04:21 1.74 +++ documentViewer/MpdlXmlTextServer.py 2010/10/11 14:44:09 1.77 @@ -147,9 +147,14 @@ class MpdlXmlTextServer(SimpleItem): 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") + logging.debug("YYYY hrefNode%s"%hrefNode) + 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""" @@ -206,9 +211,7 @@ class MpdlXmlTextServer(SimpleItem): if hrefNode: 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/name=%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']) + hrefNode.nodeValue =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/%s'%name) l.setAttributeNS(None, 'target', '_blank') return serializeNode(pagenode)