--- ImageArchive/ImageArchive.py 2004/07/22 16:32:27 1.24
+++ ImageArchive/ImageArchive.py 2004/09/01 17:40:15 1.28
@@ -9,6 +9,7 @@ import os
import os.path
import urllib
import xml.dom.minidom
+import operator
def getText(nodelist):
@@ -510,22 +511,31 @@ class ImageCollection(Folder, Persistent
def showRuler(self,selected=None):
"""show ruler"""
showall =self.REQUEST.SESSION.get('showall','no')
+ ids=self.show_thumbs()
+ if len(ids)==0:
+ return "No entries"
+
if showall=='no':
ids=self.show_thumbs()
colRows=self.getColTimesRow()
num=int(len(ids)/(colRows[0]*colRows[1]))
+ if not (operator.mod(len(ids),colRows[0]*colRows[1])==0):
+ num+=1
a=colRows[0]*colRows[1]
- if num/a+1>1:
+ #print num,num+1
+ if num>1:
ret="Show thumbnail group no:"
- for i in range(num/a+1):
+ for i in range(num):
+ if (operator.mod(i,10)==0) and i>0:
+ ret +="
" #alle 10 linebreak einfuegen
k=i*a
if selected:
href=self.REQUEST['URL1']+"/selection?filename="+ids[k]
else:
- href=self.REQUEST['URL1']+"?filename="+ids[k]
+ href=self.REQUEST['URL1']+"?filename="+ids[int(k)]
- ret+="""%i """%(href,i)
+ ret+="""%i """%(href,i)
else:
ret=""
@@ -604,7 +614,8 @@ class ImageCollection(Folder, Persistent
"""Ausgabe anzahl"""
idsAll=self.show_thumbs()
-
+ if len(idsAll)==0: #keine Einträge
+ return 0
if self.REQUEST.SESSION.has_key("filename"):
filename=self.REQUEST.SESSION["filename"]
@@ -708,7 +719,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()