version 1.185, 2010/10/18 12:39:14
|
version 1.193, 2010/10/25 10:35:27
|
Line 38 class MpdlXmlTextServer(SimpleItem):
|
Line 38 class MpdlXmlTextServer(SimpleItem):
|
url = self.serverUrl+method |
url = self.serverUrl+method |
return documentViewer.getHttpData(url,data,timeout=self.timeout) |
return documentViewer.getHttpData(url,data,timeout=self.timeout) |
|
|
def getSearch(self, pn=1, pageinfo=None, docinfo=None, query=None, queryType=None, lemma=None): |
def getSearch(self, pn=1, pageinfo=None, docinfo=None, query=None, queryType=None, lemma=None, characterNormalization=None): |
"""get search list""" |
"""get search list""" |
docpath = docinfo['textURLPath'] |
docpath = docinfo['textURLPath'] |
url = docinfo['url'] |
url = docinfo['url'] |
Line 203 class MpdlXmlTextServer(SimpleItem):
|
Line 203 class MpdlXmlTextServer(SimpleItem):
|
url = docinfo['url'] |
url = docinfo['url'] |
name = docinfo['name'] |
name = docinfo['name'] |
viewMode= pageinfo['viewMode'] |
viewMode= pageinfo['viewMode'] |
|
highlightQuery = pageinfo['highlightQuery'] |
tocMode = pageinfo['tocMode'] |
tocMode = pageinfo['tocMode'] |
|
sn =pageinfo['sn'] |
characterNormalization=pageinfo['characterNormalization'] |
characterNormalization=pageinfo['characterNormalization'] |
tocPN = pageinfo['tocPN'] |
tocPN = pageinfo['tocPN'] |
selfurl = self.absolute_url() |
selfurl = self.absolute_url() |
Line 211 class MpdlXmlTextServer(SimpleItem):
|
Line 213 class MpdlXmlTextServer(SimpleItem):
|
textmode = "textPollux" |
textmode = "textPollux" |
else: |
else: |
textmode = mode |
textmode = mode |
#logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization)) |
#logging.debug("documentViewer highlightQuery: %s"%(highlightQuery)) |
textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization) |
textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization) |
if highlightQuery is not None: |
if highlightQuery is not None: |
textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn) |
textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn) |
|
#textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s&highlightQuery=%s&sn=%s"%(docpath,textmode,pn,characterNormalization, highlightQuery, sn) |
|
logging.debug("documentViewer highlightQuery: %s"%(highlightQuery)) |
pagexml = self.getServerData("page-fragment.xql",textParam) |
pagexml = self.getServerData("page-fragment.xql",textParam) |
#pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", textParam, outputUnicode=False) |
#pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", textParam, outputUnicode=False) |
|
|