--- ECHO_content/ECHO_Nav.py	2007/02/22 10:29:00	1.80
+++ ECHO_content/ECHO_Nav.py	2008/12/04 21:27:00	1.83
@@ -29,7 +29,7 @@ from Products.PageTemplates.ZopePageTemp
 import os.path
 
 import urllib
-from ECHO_helpers import displayTypes,checkOnlyOneInGroup
+from ECHO_helpers import displayTypes,checkOnlyOneInGroup,unicodify
 from ECHO_collection import content_html
 import logging
 
@@ -38,7 +38,7 @@ def logger(txt,method,txt2):
     """logging"""
     logging.info(txt+ txt2)
 
-
+STORAGEMANAGER_URL_DEFAULT = "http://storage-web.mpiwg-berlin.mpg.de/storage/storeOnline?path="
 try:    
     from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder
 except:
@@ -502,16 +502,7 @@ class ECHO_navigation(Folder):
     
     def decode(self,str):
         """decoder"""
-        if not str:
-            return ""
-        if type(str) is StringType:
-	    try:            
-            	return str.decode('utf-8')
-	    except:
-		return str.decode('latin-1')
-        else:
-            
-            return str
+        return unicodify(str)
 
     def ECHOFormatListStr(self,list,search="\n",replace="<br>"):
         """formatiert liste im str"""
@@ -588,17 +579,20 @@ class ECHO_navigation(Folder):
         )
     displayedMetaTypes=displayTypes
     
+    def getStorageManagerURL(self):
+        """returns the URL to the storagemanager"""
+        return getattr(self,"storageManagerURL",STORAGEMANAGER_URL_DEFAULT)
     def ECHO_navigationConfigForm(self):
         """configForm"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeECHO_navigation.zpt')).__of__(self)
         return pt()
     
-    def ECHO_navigationConfig(self,title,pathToHierarchy,displayedMetaTypes=displayTypes,RESPONSE=None):
+    def ECHO_navigationConfig(self,title,pathToHierarchy,storageManagerURL="",displayedMetaTypes=displayTypes,RESPONSE=None):
         """config"""
         self.title=title
         self.pathToHierarchy=pathToHierarchy
         self.displayedMetaTypes=toList(displayedMetaTypes)[0:]
-
+        self.storageManagerURL=storageManagerURL
 
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
@@ -636,7 +630,7 @@ class ECHO_navigation(Folder):
         obj=objtemp      
         
         for keys in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes):
-        
+
             x=keys[1]
             if depth>1:
                 nav[x.getId()]=(self.getColls(x,int(depth)-1,checkOnly),x)
@@ -906,7 +900,7 @@ class ECHO_navigation(Folder):
         """Zweite Ordnung Navigationselemente"""
         
         hash=self.createNavHash(2,checkOnly="no")
-       
+
         actual_url=self.REQUEST['URL']
         
         ult_temp=re.sub(self.absolute_url(),"",actual_url)