documentViewer/MpdlXmlTextServer.py - diff

Return to MpdlXmlTextServer.py CVS log

Up to [Repository] / documentViewer

Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.230 and 1.232

version 1.230, 2011/03/07 14:08:07	version 1.232, 2011/03/10 14:22:05
Line 21 class MpdlXmlTextServer(SimpleItem):	Line 21 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-proto.mpiwg-berlin.mpg.de/mpdl/interface/", serverName=None, timeout=40):
	#def __init__(self,id,title="",serverUrl="http://mpdl-test.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 183 class MpdlXmlTextServer(SimpleItem):	Line 185 class MpdlXmlTextServer(SimpleItem):
name = docinfo.get('name',None)	name = docinfo.get('name',None)
pn =pageinfo['current']	pn =pageinfo['current']
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']
Line 194 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)

Line 481 class MpdlXmlTextServer(SimpleItem):	Line 484 class MpdlXmlTextServer(SimpleItem):
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-proto.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):
	#def manage_changeMpdlXmlTextServer(self,title="",serverUrl="http://mpdl-test.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 495 def manage_addMpdlXmlTextServerForm(self	Line 499 def manage_addMpdlXmlTextServerForm(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-proto.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):
	#def manage_addMpdlXmlTextServer(self,id,title="",serverUrl="http://mpdl-test.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)

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

Removed from v.1.230
changed lines
	Added in v.1.232