--- documentViewer/MpdlXmlTextServer.py 2011/08/31 13:55:07 1.242 +++ documentViewer/MpdlXmlTextServer.py 2011/09/28 13:39:28 1.244 @@ -202,12 +202,13 @@ class MpdlXmlTextServer(SimpleItem): characterNormalization=pageinfo['characterNormalization'] tocPN = pageinfo['tocPN'] selfurl = self.absolute_url() + if mode == "text_dict": textmode = "textPollux" else: textmode = mode - textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s&options=withXmlNodeId&xpointer=%s"%(docpath,textmode,pn,characterNormalization, xpointer) + textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s&xpointer=%s&options=withIdentifier"%(docpath,textmode,pn,characterNormalization, xpointer) if highlightQuery is not None: #textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn) textParam +="&highlightQuery=%s&s=%s&highlightElement=%s&highlightElementPos=%s"%(urllib.quote(highlightQuery),s, highlightElement, highlightElementPos) @@ -338,8 +339,8 @@ class MpdlXmlTextServer(SimpleItem): hrefNode =l.getAttributeNodeNS(None, u"href") 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/%s'%name) + if href.startswith('http://mappit.mpiwg-berlin.mpg.de'): + hrefNode.nodeValue =href.replace('db/REST/db/chgis/mpdl','db/RESTdb/db/mpdl/%s'%name) l.setAttributeNS(None, 'target', '_blank') return serializeNode(pagenode)