--- ImageArchive/ImageArchive.py	2004/03/11 19:44:17	1.18
+++ ImageArchive/ImageArchive.py	2004/06/25 12:49:01	1.22
@@ -74,7 +74,10 @@ class ImageDigilib(Folder,Persistent,Imp
         f=open(filename,"w")
         f.write(filedata)
         f.close()
-        os.chmod(filename,0644)
+	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)
 
     
@@ -83,7 +86,7 @@ class ImageDigilib(Folder,Persistent,Imp
         
     def download(self):
         """download"""
-        path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&mo=rawfile,highres"
+        path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&mo=rawfile,hires"
         #self.REQUEST.SESSION['string']="<img src=\"%s\">"% path
         #pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self)
         return self.REQUEST.RESPONSE.redirect(path)
@@ -110,7 +113,7 @@ class ImageDigilib(Folder,Persistent,Imp
         """show image"""
         #DEVELOP: take first one for server
         
-        path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/digilib.jsp?fn="+self.ImageViewerPath+"/"+self.filename
+        path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+self.filename
 
         #path="http://localhost:8080/mpiwg/online/"+self.ImageViewerPath+"/"+self.filename
         #self.REQUEST.SESSION['string']="<img src=\"%s\">"% path
@@ -534,15 +537,15 @@ class ImageCollection(Folder, Persistent
             try:
                 rows=int(REQUEST.cookies["ImageViewerRows"])
             except:
-                rows=None
+                rows=6
         else:
-            rows=None
+            rows=6
             
         if REQUEST.cookies.has_key("ImageViewerCols"):
             #print "COLS",REQUEST.cookies["ImageViewerCols"]
             cols=int(REQUEST.cookies["ImageViewerCols"])
         else:
-            cols=3
+            cols=2
 
         idsnumber=len(self.show_thumbs())
         if rows:
@@ -657,6 +660,58 @@ def manage_AddImageCollection(self,id,ti
     self._setObject(id,newObj)
     
     if RESPONSE is not None:
+        RESPONSE.redirect('manage_main')
+
+
+class ImageCollectionIFrame(ImageCollection):
+    """Class fuer Collection set als IFrame"""
+
+    meta_type="ImageCollectionIFrame"
+    label=ImageCollection.title
+
+    def rotate(self,angle,url,RESPONSE):
+	"""rotate"""
+	
+	RESPONSE.redirect("javascript:document.domain='mpg.de';parent.iframe.right.rotation(%i)"%int(angle))
+	RESPONSE.redirect(url)
+    def request(self):
+        """request"""
+        return self.REQUEST
+        
+    def index_html(self):
+        """index"""
+        if self.REQUEST.has_key('filename'):
+            filen=self.REQUEST['filename']
+        else:
+            filen=""
+        self.REQUEST.SESSION['filename']=filen
+        
+    
+        pt=PageTemplateFile('Products/ImageArchive/zpt/IFrameMain.zpt').__of__(self)
+        return pt()
+
+    def iframe_html(self):
+        """iframe"""
+        if self.REQUEST.has_key('filename'):
+            filen=self.REQUEST['filename']
+        else:
+            filen=""
+        self.REQUEST.response.setCookie('filename',filen)
+        pt=PageTemplateFile('Products/ImageArchive/zpt/IFrameOverview.zpt').__of__(self)
+        return pt()
+
+
+def manage_AddImageCollectionIFrameForm(self):
+    """Nothing yet"""
+    pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageCollectionIFrameForm.zpt').__of__(self)
+    return pt()
+    
+def manage_AddImageCollectionIFrame(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None):
+    """Add ImageCollection"""
+    newObj=ImageCollectionIFrame(id,title,ImageStoragePath,ImageViewerPath,defaultMetaString)
+    self._setObject(id,newObj)
+    
+    if RESPONSE is not None:
         RESPONSE.redirect('manage_main')