--- zogiLib/zogiLib.py	2004/04/01 10:54:17	1.6
+++ zogiLib/zogiLib.py	2004/04/16 14:07:08	1.7
@@ -504,7 +504,7 @@ class zogiLib(Folder):
     def getDlInfo(self):
         """DLInfo"""
         paramH={}
-        baseUrl=re.sub("servlet/Scaler","/dlInfo-xml.jsp",self.digilibBaseUrl)
+        baseUrl=re.sub("servlet/Scaler","dlInfo-xml.jsp",self.digilibBaseUrl)
         
         url=urllib.urlopen(baseUrl+self.REQUEST['QUERY_STRING'])
         dom=xml.dom.minidom.parse(url)
@@ -528,7 +528,7 @@ class zogiLib(Folder):
                 fn=file(os.path.join(pathName,image))
                 self.images.manage_addImage(image,fn)
             except:
-                print "ZOGILIB not importet:",image
+                print "ZOGILIB not imported:",image
                 
             
         
@@ -551,14 +551,20 @@ class zogiLib(Folder):
 
     def option_js(self):
         """option_js"""
-        ret="""function setParam(e) {
-        if (document.all) s=e.srcElement;
-	                else s=e.target;
-                        
-                        if (window.opener) window.opener.location="%s/setParam?"+s.name+'='+s.value;
-                        else document.location="%s/setParam?"+s.name+'='+s.value;
-                        location
-                        }"""%(self.REQUEST['URL1'],self.REQUEST['URL1'])
+        ret="""function setDLParam(e) {
+          if (document.all) {
+            s=e.srcElement;
+          } else {
+            s=e.target;
+          }
+          if (window.opener) {
+            window.opener.setParameter(s.name, s.value);
+            window.opener.display(9);
+          } else {
+            document.setParameter(s.name, s.value);
+            document.display(9);
+          }
+        }"""
         return ret
                         
                         
@@ -571,78 +577,38 @@ class zogiLib(Folder):
             
     def generateTopJavaScript(self):
         """generate script"""
-        ret="""var baseUrl = '%s'; """% self.REQUEST['URL0']
-        ret+="""newParameter('fn', '%s', '', 1);
-                newParameter('pn', '%s', '1', 1);
-                newParameter('ws', '%s', '1.0', 1);
-                newParameter('mo', '%s', '', 1);
-                newParameter('mk', '%s', '', 3);
-                newParameter('wx', '%s', '0.0', 2);
-                newParameter('wy', '%s', '0.0', 2);
-                newParameter('ww', '%s', '1.0', 2);
-                newParameter('wh', '%s', '1.0', 2);
-                newParameter('pt', '%s', '%s', 9);
-                newParameter('brgt', '%s', '0.0', 1);
-                newParameter('cont', '%s', '0.0', 1);
-                newParameter('rot', '%s', '0.0', 1);
-                newParameter('rgba', '%s', '', 1);
-                newParameter('rgbm', '%s', '', 1);
-                newParameter('ddpix', '%s', '', 9);
-                newParameter('ddpiy', '%s', '', 9);"""%(getString(self,'fn'),
-                 getString(self,'pn',1),
-                 getString(self,'ws',1.0),
-                 getString(self,'mo',''),
-                 getString(self,'mk',''),
-                 getString(self,'wx',0.0),
-                 getString(self,'wy',0.0),
-                 getString(self,'ww',1.0),
-                 getString(self,'wh',1.0),
-                 getString(self,'pt',100),getString(self,'pt',100),
-                 getString(self,'brgt',0.0),
-                 getString(self,'cont',0.0),
-                 getString(self,'rot',0.0),
-                 getString(self,'rgba','0/0/0'),
-                 getString(self,'rgbm','0/0/0'),
-                 getString(self,'ddpix',0.0),
-                 getString(self,'ddpiy',0.0)
-                 )
-
+        ret="""
+        var baseUrl = '%s'; """% self.REQUEST['URL0']
         ret+="""
-
-        var wwidth, wheight;
-        if (self.innerHeight) // all except Explorer
-        {
-        wwidth = self.innerWidth;
-        wheight = self.innerHeight;
-        }
-        else if (document.documentElement && document.documentElement.clientHeight)
-        // Explorer 6 Strict Mode
-        {
-        wwidth = document.documentElement.clientWidth;
-        wheight = document.documentElement.clientHeight;
-        }
-        else if (document.body) // other Explorers
-        {
-        wwidth = document.body.clientWidth;
-        wheight = document.body.clientHeight;
-        }
-
-        document.id="digilib"
-        
+        newParameter('fn', '', 1);
+        newParameter('pn', '1', 1);
+        newParameter('ws', '1.0', 1);
+        newParameter('mo', '', 1);
+        newParameter('mk', '', 3);
+        newParameter('wx', '0.0', 2);
+        newParameter('wy', '0.0', 2);
+        newParameter('ww', '1.0', 2);
+        newParameter('wh', '1.0', 2);
+        newParameter('pt', '0', 9);
+        newParameter('brgt', '0.0', 1);
+        newParameter('cont', '0.0', 1);
+        newParameter('rot', '0.0', 1);
+        newParameter('rgba', '', 1);
+        newParameter('rgbm', '', 1);
+        newParameter('ddpix', '', 9);
+        newParameter('ddpiy', '', 9);
+        var picsize = new Size(100, 100);
+        document.id='digilib';
         """
         return ret
 
-
-    
-                
-                
-        
         
     def generateScalerImg(self,requestString):
-        """generate Scaler Tag"""
+        """generate Scaler IMG Tag"""
         retStr=self.digilibBaseUrl+requestString
-        jS="""<script type="text/javascript">
-        document.write("<img id=\\\"pic\\\" src=\\\"%s&dw="+wwidth+"&dh="+wheight+"\\\"/>")</script>"""%retStr
+        jS="""<script type="text/javascript">picsize = bestPicSize('scaler');
+        document.write('<img id="pic" src="%s&dw='+picsize.width+'&dh='+picsize.height+'" />')
+        </script>"""%retStr
         return jS
 
     def changeZogiLibForm(self):
@@ -662,7 +628,7 @@ class zogiLib(Folder):
             
     def nav_html(self,fileName):
         """navigations frame"""
-
+        ## currently not in use
         # suche nach index.meta mit zogilib thumb info
         
         templ=readNavTemp(self.localFileBase+"/"+fileName)