Mercurial > hg > documentViewer

comparison documentViewer.py @ 132:39167e96e582

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed creation of text server on __init__
author casties
date Thu, 17 Jun 2010 19:38:59 +0200
parents 5c779d7b5f71
children 40730cfbcb8e
comparison
equal deleted inserted replaced
131:519439a80cd1 132:39167e96e582
143 templateFolder = Folder('template') 143 templateFolder = Folder('template')
144 #self['template'] = templateFolder # Zope-2.12 style 144 #self['template'] = templateFolder # Zope-2.12 style
145 self._setObject('template',templateFolder) # old style 145 self._setObject('template',templateFolder) # old style
146 try: 146 try:
147 import MpdlXmlTextServer 147 import MpdlXmlTextServer
148 textServer = MpdlXmlTextServer(id='fulltextclient') 148 textServer = MpdlXmlTextServer.MpdlXmlTextServer(id='fulltextclient',serverName=textServerName)
149 #templateFolder['fulltextclient'] = xmlRpcClient 149 #templateFolder['fulltextclient'] = xmlRpcClient
150 templateFolder._setObject('fulltextclient',textServer) 150 templateFolder._setObject('fulltextclient',textServer)
151 except Exception, e: 151 except Exception, e:
152 logging.error("Unable to create MpdlXmlTextServer for fulltextclient: "+str(e)) 152 logging.error("Unable to create MpdlXmlTextServer for fulltextclient: "+str(e))
153 try: 153 try:
241 # this won't work 241 # this won't work
242 logging.error("template folder missing!") 242 logging.error("template folder missing!")
243 return "ERROR: template folder missing!" 243 return "ERROR: template folder missing!"
244 244
245 if not getattr(self, 'digilibBaseUrl', None): 245 if not getattr(self, 'digilibBaseUrl', None):
246 self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary" 246 self.digilibBaseUrl = self.findDigilibUrl() or "http://digilib.mpiwg-berlin.mpg.de/digitallibrary"
247 247
248 docinfo = self.getDocinfo(mode=mode,url=url) 248 docinfo = self.getDocinfo(mode=mode,url=url)
249
250 249
251 if tocMode != "thumbs": 250 if tocMode != "thumbs":
252 # get table of contents 251 # get table of contents
253 docinfo = self.getToc(mode=tocMode, docinfo=docinfo) 252 docinfo = self.getToc(mode=tocMode, docinfo=docinfo)
254 253
255 if viewMode=="auto": # automodus gewaehlt 254 if viewMode=="auto": # automodus gewaehlt
256 if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert 255 if docinfo.has_key('textURL') or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert
257 viewMode="text_dict" 256 viewMode="text_dict"
258 else: 257 else:
259 viewMode="images" 258 viewMode="images"
260 259
261 pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo,viewMode=viewMode,tocMode=tocMode) 260 pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo,viewMode=viewMode,tocMode=tocMode)
265 264
266 def generateMarks(self,mk): 265 def generateMarks(self,mk):
267 ret="" 266 ret=""
268 if mk is None: 267 if mk is None:
269 return "" 268 return ""
270 if type(mk) is not ListType: 269 if type(mk) is not ListType:
271 mk=[mk] 270 mk=[mk]
272 for m in mk: 271 for m in mk:
273 ret+="mk=%s"%m 272 ret+="mk=%s"%m
274 return ret 273 return ret
275 274
276 275