version 1.179, 2010/10/18 11:57:07
|
version 1.197, 2010/10/25 12:13:22
|
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 54 class MpdlXmlTextServer(SimpleItem):
|
Line 54 class MpdlXmlTextServer(SimpleItem):
|
tocPN = pageinfo['tocPN'] |
tocPN = pageinfo['tocPN'] |
selfurl = self.absolute_url() |
selfurl = self.absolute_url() |
|
|
data = self.getServerData("doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s&highlightQuery=%s"%(docpath, 'text', queryType, urllib.quote(query), pagesize, pn, sn, viewMode,urllib.quote(highlightQuery))) |
data = self.getServerData("doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s&characterNormalization=%s&highlightQuery=%s"%(docpath, 'text', queryType, urllib.quote(query), pagesize, pn, sn, viewMode,characterNormalization ,urllib.quote(highlightQuery))) |
#page=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s&highlightQuery=%s"%(docpath, 'text', queryType, query, pagesize, pn, sn, viewMode,highlightQuery) ,outputUnicode=False) |
#page=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s&highlightQuery=%s"%(docpath, 'text', queryType, query, pagesize, pn, sn, viewMode,highlightQuery) ,outputUnicode=False) |
|
|
pagexml = data.replace('?document=%s'%str(docpath),'?url=%s'%url) |
pagexml = data.replace('?document=%s'%str(docpath),'?url=%s'%url) |
Line 181 class MpdlXmlTextServer(SimpleItem):
|
Line 181 class MpdlXmlTextServer(SimpleItem):
|
def getOrigPages (self, docinfo=None,pageinfo=None): |
def getOrigPages (self, docinfo=None,pageinfo=None): |
"""Show original page """ |
"""Show original page """ |
docpath = docinfo['textURLPath'] |
docpath = docinfo['textURLPath'] |
url = docinfo['url'] |
#url = docinfo['url'] |
selfurl = self.absolute_url() |
selfurl = self.absolute_url() |
pn =pageinfo['current'] |
pn =pageinfo['current'] |
|
|
viewMode= pageinfo['viewMode'] |
viewMode= pageinfo['viewMode'] |
text = self.getServerData("page-fragment.xql","document=%s&mode=%s&pn=%s"%(docinfo['textURLPath'], 'text', pn)) |
text = self.getServerData("page-fragment.xql","document=%s&mode=%s&pn=%s"%(docinfo['textURLPath'], 'text', pn)) |
#text = self.getServerData("page-fragment.xql","document=%s"%(docinfo['textURLPath'])) |
|
logging.debug("TEXTIXAXA:%s"%(text)) |
|
dom =Parse(text) |
dom =Parse(text) |
pagedivs = dom.xpath("//div[@class='pageNumberOrig']") |
pagedivs = dom.xpath("//div[@class='pageNumberOrig']") |
|
logging.debug("YYYYYYpagedivs :%s"%(pagedivs)) |
if len(pagedivs)>0: |
if len(pagedivs)>0: |
originalPage = getTextFromNode(pagedivs[0]) |
originalPage = getTextFromNode(pagedivs[0]) |
#return docinfo['originalPage'] |
#return docinfo['originalPage'] |
return originalPage |
return originalPage |
#return docinfo |
|
|
|
def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""): |
|
|
def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""): |
"""returns single page from fulltext""" |
"""returns single page from fulltext""" |
docpath = docinfo['textURLPath'] |
docpath = docinfo['textURLPath'] |
path = docinfo['textURLPath'] |
path = docinfo['textURLPath'] |
url = docinfo['url'] |
url = docinfo['url'] |
name = docinfo['name'] |
name = docinfo['name'] |
viewMode= pageinfo['viewMode'] |
viewMode= pageinfo['viewMode'] |
|
sn = pageinfo['sn'] |
|
highlightQuery = pageinfo['highlightQuery'] |
|
|
tocMode = pageinfo['tocMode'] |
tocMode = pageinfo['tocMode'] |
characterNormalization=pageinfo['characterNormalization'] |
characterNormalization=pageinfo['characterNormalization'] |
tocPN = pageinfo['tocPN'] |
tocPN = pageinfo['tocPN'] |
Line 212 class MpdlXmlTextServer(SimpleItem):
|
Line 214 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) |
|
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) |
|
|