--- ImageArchive/ImageArchive.py	2004/01/26 08:18:05	1.15
+++ 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
@@ -342,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):
@@ -367,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):
@@ -518,8 +520,14 @@ class ImageCollection(Folder, Persistent
         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")