--- ImageArchive/ImageArchive.py	2004/06/25 12:49:01	1.22
+++ ImageArchive/ImageArchive.py	2004/07/19 14:30:14	1.23
@@ -74,10 +74,11 @@ class ImageDigilib(Folder,Persistent,Imp
         f=open(filename,"w")
         f.write(filedata)
         f.close()
-	try:
-        	os.chmod(filename,0644)
-	except:
-		"""hack"""
+        try:
+            os.chmod(filename,0644)
+        except:
+            """hack"""
+
         os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath)
 
     
@@ -167,9 +168,22 @@ class ImageCollection(Folder, Persistent
         {'label':'Recalculate Metadata','action':'recalculateMeta'},
         {'label':'Import Metadata','action':'importMetaForm'},
         {'label':'Rescale thumbs','action':'scaleThumbs'},
+        {'label':'Weight (ECHO)','action':'weightForm'},
         )
 
+    def weightForm(self):
+        """Weight"""
+        pt=PageTemplateFile('Products/ImageArchive/zpt/changeWeight.zpt').__of__(self)
+        return pt()
 
+    def changeWeight(self,weight,RESPONSE=None):
+        """Change weight"""
+        self.weight=weight
+        
+        if RESPONSE is not None:
+            RESPONSE.redirect('manage_main')
+
+        
     def importMetaForm(self):
         """import metadata"""
         pt=PageTemplateFile('Products/ImageArchive/zpt/importMeta.zpt').__of__(self)
@@ -551,6 +565,8 @@ class ImageCollection(Folder, Persistent
         if rows:
             if cols*rows >idsnumber:
                 rows=int(idsnumber/cols)+1
+
+        #print cols,rows
         return (cols,rows)
                 
         
@@ -561,30 +577,38 @@ class ImageCollection(Folder, Persistent
         
         if self.REQUEST.SESSION.has_key("filename"):
             filename=self.REQUEST.SESSION["filename"]
+            
+                
             try:
                 startId=filename
+                if startId=="":
+                    startId=idsAll[0][0:]    
             except:
-                startId=idsAll[0]
+                startId=idsAll[0][0:]    
         else:
-            startId=idsAll[0]
+            startId=idsAll[0][0:]
             
 
-        print "NOR:",numberOfRows
+        
 
         if numberOfRows:
+           
+            startPic=idsAll.index(startId)
             try:
+                
                 startPic=idsAll.index(startId)
                 endPic=startPic+numberOfColumns*numberOfRows
                 ids=idsAll[startPic:endPic]
             except:
                 ids=idsAll
         else:
+
             ids=idsAll
 
-            
+          
         self.REQUEST.SESSION['ids']=ids
         number=int(len(ids)/numberOfColumns)+1
-        
+    
         return range(number+1)
 
     def show_thumbs_columns(self,row,numberOfColumns):
@@ -616,6 +640,12 @@ class ImageCollection(Folder, Persistent
         pt=PageTemplateFile('Products/ImageArchive/zpt/thumb2.zpt').__of__(self)
         return pt()
 
+    def thumblistNewWindow(self):
+        """Thumbs mit clik neues Fenster oeffnen"""
+        pt=PageTemplateFile('Products/ImageArchive/zpt/thumbNewWindow.zpt').__of__(self)
+        return pt()
+        
+
     def navig_selected_html(self):
         """navigation"""
         #self.REQUEST.SESSION['URL']=self.REQUEST['URL0']
@@ -669,6 +699,10 @@ class ImageCollectionIFrame(ImageCollect
     meta_type="ImageCollectionIFrame"
     label=ImageCollection.title
 
+    def getImageTag(self):
+        """ hack : method needed by echo_content"""
+        return ""
+    
     def rotate(self,angle,url,RESPONSE):
 	"""rotate"""