documentViewer/MpdlXmlTextServer.py - diff

Return to MpdlXmlTextServer.py CVS log

Up to [Repository] / documentViewer

Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.222 and 1.235

version 1.222, 2011/01/06 15:44:18	version 1.235, 2011/04/28 09:58:39
Line 3 from OFS.SimpleItem import SimpleItem	Line 3 from OFS.SimpleItem import SimpleItem
from Products.PageTemplates.PageTemplateFile import PageTemplateFile	from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Ft.Xml import EMPTY_NAMESPACE, Parse	from Ft.Xml import EMPTY_NAMESPACE, Parse

	import md5
import sys	import sys
import logging	import logging
import urllib	import urllib
Line 19 class MpdlXmlTextServer(SimpleItem):	Line 20 class MpdlXmlTextServer(SimpleItem):

manage_changeMpdlXmlTextServerForm = PageTemplateFile("zpt/manage_changeMpdlXmlTextServer", globals())	manage_changeMpdlXmlTextServerForm = PageTemplateFile("zpt/manage_changeMpdlXmlTextServer", globals())

def __init__(self,id,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/", serverName=None, timeout=40):	def __init__(self,id,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de/mpdl/interface/", serverName=None, timeout=40):
	#def __init__(self,id,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de:30030/mpdl/interface/", serverName=None, timeout=40):

"""constructor"""	"""constructor"""
self.id=id	self.id=id
self.title=title	self.title=title
Line 38 class MpdlXmlTextServer(SimpleItem):	Line 41 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, pageinfo=None, docinfo=None, lemma=None):	def getSearch(self, pageinfo=None, docinfo=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 57 class MpdlXmlTextServer(SimpleItem):
optionToggle = pageinfo['optionToggle']	optionToggle = pageinfo['optionToggle']
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&characterNormalization=%s&optionToggle=%s&highlightQuery=%s"%(docpath, 'text', queryType, urllib.quote(query), pagesize, pn, sn, viewMode,characterNormalization,optionToggle ,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&optionToggle=%s&highlightQuery=%s"%(docpath, 'text', queryType, urllib.quote(query), pagesize, pn, sn, viewMode,characterNormalization,optionToggle ,urllib.quote(highlightQuery)))

pagexml = data.replace('?document=%s'%str(docpath),'?url=%s'%url)	pagexml = data.replace('?document=%s'%str(docpath),'?url=%s'%url)
pagedom = Parse(pagexml)	pagedom = Parse(pagexml)

Line 86 class MpdlXmlTextServer(SimpleItem):	Line 87 class MpdlXmlTextServer(SimpleItem):
selfurl = self.absolute_url()	selfurl = self.absolute_url()
pagexml=href.replace('mode=text','mode=texttool&viewMode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&tocMode=%s&searchPN=%s&tocPN=%s&optionToggle=%s&characterNormalization=%s'%(viewMode,queryType,urllib.quote(query),pagesize,pn,tocMode,pn,tocPN,optionToggle,characterNormalization))	pagexml=href.replace('mode=text','mode=texttool&viewMode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&tocMode=%s&searchPN=%s&tocPN=%s&optionToggle=%s&characterNormalization=%s'%(viewMode,queryType,urllib.quote(query),pagesize,pn,tocMode,pn,tocPN,optionToggle,characterNormalization))
hrefNode.nodeValue = pagexml.replace('page-fragment.xql','%s'%selfurl)	hrefNode.nodeValue = pagexml.replace('page-fragment.xql','%s'%selfurl)
	#logging.debug("PUREXML :%s"%(serializeNode(pagenode)))
return serializeNode(pagenode)	return serializeNode(pagenode)
if (queryType=="fulltextMorph"):	if (queryType=="fulltextMorph"):
pagedivs = pagedom.xpath("//div[@class='queryResult']")	pagedivs = pagedom.xpath("//div[@class='queryResult']")
Line 101 class MpdlXmlTextServer(SimpleItem):	Line 103 class MpdlXmlTextServer(SimpleItem):
pagexml=href.replace('mode=text','mode=texttool&viewMode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&tocMode=%s&searchPN=%s&tocPN=%s&optionToggle=%s&characterNormalization=%s'%(viewMode,queryType,urllib.quote(query),pagesize,pn,tocMode,pn,tocPN,optionToggle,characterNormalization))	pagexml=href.replace('mode=text','mode=texttool&viewMode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&tocMode=%s&searchPN=%s&tocPN=%s&optionToggle=%s&characterNormalization=%s'%(viewMode,queryType,urllib.quote(query),pagesize,pn,tocMode,pn,tocPN,optionToggle,characterNormalization))
hrefNode.nodeValue = pagexml.replace('page-fragment.xql','%s'%selfurl)	hrefNode.nodeValue = pagexml.replace('page-fragment.xql','%s'%selfurl)
if href.startswith('../lt/lemma.xql'):	if href.startswith('../lt/lemma.xql'):
hrefNode.nodeValue = href.replace('../lt/lemma.xql','%s/template/head_main_lemma_New'%(selfurl))	hrefNode.nodeValue = href.replace('../lt/lemma.xql','%s/template/head_main_query'%(selfurl))
l.setAttributeNS(None, 'target', '_blank')	l.setAttributeNS(None, 'target', '_blank')
l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=400, scrollbars=1'); return false;")	l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=400, scrollbars=1'); return false;")
l.setAttributeNS(None, 'onClick', 'popupWin.focus();')	l.setAttributeNS(None, 'onDblclick', 'popupWin.focus();')
pagedivs = pagedom.xpath("//div[@class='queryResultMorphExpansion']")	pagedivs = pagedom.xpath("//div[@class='queryResultMorphExpansion']")
return serializeNode(pagenode)	return serializeNode(pagenode)
if (queryType=="ftIndex")or(queryType=="ftIndexMorph"):	if (queryType=="ftIndex")or(queryType=="ftIndexMorph"):
Line 118 class MpdlXmlTextServer(SimpleItem):	Line 120 class MpdlXmlTextServer(SimpleItem):
href = hrefNode.nodeValue	href = hrefNode.nodeValue
hrefNode.nodeValue=href.replace('mode=text','mode=texttool&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s&optionToggle=%s&characterNormalization=%s'%(viewMode,tocMode,tocPN,pn,optionToggle,characterNormalization))	hrefNode.nodeValue=href.replace('mode=text','mode=texttool&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s&optionToggle=%s&characterNormalization=%s'%(viewMode,tocMode,tocPN,pn,optionToggle,characterNormalization))
if href.startswith('../lt/lex.xql'):	if href.startswith('../lt/lex.xql'):
hrefNode.nodeValue = href.replace('../lt/lex.xql','%s/template/head_main_voc'%selfurl)	hrefNode.nodeValue = href.replace('../lt/lex.xql','%s/template/head_main_lex'%selfurl)
l.setAttributeNS(None, 'target', '_blank')	l.setAttributeNS(None, 'target', '_blank')
l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=400, scrollbars=1'); return false;")	l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=400, scrollbars=1'); return false;")
l.setAttributeNS(None, 'onClick', 'popupWin.focus();')	l.setAttributeNS(None, 'onDblclick', 'popupWin.focus();')
if href.startswith('../lt/lemma.xql'):	if href.startswith('../lt/lemma.xql'):
hrefNode.nodeValue = href.replace('../lt/lemma.xql','%s/template/head_main_lemma'%selfurl)	hrefNode.nodeValue = href.replace('../lt/lemma.xql','%s/template/head_main_lemma'%(selfurl))
l.setAttributeNS(None, 'target', '_blank')	l.setAttributeNS(None, 'target', '_blank')
l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=400, scrollbars=1'); return false;")	l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=400, scrollbars=1'); return false;")
l.setAttributeNS(None, 'onClick', 'popupWin.focus();')	l.setAttributeNS(None, 'onDblclick', 'popupWin.focus();')
return serializeNode(pagenode)	return serializeNode(pagenode)
return "no text here"	return "no text here"


def getGisPlaces(self, docinfo=None, pageinfo=None):	def getGisPlaces(self, docinfo=None, pageinfo=None):
""" Show all Gis Places of whole Page"""	""" Show all Gis Places of whole Page"""
xpath='//place'	xpath='//place'
Line 151 class MpdlXmlTextServer(SimpleItem):	Line 152 class MpdlXmlTextServer(SimpleItem):
href= hrefNode.nodeValue	href= hrefNode.nodeValue
hrefList.append(href)	hrefList.append(href)
myList = ",".join(hrefList)	myList = ",".join(hrefList)
logging.debug("getGisPlaces :%s"%(myList))	#logging.debug("getGisPlaces :%s"%(myList))
return myList	return myList

def getAllGisPlaces (self, docinfo=None, pageinfo=None):	def getAllGisPlaces (self, docinfo=None, pageinfo=None):
Line 172 class MpdlXmlTextServer(SimpleItem):	Line 173 class MpdlXmlTextServer(SimpleItem):
href= hrefNode.nodeValue	href= hrefNode.nodeValue
hrefList.append(href)	hrefList.append(href)
myList = ",".join(hrefList)	myList = ",".join(hrefList)
logging.debug("getALLGisPlaces :%s"%(myList))	#logging.debug("getALLGisPlaces :%s"%(myList))
return myList	return myList


def getTextPage(self, docinfo=None, pageinfo=None):	def getTextPage(self, mode="text_dict", pn=1, docinfo=None, pageinfo=None):
"""returns single page from fulltext"""	"""returns single page from fulltext"""
docpath = docinfo['textURLPath']	docpath = docinfo['textURLPath']
path = docinfo['textURLPath']	path = docinfo['textURLPath']
url = docinfo.get('url',None)	url = docinfo.get('url',None)
name = docinfo.get('name',None)	name = docinfo.get('name',None)
pn =pageinfo['current']	pn =pageinfo['current']
#viewMode= pageinfo['viewMode']
sn = pageinfo['sn']	sn = pageinfo['sn']
	optionToggle =pageinfo ['optionToggle']
highlightQuery = pageinfo['highlightQuery']	highlightQuery = pageinfo['highlightQuery']
mode = pageinfo ['viewMode']	#mode = pageinfo ['viewMode']
tocMode = pageinfo['tocMode']	tocMode = pageinfo['tocMode']
characterNormalization=pageinfo['characterNormalization']	characterNormalization=pageinfo['characterNormalization']
tocPN = pageinfo['tocPN']	tocPN = pageinfo['tocPN']
Line 196 class MpdlXmlTextServer(SimpleItem):	Line 197 class MpdlXmlTextServer(SimpleItem):
else:	else:
textmode = mode	textmode = mode

textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization)	textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s&optionToggle=%s"%(docpath,textmode,pn,characterNormalization,optionToggle)
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)

pagexml = self.getServerData("page-fragment.xql",textParam)	pagexml = self.getServerData("page-fragment.xql",textParam)
dom = Parse(pagexml)	dom = Parse(pagexml)

#original Pages	#original Pages
pagedivs = dom.xpath("//div[@class='pageNumberOrig']")	pagedivs = dom.xpath("//div[@class='pageNumberOrig']")
if pagedivs == dom.xpath("//div[@class='pageNumberOrig']"):	"""if pagedivs == dom.xpath("//div[@class='pageNumberOrig']"):
if len(pagedivs)>0:	if len(pagedivs)>0:
docinfo['pageNumberOrig']= getTextFromNode(pagedivs[0])	docinfo['pageNumberOrig']= getTextFromNode(pagedivs[0])
logging.debug("ORIGINAL PAGES: %s"%(docinfo['pageNumberOrig']))	logging.debug("ORIGINAL PAGE: %s"%(docinfo['pageNumberOrig']))

	#original Pages Norm
	pagedivs = dom.xpath("//div[@class='pageNumberOrigNorm']")
	if pagedivs == dom.xpath("//div[@class='pageNumberOrigNorm']"):
	if len(pagedivs)>0:
	docinfo['pageNumberOrigNorm']= getTextFromNode(pagedivs[0])
	logging.debug("ORIGINAL PAGE NORM: %s"%(docinfo['pageNumberOrigNorm']))
	"""
#figureEntries	#figureEntries
pagedivs = dom.xpath("//div[@class='countFigureEntries']")	pagedivs = dom.xpath("//div[@class='countFigureEntries']")
if pagedivs == dom.xpath("//div[@class='countFigureEntries']"):	if pagedivs == dom.xpath("//div[@class='countFigureEntries']"):
Line 219 class MpdlXmlTextServer(SimpleItem):	Line 226 class MpdlXmlTextServer(SimpleItem):
if s=='0':	if s=='0':
try:	try:
docinfo['countFigureEntries'] = int(s)	docinfo['countFigureEntries'] = int(s)
logging.debug("FIGURE ENTRIES: %s"%(s))
except:	except:
docinfo['countFigureEntries'] = 0	docinfo['countFigureEntries'] = 0
else:	else:
s1 = int(s)/30+1	s1 = int(s)/30+1
try:	try:
docinfo['countFigureEntries'] = int(s1)	docinfo['countFigureEntries'] = int(s1)
logging.debug("FIGURE ENTRIES: %s"%(s1))
except:	except:
docinfo['countFigureEntries'] = 0	docinfo['countFigureEntries'] = 0

Line 238 class MpdlXmlTextServer(SimpleItem):	Line 243 class MpdlXmlTextServer(SimpleItem):
s = getTextFromNode(pagedivs[0])	s = getTextFromNode(pagedivs[0])
try:	try:
docinfo['countPlaces'] = int(s)	docinfo['countPlaces'] = int(s)
logging.debug("PLACES HERE: %s"%(s))
except:	except:
docinfo['countPlaces'] = 0	docinfo['countPlaces'] = 0

Line 251 class MpdlXmlTextServer(SimpleItem):	Line 255 class MpdlXmlTextServer(SimpleItem):
if s=='0':	if s=='0':
try:	try:
docinfo['countTocEntries'] = int(s)	docinfo['countTocEntries'] = int(s)
logging.debug("TEXT ENTRIES: %s"%(s))
except:	except:
docinfo['countTocEntries'] = 0	docinfo['countTocEntries'] = 0
else:	else:
s1 = int(s)/30+1	s1 = int(s)/30+1
try:	try:
docinfo['countTocEntries'] = int(s1)	docinfo['countTocEntries'] = int(s1)
logging.debug("TEXT ENTRIES: %s"%(s1))
except:	except:
docinfo['countTocEntries'] = 0	docinfo['countTocEntries'] = 0

Line 271 class MpdlXmlTextServer(SimpleItem):	Line 273 class MpdlXmlTextServer(SimpleItem):

try:	try:
docinfo['numPages'] = int(s)	docinfo['numPages'] = int(s)
logging.debug("PAGE NUMBER: %s"%(s))	#logging.debug("PAGE NUMBER: %s"%(s))

np = docinfo['numPages']	np = docinfo['numPages']
pageinfo['end'] = min(pageinfo['end'], np)	pageinfo['end'] = min(pageinfo['end'], np)
Line 288 class MpdlXmlTextServer(SimpleItem):	Line 290 class MpdlXmlTextServer(SimpleItem):
docinfo['countPlaces'] = 0	docinfo['countPlaces'] = 0
docinfo['countTocEntries'] = 0	docinfo['countTocEntries'] = 0
docinfo['numPages'] = 0	docinfo['numPages'] = 0
	docinfo['pageNumberOrigNorm'] = 0
#return docinfo	#return docinfo

# plain text mode	# plain text mode
Line 302 class MpdlXmlTextServer(SimpleItem):	Line 305 class MpdlXmlTextServer(SimpleItem):
if hrefNode:	if hrefNode:
href= hrefNode.nodeValue	href= hrefNode.nodeValue
if href.startswith('#note-'):	if href.startswith('#note-'):
hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,tocPN,pn))	hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=text&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,tocMode,tocPN,pn))
return serializeNode(pagenode)	return serializeNode(pagenode)
if mode == "xml":	if mode == "xml":
# first div contains text	# first div contains text
Line 334 class MpdlXmlTextServer(SimpleItem):	Line 337 class MpdlXmlTextServer(SimpleItem):
# text-with-links mode	# text-with-links mode
if mode == "text_dict":	if mode == "text_dict":
# first div contains text	# first div contains text
	#mode = pageinfo ['viewMode']
pagedivs = dom.xpath("/div")	pagedivs = dom.xpath("/div")
if len(pagedivs) > 0:	if len(pagedivs) > 0:
pagenode = pagedivs[0]	pagenode = pagedivs[0]
Line 344 class MpdlXmlTextServer(SimpleItem):	Line 348 class MpdlXmlTextServer(SimpleItem):
if hrefNode:	if hrefNode:
# is link with href	# is link with href
href = hrefNode.nodeValue	href = hrefNode.nodeValue
if href.startswith('lt/lex.xql'):	if href.startswith('http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/lt/wordInfo.xql'):
# is pollux link	# is pollux link
selfurl = self.absolute_url()	selfurl = self.absolute_url()
# change href	# change href
hrefNode.nodeValue = href.replace('lt/lex.xql','%s/template/head_main_voc'%selfurl)	hrefNode.nodeValue = href.replace('http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/lt/wordInfo.xql','%s/head_main_voc'%selfurl)
# add target	# add target
l.setAttributeNS(None, 'target', '_blank')	l.setAttributeNS(None, 'target', '_blank')
l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=700, scrollbars=1'); return false;")	l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'InfoWindow', 'menubar=no, location,width=500,height=600,top=180, left=700, toolbar=no, scrollbars=1'); return false;")
l.setAttributeNS(None, 'onClick', 'popupWin.focus();')	l.setAttributeNS(None, "onDblclick", "popupWin.focus();")
if href.startswith('lt/lemma.xql'):	#window.open("this.href, 'InfoWindow', 'menubar=no, location,width=500,height=600,top=180, left=700, toolbar=yes, scrollbars=1'"); return false;")

	if href.startswith('http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/lt/lemma.xql'):
selfurl = self.absolute_url()	selfurl = self.absolute_url()
hrefNode.nodeValue = href.replace('lt/lemma.xql','%s/template/head_main_lemma'%selfurl)	hrefNode.nodeValue = href.replace('http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/lt/lemma.xql','%s/head_main_lemma'%selfurl)
l.setAttributeNS(None, 'target', '_blank')	l.setAttributeNS(None, 'target', '_blank')
l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=700, scrollbars=1'); return false;")	l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'InfoWindow', 'menubar=no, location,width=500,height=600,top=180, left=700, toolbar=no, scrollbars=1'); return false;")
l.setAttributeNS(None, 'onClick', 'popupWin.focus();')	l.setAttributeNS(None, 'onDblclick', 'popupWin.focus();')

if href.startswith('#note-'):	if href.startswith('#note-'):
hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,tocPN,pn))	hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=text_dict&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,tocMode,tocPN,pn))
return serializeNode(pagenode)	return serializeNode(pagenode)
return "no text here"	return "no text here"

def getTranslate(self, query=None, language=None):	def getOrigPages(self, docinfo=None, pageinfo=None):
	docpath = docinfo['textURLPath']
	pn =pageinfo['current']
	selfurl = self.absolute_url()
	pagexml = self.getServerData("page-fragment.xql","document=%s&pn=%s"%(docpath, pn))
	dom = Parse(pagexml)
	pagedivs = dom.xpath("//div[@class='pageNumberOrig']")
	if pagedivs == dom.xpath("//div[@class='pageNumberOrig']"):
	if len(pagedivs)>0:
	docinfo['pageNumberOrig']= getTextFromNode(pagedivs[0])
	return docinfo['pageNumberOrig']

	def getOrigPagesNorm(self, docinfo=None, pageinfo=None):
	docpath = docinfo['textURLPath']
	pn =pageinfo['current']
	selfurl = self.absolute_url()
	pagexml = self.getServerData("page-fragment.xql","document=%s&pn=%s"%(docpath, pn))
	dom = Parse(pagexml)
	pagedivs = dom.xpath("//div[@class='pageNumberOrigNorm']")
	if pagedivs == dom.xpath("//div[@class='pageNumberOrigNorm']"):
	if len(pagedivs)>0:
	docinfo['pageNumberOrigNorm']= getTextFromNode(pagedivs[0])
	return docinfo['pageNumberOrigNorm']


	def getTranslate(self, word=None, language=None):
"""translate into another languages"""	"""translate into another languages"""
data = self.getServerData("lt/lex.xql","document=&language="+str(language)+"&query="+urllib.quote(query))	data = self.getServerData("lt/wordInfo.xql","language="+str(language)+"&word="+urllib.quote(word)+"&output=html")
#pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lex.xql","document=&language="+str(language)+"&query="+url_quote(str(query)))	#pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lex.xql","document=&language="+str(language)+"&query="+url_quote(str(query)))
return data	return data

def getLemma(self, lemma=None, language=None):	def getLemma(self, lemma=None, language=None):
"""simular words lemma """	"""simular words lemma """
data = self.getServerData("lt/lemma.xql","document=&language="+str(language)+"&lemma="+urllib.quote(lemma))	data = self.getServerData("lt/lemma.xql","language="+str(language)+"&lemma="+urllib.quote(lemma)+"&output=html")
#pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lemma.xql","document=&language="+str(language)+"&lemma="+url_quote(str(lemma)))
return data	return data

def getLemmaNew(self, query=None, language=None):	def getLemmaQuery(self, query=None, language=None):
"""simular words lemma """	"""simular words lemma """
data = self.getServerData("lt/lemma.xql","document=&language="+str(language)+"&lemma="+urllib.quote(query))	data = self.getServerData("lt/lemma.xql","language="+str(language)+"&query="+urllib.quote(query)+"&output=html")
#pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lemma.xql","document=&language="+str(language)+"&lemma="+url_quote(str(query)))	return data

	def getLex(self, query=None, language=None):
	#simular words lemma
	data = self.getServerData("lt/lex.xql","document=&language="+str(language)+"&query="+urllib.quote(query))
return data	return data

def getQuery (self, docinfo=None, pageinfo=None, query=None, queryType=None, pn=1, optionToggle=None):	def getQuery (self, docinfo=None, pageinfo=None, query=None, queryType=None, pn=1, optionToggle=None):
Line 396 class MpdlXmlTextServer(SimpleItem):	Line 431 class MpdlXmlTextServer(SimpleItem):
pagedom = Parse(pagexml)	pagedom = Parse(pagexml)
numdivs = pagedom.xpath("//div[@class='queryResultHits']")	numdivs = pagedom.xpath("//div[@class='queryResultHits']")
tocSearch = int(getTextFromNode(numdivs[0]))	tocSearch = int(getTextFromNode(numdivs[0]))
logging.debug("documentViewer (gettoc) tocSearch: %s"%(tocSearch))
tc=int((tocSearch/10)+1)	tc=int((tocSearch/10)+1)
logging.debug("documentViewer (gettoc) tc: %s"%(tc))
return tc	return tc

def getToc(self, mode="text", docinfo=None):	def getToc(self, mode="text", docinfo=None):
"""loads table of contents and stores in docinfo"""	"""loads table of contents and stores in docinfo"""
logging.debug("documentViewer (gettoc) mode: %s"%(mode))
if mode == "none":	if mode == "none":
return docinfo	return docinfo
if 'tocSize_%s'%mode in docinfo:	if 'tocSize_%s'%mode in docinfo:
Line 455 class MpdlXmlTextServer(SimpleItem):	Line 487 class MpdlXmlTextServer(SimpleItem):
data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s&characterNormalization=regPlusNorm&optionToggle=1"%(docpath,queryType, pagesize, pn))	data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s&characterNormalization=regPlusNorm&optionToggle=1"%(docpath,queryType, pagesize, pn))
page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&optionToggle=1'%(selfurl,url, viewMode, tocMode, tocPN))	page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&optionToggle=1'%(selfurl,url, viewMode, tocMode, tocPN))
text = page.replace('mode=image','mode=texttool')	text = page.replace('mode=image','mode=texttool')
#logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))

return text	return text

def manage_changeMpdlXmlTextServer(self,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):	def manage_changeMpdlXmlTextServer(self,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):
	#def manage_changeMpdlXmlTextServer(self,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de:30030/mpdl/interface/",timeout=40,RESPONSE=None):
"""change settings"""	"""change settings"""
self.title=title	self.title=title
self.timeout = timeout	self.timeout = timeout
Line 473 def manage_addMpdlXmlTextServerForm(self	Line 504 def manage_addMpdlXmlTextServerForm(self
pt = PageTemplateFile("zpt/manage_addMpdlXmlTextServer", globals()).__of__(self)	pt = PageTemplateFile("zpt/manage_addMpdlXmlTextServer", globals()).__of__(self)
return pt()	return pt()

def manage_addMpdlXmlTextServer(self,id,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):	def manage_addMpdlXmlTextServer(self,id,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):
	#def manage_addMpdlXmlTextServer(self,id,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de:30030/mpdl/interface/",timeout=40,RESPONSE=None):
"""add zogiimage"""	"""add zogiimage"""
newObj = MpdlXmlTextServer(id,title,serverUrl,timeout)	newObj = MpdlXmlTextServer(id,title,serverUrl,timeout)
self.Destination()._setObject(id, newObj)	self.Destination()._setObject(id, newObj)
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.222
changed lines
	Added in v.1.235