Changeset 132:39167e96e582 in documentViewer

Timestamp:

Jun 17, 2010, 5:38:59 PM (14 years ago)

Author:

casties

Branch:

default

Message:

fixed creation of text server on init

Files:

• MpdlXmlTextServer.py (modified) (1 diff)
• documentViewer.py (modified) (4 diffs)

MpdlXmlTextServer.py

@@ -21 +21 @@
     manage_changeMpdlXmlTextServerForm = PageTemplateFile("zpt/manage_changeMpdlXmlTextServer", globals())
         
-    def __init__(self,id,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/", timeout=40):
+    def __init__(self,id,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/", serverName=None, timeout=40):
         """constructor"""
         self.id=id
         self.title=title
         self.timeout = timeout
-        self.serverUrl = serverUrl
+        if serverName is None:
+            self.serverUrl = serverUrl
+        else:
+            self.serverUrl = "http://%s/mpdl/interface/"%serverName
 
         

documentViewer.py

@@ -146 +146 @@
         try:
             import MpdlXmlTextServer
-            textServer = MpdlXmlTextServer(id='fulltextclient')
+            textServer = MpdlXmlTextServer.MpdlXmlTextServer(id='fulltextclient',serverName=textServerName)
             #templateFolder['fulltextclient'] = xmlRpcClient
             templateFolder._setObject('fulltextclient',textServer)
@@ -244 +244 @@
             
         if not getattr(self, 'digilibBaseUrl', None):
-            self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"
+            self.digilibBaseUrl = self.findDigilibUrl() or "http://digilib.mpiwg-berlin.mpg.de/digitallibrary"
             
         docinfo = self.getDocinfo(mode=mode,url=url)
-        
         
         if tocMode != "thumbs":
@@ -254 +253 @@
             
         if viewMode=="auto": # automodus gewaehlt
-            if docinfo.has_key("textURL") or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert
+            if docinfo.has_key('textURL') or docinfo.has_key('textURLPath'): #texturl gesetzt und textViewer konfiguriert
                 viewMode="text_dict"
             else:
@@ -268 +267 @@
         if mk is None:
             return ""
-        if type(mk) is not ListType:
-                mk=[mk]
+        if type(mk) is not ListType:
+            mk=[mk]
         for m in mk:
             ret+="mk=%s"%m