--- ImageArchive/ImageArchive.py	2004/11/17 15:56:14	1.37
+++ ImageArchive/ImageArchive.py	2004/11/18 16:34:36	1.38
@@ -13,6 +13,13 @@ import operator
 import tempfile
 import shutil
 
+
+try:
+    from Products.ECHO_content.ECHO_collection import ECHO_basis
+except:
+    print "ECHO Elements not imported"
+    ECHO_basis=None
+	
 def splitPath(str):
 	str2=str.replace("\\","/")
 	return os.path.split(str2)[1]
@@ -190,10 +197,6 @@ class ImageDigilib(Folder,Persistent,Imp
         #DEVELOP: take first one for server
         
         path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]
-
-        #path="http://localhost:8080/mpiwg/online/"+self.ImageViewerPath+"/"+self.filename
-        #self.REQUEST.SESSION['string']="<img src=\"%s\">"% path
-        #pt=PageTemplateFile('Products/ImageArchive/thumb.zpt')).__of__(self)
         return self.REQUEST.RESPONSE.redirect(path)
 
     
@@ -215,7 +218,7 @@ def manage_AddImageDigilib(self,id,fileu
         RESPONSE.redirect('manage_main')
 
                  
-class ImageCollection(Folder, Persistent, Implicit):
+class ImageCollection(Folder, Persistent, Implicit, ECHO_basis):
     """Sammelordner für Bilder"""
     meta_type="ImageCollection"
 
@@ -226,8 +229,8 @@ class ImageCollection(Folder, Persistent
     
     defaultMetaString="http://fm-web.mpiwg-berlin.mpg.de:8050/FMRes/FMPJS?-db=Wissenschaftlerportraits.fp5&-layID=69&-token=25&-max=1&-format=formvwcss.htm&-mode=browse&images::filename=%s&-find" ## TEST FUER IMAGEDATENBANK WP
 
-
- 
+   
+    
     def createSet(self,RESPONSE=None,local=None,version="working"):
 	    """download aller gewaehlten files"""
 	    tempfile.tempdir="/tmp/archivesImageServer"
@@ -405,28 +408,21 @@ class ImageCollection(Folder, Persistent
         self.ImageViewerPath=ImageViewerPath
         self.defaultMetaString=defaultMetaString
 
-    manage_options = Folder.manage_options+(
+    if ECHO_basis:
+        optTMP= Folder.manage_options+ECHO_basis.manage_options
+    else:
+        optTMP= Folder.manage_options
+
+    manage_options = optTMP+(
         {'label':'Main Config','action':'ImageCollection_config'},
         {'label':'Import','action':'ImportFiles'},
         {'label':'Recalculate Metadata','action':'recalculateMeta'},
         {'label':'Import Metadata','action':'importMetaForm'},
         {'label':'Rescale thumbs','action':'scaleThumbs'},
 	{'label':'Rescale working version','action':'scaleWorkingVersions'},
-        {'label':'Weight (ECHO)','action':'weightForm'},
         )
 
-    def weightForm(self):
-        """Weight"""
-        pt=PageTemplateFile(os.path.join(package_home(globals()),'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"""
@@ -984,6 +980,7 @@ class ImageCollection(Folder, Persistent
     def navig_html(self):
         """navigation"""
         #self.REQUEST.SESSION['URL']=self.REQUEST['URL0']
+       
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigation.zpt')).__of__(self)
         return pt()
 
@@ -1005,15 +1002,15 @@ class ImageCollection(Folder, Persistent
         else:
             filen=""
 
-        self.REQUEST.SESSION['filename']=filen
-        
+        self.REQUEST.SESSION['filename']=filen[0:]
+
         if self.REQUEST.has_key('showall'):
 
             self.REQUEST.SESSION['showall']=self.REQUEST.get('showall')
         else:
             self.REQUEST.SESSION['showall']=self.REQUEST.SESSION.get('showall','no')
             
-        
+     
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview.zpt')).__of__(self)
         return pt()