--- zogiLib/zogiLib.py	2010/04/09 18:32:31	1.71
+++ zogiLib/zogiLib.py	2011/02/14 16:33:43	1.73
@@ -69,7 +69,7 @@ class zogiImage(SimpleItem):
         if baseUrl:
             self.baseUrl=baseUrl
         else:
-            self.baseUrl="http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary/servlet/Scaler?"
+            self.baseUrl="http://digilib.mpiwg-berlin.mpg.de/digitallibrary/servlet/Scaler?"
             
         self.queryString=queryString
         self.content_type=content_type
@@ -411,6 +411,8 @@ class zogiLib(Folder):
 
     def getScalerUrl(self,requestString=""):
         """send scaler url"""
+        if requestString is None:
+            requestString = ""
         if self.dlServerURL[-1] == '?':
             # full Servlet URL
             return self.dlServerURL + requestString
@@ -436,8 +438,6 @@ class zogiLib(Folder):
         if  self.REQUEST.SESSION.has_key('scalerDiv'):
             (requestString, bottom, side, width, height) = self.REQUEST.SESSION['scalerDiv']
         # if not explicitly defined take normal request
-        if not requestString:
-            requestString = self.getAllDLParams()
         url = self.getScalerUrl(requestString=requestString)
         # take insets from options if present
         if options is not None:
@@ -461,7 +461,13 @@ class zogiLib(Folder):
             tag += '<script type="text/javascript">'
             tag += "var ps = bestPicSize(getElement('scaler'));"
             # write img tag with javascript
-            tag += 'document.write(\'<img id="pic" src="%s&dw=\'+(ps.width%s)+\'&dh=\'+(ps.height%s)+\'" />\');'%(url, s_par, b_par)
+            if requestString:
+                # take all parameters from requestString
+                tag += 'document.write(\'<img id="pic" src="%s&dw=\'+(ps.width%s)+\'&dh=\'+(ps.height%s)+\'" />\');'%(url, s_par, b_par)
+            else:
+                # use javascript to filter digilib parameters
+                tag += """document.write('<img id="pic" src="%s'+getAllParameters(31)+'&dw='+(ps.width%s)+'&dh='+(ps.height%s)+'" />');"""%(url, s_par, b_par)
+                
             tag += '</script>'
             if bt['isN4']:
                 tag += '</ilayer>'