--- ImageArchive/ImageArchive.py	2004/01/06 16:06:24	1.10
+++ ImageArchive/ImageArchive.py	2004/03/05 11:56:50	1.17
@@ -62,6 +62,8 @@ class ImageDigilib(Folder,Persistent,Imp
         self.filename=filename
         self.meta=meta
 
+            
+    
     def getMeta(self):
         """ausgabe der metadaten"""
         return self.meta
@@ -102,7 +104,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 +210,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"""
@@ -336,7 +344,7 @@ class ImageCollection(Folder, Persistent
         #print ret
         #pt=PageTemplateFile('Products/ImageArchive/out.zpt').__of__(self)
         #print self.ImageStoragePath
-        os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageStoragePath)
+        os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath)
         RESPONSE.redirect('manage_main')
     
     def ImportFiles(self,RESPONSE=None):
@@ -361,7 +369,7 @@ class ImageCollection(Folder, Persistent
         #print ret
         #pt=PageTemplateFile('Products/ImageArchive/out.zpt').__of__(self)
         #print self.ImageStoragePath
-        os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageStoragePath)
+        os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath)
         RESPONSE.redirect('manage_main')
         
     def ImageCollection_config(self):
@@ -400,27 +408,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 +438,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,27 +466,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
-            else:
-                nr=0
+                try:
+                    num=ids.index(filename)
+                except:
+                    num=0
 
-            if ids.index(filename)==0:
-                return ""
-            else:
-                if selected:
-                    return "<a href=\""+self.REQUEST['URL1']+"/selection?filename="+ids[nr]+"\" target=\"_top\">previous sets</a>"
+                if num==0:
+                    return ""
                 else:
-                    return "<a href=\""+self.REQUEST['URL1']+"?filename="+ids[nr]+"\" target=\"_top\">previous sets</a>"
-        else:
-            return ""
+                    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"""
@@ -500,15 +516,24 @@ class ImageCollection(Folder, Persistent
         """set coltimes row"""
         RESPONSE=self.REQUEST.RESPONSE
         if not rows:
-            rows=100000
-        if rows="":
-            rows=100000
-        RESPONSE.setCookie("ImageViewerRows",rows)
+            rows=None
+        if rows=="":
+            rows=None
+
+        if rows=="all":
+            rows=None
+        
+
+        if rows:
+            RESPONSE.setCookie("ImageViewerRows",rows)
+        else:
+            RESPONSE.expireCookie("ImageViewerRows")
         RESPONSE.setCookie("ImageViewerCols",cols)
 
         RESPONSE.redirect(self.REQUEST['URL1']+"/setDone")
         
     def getColTimesRow(self):
+        """coltimesrow"""
         
         REQUEST=self.REQUEST
         """matrix"""
@@ -517,16 +542,20 @@ class ImageCollection(Folder, Persistent
             try:
                 rows=int(REQUEST.cookies["ImageViewerRows"])
             except:
-                rows=20
+                rows=None
         else:
-            rows=20
+            rows=None
             
         if REQUEST.cookies.has_key("ImageViewerCols"):
-            print "COLS",REQUEST.cookies["ImageViewerCols"]
+            #print "COLS",REQUEST.cookies["ImageViewerCols"]
             cols=int(REQUEST.cookies["ImageViewerCols"])
         else:
-            cols=4
-        print cols,rows
+            cols=3
+
+        idsnumber=len(self.show_thumbs())
+        if rows:
+            if cols*rows >idsnumber:
+                rows=int(idsnumber/cols)+1
         return (cols,rows)
                 
         
@@ -548,9 +577,12 @@ class ImageCollection(Folder, Persistent
         print "NOR:",numberOfRows
 
         if numberOfRows:
-            startPic=idsAll.index(startId)
-            endPic=startPic+numberOfColumns*numberOfRows
-            ids=idsAll[startPic:endPic]
+            try:
+                startPic=idsAll.index(startId)
+                endPic=startPic+numberOfColumns*numberOfRows
+                ids=idsAll[startPic:endPic]
+            except:
+                ids=idsAll
         else:
             ids=idsAll