--- 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 "<b>No entries</b>"
         
         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="<b>Show thumbnail group no:</b></br>"
-                for i in range(num):
-                    if (operator.mod(i,10)==0) and i>0:
-                        ret +="<br/>" #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+="""<select onChange="parent.location.href='"""+self.REQUEST['URL1']+"""/selection?filename='+this.options[this.selectedIndex].value">"""
+                else:
+			ret+="""<select onChange="parent.location.href='"""+self.REQUEST['URL1']+"""?filename='+this.options[this.selectedIndex].value">"""
+		for i in range(num):
+			try:
+			  nr=ids.index(self.REQUEST.SESSION['filename'])
+			except:
+			  nr=0
+		        k=i*a	
+			if (k <= nr) and (nr < i*(a+1)):
+			   actualNr=i
+			   ret+="""<option value="%s" selected>%i</option>"""%(ids[k],i)
+			else:
+	    		   ret+="""<option value="%s">%i</option>"""%(ids[k],i)
+		ret+="</select>"	
+		anf="<b>Show thumbnail group no:</b></br>"
+		
+		
+		try:
+		  if selected:                
+                        href=self.REQUEST['URL1']+"/selection?filename="+ids[(actualNr-1)*a]
+                  else:
+                        href=self.REQUEST['URL1']+"?filename="+ids[int((actualNr-1)*a)]
+		
+		  anf+="""<a href="%s" target="_top">%s</a>&nbsp;&nbsp;"""%(href,"prev")
+		except:
+		  pass
+		ret=anf+ret
+		
+		try:
+		  
+		  if selected:                
+                        href=self.REQUEST['URL1']+"/selection?filename="+ids[(actualNr+1)*a]
+                  else:
+                        href=self.REQUEST['URL1']+"?filename="+ids[int((actualNr+1)*a)]
+		
+		  end="""<a href="%s" target="_top">%s</a>&nbsp;&nbsp;"""%(href,"next")
+		except:
+		  end=""
+		ret=ret+end
 
-                    ret+="""<a href="%s" target="_top">%i</a>&nbsp;&nbsp;"""%(href,i)
+
+                #for i in range(num):
+                #    
+                #        ret +="<br/>" #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+="""<a href="%s" target="_top">%i</a>&nbsp;&nbsp;"""%(href,i)
 
             else:
                 ret=""
@@ -997,6 +1043,9 @@ class ImageCollection(Folder, Persistent
     def show_thumbs_selected_rows(self,numberOfColumns):
         """Ausgabe anzahl"""
         ids=self.show_selected_thumbs()
+
+        if not ids:
+		return None
         self.REQUEST.SESSION['ids']=ids
         number=int(len(ids)/numberOfColumns)+1
         self.REQUEST.SESSION['number']=range(number)