--- ImageArchive/ImageArchive.py 2005/03/15 20:31:10 1.46
+++ ImageArchive/ImageArchive.py 2005/03/18 16:57:21 1.49
@@ -193,7 +193,7 @@ class ImageDigilib(Folder,Persistent,Imp
self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%filename)
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
#print path
- imagefh=urllib.urlopen(path)
+ imagefh=urllib.urlopen(path,'rb')
self.REQUEST.RESPONSE.write(imagefh.read())
self.REQUEST.RESPONSE.close()
@@ -856,9 +856,10 @@ class ImageCollection(Folder, Persistent
def show_selected_thumbs(self):
#ids=[]
-
- return self.REQUEST.SESSION['filenames']
-
+ try:
+ return self.REQUEST.SESSION['filenames']
+ except:
+ return None
def show_thumbs(self):
ids=[]
for entry in self.__dict__:
@@ -965,6 +966,7 @@ class ImageCollection(Folder, Persistent
return "No entries"
if showall=='no':
+ actualNr=0
ids=self.show_thumbs()
colRows=self.getColTimesRow()
num=int(len(ids)/(colRows[0]*colRows[1]))
@@ -972,19 +974,63 @@ class ImageCollection(Folder, Persistent
num+=1
a=colRows[0]*colRows[1]
#print num,num+1
+
if num>1:
- ret="Show thumbnail group no:"
- 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[int(k)]
+ ret=""
+ if selected:
+ ret+="""