--- ImageArchive/ImageArchive.py	2004/01/06 16:47:49	1.12
+++ ImageArchive/ImageArchive.py	2004/01/26 08:18:05	1.15
@@ -102,7 +102,7 @@ class ImageDigilib(Folder,Persistent,Imp
         
         path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&dw=100&dh=100&mo=lores"
         #path="/mpiwg/online/"+self.ImageViewerPath+"/"+thumbname
-        self.REQUEST.SESSION['string']="<img width=100 border=\"0\" src=\"%s\">"% path
+        self.REQUEST.SESSION['string']="<img border=\"0\" src=\"%s\">"% path
         pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self)
         return pt()
     
@@ -208,44 +208,50 @@ class ImageCollection(Folder, Persistent
 
     def nextImage(self,request,selected=None):
         """show nextimage"""
-        ids=self.show_thumbs()
-        if request.SESSION.has_key("filename"):
-            filename=request.SESSION["filename"]
-            try:
-                nr=ids.index(filename)
-            except:
+        try:
+            ids=self.show_thumbs()
+            if request.SESSION.has_key("filename"):
+                filename=request.SESSION["filename"]
+                try:
+                    nr=ids.index(filename)
+                except:
+                    nr=0
+            else:
                 nr=0
-        else:
-            nr=0
 
-        if nr==len(ids)-1:
-            return ""
-        else:
-            if selected:
-                return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr+1]+"\" target=\"_top\">next image</a>"
+            if nr==len(ids)-1:
+                return ""
             else:
-                return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr+1]+"\" target=\"_top\">next image</a>"
-            
+                if selected:
+                    return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr+1]+"\" target=\"_top\">next image</a>"
+                else:
+                    return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr+1]+"\" target=\"_top\">next image</a>"
+        except:
+            return ""
+        
     def prevImage(self,request,selected=None):
         """show nextimage"""
         #return self.getId()
-        ids=self.show_thumbs()
-        if request.SESSION.has_key("filename"):
-            filename=request.SESSION["filename"]
-            try:
-                nr=ids.index(filename)
-            except:
+        try:
+            ids=self.show_thumbs()
+            if request.SESSION.has_key("filename"):
+                filename=request.SESSION["filename"]
+                try:
+                    nr=ids.index(filename)
+                except:
+                    nr=0
+            else:
                 nr=0
-        else:
-            nr=0
 
-        if nr==0:
-            return ""
-        else:
-            if selected:
-                return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr-1]+"\" target=\"_top\">previous image</a>"
+            if nr==0:
+                return ""
             else:
-                return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr-1]+"\" target=\"_top\">previous image</a>"
+                if selected:
+                    return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr-1]+"\" target=\"_top\">previous image</a>"
+                else:
+                    return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr-1]+"\" target=\"_top\">previous image</a>"
+        except:
+            return ""
         
     def meta_default(self,filename):
         """url der metadaten"""
@@ -400,27 +406,29 @@ class ImageCollection(Folder, Persistent
 
     def firstSets(self,selected=None):
         ids=self.show_thumbs()
-        if selected:
-            return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[0]+"\" target=\"_top\">first sets</a>"
-        else:
-            return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[0]+"\" target=\"_top\">first sets</a>"
+        if ids:
+            if selected:
+                return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[0]+"\" target=\"_top\">first sets</a>"
+            else:
+                return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[0]+"\" target=\"_top\">first sets</a>"
 
     def lastSets(self,selected=None):
         ids=self.show_thumbs()
-        colRows=self.getColTimesRow()
-        
-        if colRows[1]:
-            nr=len(ids)-colRows[0]*colRows[1]
-        else:
-            nr=0
-            
-        if nr<0:
-            nr=0
-        
-        if selected:
-            return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">last set</a>"
-        else:
-            return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">last sets</a>"
+        if ids:
+            colRows=self.getColTimesRow()
+
+            if colRows[1]:
+                nr=len(ids)-colRows[0]*colRows[1]
+            else:
+                nr=0
+
+            if nr<0:
+                nr=0
+
+            if selected:
+                return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">last set</a>"
+            else:
+                return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">last sets</a>"
 
         
                 
@@ -428,26 +436,27 @@ class ImageCollection(Folder, Persistent
         """show nextimage"""
         ids=self.show_thumbs()
         colRows=self.getColTimesRow()
-        if colRows[1]:
-            
-            if self.REQUEST.SESSION.has_key("filename"):
-                filename=self.REQUEST.SESSION["filename"]
-                try:
-                    nr=ids.index(filename)+colRows[0]*colRows[1]
-                    if nr>=len(ids):
-                        nr=len(ids)-1
-                except:
+        if ids:
+            if colRows[1]:
+
+                if self.REQUEST.SESSION.has_key("filename"):
+                    filename=self.REQUEST.SESSION["filename"]
+                    try:
+                        nr=ids.index(filename)+colRows[0]*colRows[1]
+                        if nr>=len(ids):
+                            nr=len(ids)-1
+                    except:
+                        nr=0
+                else:
                     nr=0
-            else:
-                nr=0
 
-            if nr==len(ids)-1:
-                return ""
-            else:
-                if selected:
-                    return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">next set</a>"
+                if nr==len(ids)-1:
+                    return ""
                 else:
-                    return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">next set</a>"
+                    if selected:
+                        return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">next set</a>"
+                    else:
+                        return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">next set</a>"
 
     def prevSets(self,selected=None):
         
@@ -455,31 +464,32 @@ class ImageCollection(Folder, Persistent
         #return self.getId()
         ids=self.show_thumbs()
         colRows=self.getColTimesRow()
-        if colRows[1]:
-            if self.REQUEST.SESSION.has_key("filename"):
-                filename=self.REQUEST.SESSION["filename"]
-                try:
-                    nr=ids.index(filename)-colRows[0]*colRows[1]
-                    if nr<0:
+        if ids:
+            if colRows[1]:
+                if self.REQUEST.SESSION.has_key("filename"):
+                    filename=self.REQUEST.SESSION["filename"]
+                    try:
+                        nr=ids.index(filename)-colRows[0]*colRows[1]
+                        if nr<0:
+                            nr=0
+                    except:
                         nr=0
-                except:
+                else:
                     nr=0
+                try:
+                    num=ids.index(filename)
+                except:
+                    num=0
+
+                if num==0:
+                    return ""
+                else:
+                    if selected:
+                        return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">previous sets</a>"
+                    else:
+                        return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">previous sets</a>"
             else:
-                nr=0
-            try:
-                num=ids.index(filename)
-            except:
-                num=0
-            
-            if num==0:
                 return ""
-            else:
-                if selected:
-                    return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">previous sets</a>"
-                else:
-                    return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">previous sets</a>"
-        else:
-            return ""
             
     def show_thumbs_selected_rows(self,numberOfColumns):
         """Ausgabe anzahl"""
@@ -532,7 +542,7 @@ class ImageCollection(Folder, Persistent
             #print "COLS",REQUEST.cookies["ImageViewerCols"]
             cols=int(REQUEST.cookies["ImageViewerCols"])
         else:
-            cols=4
+            cols=3
 
         idsnumber=len(self.show_thumbs())
         if rows: