--- zogiLib/zogiLib.py	2004/04/21 08:59:14	1.8
+++ zogiLib/zogiLib.py	2004/05/05 12:31:13	1.14
@@ -1,3 +1,4 @@
+
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
@@ -502,7 +503,7 @@ class zogiLib(Folder):
 
     def getPageNumTotal(self):
         """pagenums"""
-        return self.getDlInfo()['pt']
+        return self.getDlInfo()['pt'].encode('utf-8')
     
     
     def generateImageFolder(self):
@@ -529,7 +530,7 @@ class zogiLib(Folder):
         self.localFileBase=localFileBase
         #self._setObject('topTemplate',zogiLib_navTemplate(id='topTemplate'))
         self._setObject('mainTemplate',zogiLib_mainTemplate(id='mainTemplate',version=version))
-        self.generateImageFolder()
+        #self.generateImageFolder()
 
 
     manage_options = Folder.manage_options+(
@@ -538,7 +539,9 @@ class zogiLib(Folder):
 
     def option_js(self):
         """option_js"""
-        ret="""function setDLParam(e) {
+        ret="""
+          function setDLParam(e) {
+          var s;
           if (document.all) {
             s=e.srcElement;
           } else {
@@ -548,8 +551,8 @@ class zogiLib(Folder):
             window.opener.setParameter(s.name, s.value);
             window.opener.display(9);
           } else {
-            document.setParameter(s.name, s.value);
-            document.display(9);
+            setParameter(s.name, s.value);
+            display(9);
           }
         }"""
         return ret
@@ -557,8 +560,11 @@ class zogiLib(Folder):
                         
     def navigation_js(self):
         """Javascript"""
-        fileName=os.path.join(package_home(globals()),'js/navigation.js')
-        return file(fileName).read()
+        fileName = os.path.join(package_home(globals()),'js/js_lib.js')
+        js = file(fileName).read()
+        fileName = os.path.join(package_home(globals()),'js/dl_lib.js')
+        js += file(fileName).read()
+        return js 
 
 
             
@@ -586,6 +592,7 @@ class zogiLib(Folder):
         newParameter('ddpiy', '', 9);
         var picsize = new Size(100, 100);
         document.id='digilib';
+
         """
         return ret
 
@@ -593,11 +600,74 @@ class zogiLib(Folder):
     def generateScalerImg(self,requestString):
         """generate Scaler IMG Tag"""
         retStr=self.digilibBaseUrl+requestString
-        jS="""<script type="text/javascript">picsize = bestPicSize('scaler');
-        document.write('<img id="pic" src="%s&dw='+picsize.width+'&dh='+picsize.height+'" />')
+        jS="""<script type="text/javascript">var ps = bestPicSize('scaler');
+        document.write('<img id="pic" src="%s&dw='+ps.width+'&dh='+ps.height+'" />')
         </script>"""%retStr
         return jS
 
+
+    def mark1(self):
+        """mark image"""
+        fileName = os.path.join(package_home(globals()),'images/mark1.gif')
+        return file(fileName).read()
+
+    def mark2(self):
+        """mark image"""
+        fileName = os.path.join(package_home(globals()),'images/mark2.gif')
+        return file(fileName).read()
+
+    def mark3(self):
+        """mark image"""
+        fileName = os.path.join(package_home(globals()),'images/mark3.gif')
+        return file(fileName).read()
+
+    def mark4(self):
+        """mark image"""
+        fileName = os.path.join(package_home(globals()),'images/mark4.gif')
+        return file(fileName).read()
+
+    def mark5(self):
+        """mark image"""
+        fileName = os.path.join(package_home(globals()),'images/mark5.gif')
+        return file(fileName).read()
+
+    def mark6(self):
+        """mark image"""
+        fileName = os.path.join(package_home(globals()),'images/mark6.gif')
+        return file(fileName).read()
+
+    def mark7(self):
+        """mark image"""
+        fileName = os.path.join(package_home(globals()),'images/mark7.gif')
+        return file(fileName).read()
+
+    def mark8(self):
+        """mark image"""
+        fileName = os.path.join(package_home(globals()),'images/mark8.gif')
+        return file(fileName).read()
+
+    def corner1(self):
+        """mark image"""
+        fileName = os.path.join(package_home(globals()),'images/olinks.gif')
+        return file(fileName).read()
+
+    def corner2(self):
+        """mark image"""
+        fileName = os.path.join(package_home(globals()),'images/orechts.gif')
+        return file(fileName).read()
+
+    def corner3(self):
+        """mark image"""
+        fileName = os.path.join(package_home(globals()),'images/ulinks.gif')
+        return file(fileName).read()
+
+    def corner4(self):
+        """mark image"""
+        fileName = os.path.join(package_home(globals()),'images/urechts.gif')
+        return file(fileName).read()
+
+
+
     def changeZogiLibForm(self):
         """Main configuration"""
         pt=PageTemplateFile('Products/zogiLib/zpt/changeZogiLibForm.zpt').__of__(self)
@@ -630,7 +700,6 @@ class zogiLib(Folder):
     def index_html(self):
         """main action"""
 
-
         #pt=PageTemplateFile('Products/zogiLib/zpt/zogiLibMain_image.zpt').__of__(self)
         #return pt()
         return self.mainTemplate()
@@ -677,7 +746,7 @@ class zogiLib(Folder):
         ws=self.getParam('ws')
         if ws:
             if int(ws)==1:
-                return
+                return 1
             else:
                 return int(ws)-1
         else: