--- ImageArchive/ImageArchive.py	2004/07/22 16:32:27	1.24
+++ ImageArchive/ImageArchive.py	2004/08/03 13:36:30	1.26
@@ -515,17 +515,18 @@ class ImageCollection(Folder, Persistent
             colRows=self.getColTimesRow()
             num=int(len(ids)/(colRows[0]*colRows[1]))
             a=colRows[0]*colRows[1]
-            if num/a+1>1:
+            #print num,num+1
+            if num+1>1:
 
                 ret="<b>Show thumbnail group no:</b></br>"
-                for i in range(num/a+1):
+                for i in range(num+1):
                     k=i*a
                     if selected:                
                         href=self.REQUEST['URL1']+"/selection?filename="+ids[k]
                     else:
                         href=self.REQUEST['URL1']+"?filename="+ids[k]
 
-                    ret+="""<a href="%s" target=_"top">%i</a>&nbsp;&nbsp;"""%(href,i)
+                    ret+="""<a href="%s" target="_top">%i</a>&nbsp;&nbsp;"""%(href,i)
 
             else:
                 ret=""
@@ -708,7 +709,12 @@ class ImageCollection(Folder, Persistent
 
         self.REQUEST.SESSION['filename']=filen
         
-        self.REQUEST.SESSION['showall']=self.REQUEST.get('showall','no')
+        if self.REQUEST.has_key('showall'):
+
+            self.REQUEST.SESSION['showall']=self.REQUEST.get('showall')
+        else:
+            self.REQUEST.SESSION['showall']=self.REQUEST.SESSION.get('showall','no')
+            
         
         pt=PageTemplateFile('Products/ImageArchive/zpt/overview.zpt').__of__(self)
         return pt()