--- ECHO_content/ECHO_Nav.py	2005/12/05 17:18:43	1.68
+++ ECHO_content/ECHO_Nav.py	2006/01/16 16:25:18	1.70
@@ -429,7 +429,7 @@ def manage_addECHO_pageTemplate(self, id
 class ECHO_navigation(Folder):
     """Navigations Element"""
     meta_type="ECHO_Navigation"
-
+    management_page_charset="utf-8"
     def searchExternalCollection(self,url,simpleSearch):
         """search external collection via xmlrpc"""
         server=xmlrpclib.Server(url)
@@ -481,14 +481,13 @@ class ECHO_navigation(Folder):
         """decoder"""
         if not str:
             return ""
-        if type(str)==StringType:
+        if type(str) is StringType:
             
-            return str
+            return str.decode('utf-8')
         else:
-            try:
-                return str.encode('utf-8')
-            except:
-                return str.encode('latin-1')
+            
+            return str
+
     def ECHOFormatListStr(self,list,search="\n",replace="<br>"):
         """formatiert liste im str"""
         if list:
@@ -684,19 +683,15 @@ class ECHO_navigation(Folder):
                     if hasattr(temp[x][1],'label'):
                         
                         if not temp[x][1].label=='':
-                            try:
                                 label=temp[x][1].getLabel()
-                            except:
-                                label=temp[x][1].label.encode('utf-8')
                         else:
-                            label=temp[x][1].title.encode('utf-8')
+			    try:
+                            	label=temp[x][1].getTitle()
+			    except:
+				return "ERROR"
                     else:
-                        label=temp[x][1].title.encode('utf-8')                            
-                    
-                    try:
-                        label=label.encode('utf-8')
-                    except:
-                        label=label.decode('latin-1')
+                        label=temp[x][1].getTitle()
+
                         
                     if location:
 
@@ -738,9 +733,11 @@ class ECHO_navigation(Folder):
         """test is path is already selected"""
 
         testStr=re.sub("/index_html",'',self.REQUEST.get('URL',''))
-
+	
+	if len(item)<2:
+		return 0
         #falls exakte Übereinstimmung dann immer 1
-        if (testStr==item[1]) and (self.REQUEST.get('QUERY_STRING','')==''):
+        if  (testStr==item[1]) and (self.REQUEST.get('QUERY_STRING','')==''):
             
             return 1