--- ECHO_content/ECHO_Nav.py	2006/10/23 11:12:24	1.78
+++ ECHO_content/ECHO_Nav.py	2008/08/21 07:44:56	1.82
@@ -29,14 +29,20 @@ 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 zLOG
+import logging
+
+#def ersetzt logging
+def logger(txt,method,txt2):
+    """logging"""
+    logging.info(txt+ txt2)
+
 
 try:    
     from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder
 except:
-    zLOG.LOG('ECHO_Nav',zLOG.INFO,'ZSQLSimpleSearch not supported')
+    logger('ECHO_Nav',logging.INFO,'ZSQLSimpleSearch not supported')
 
 
 
@@ -273,7 +279,7 @@ class ECHO_sqlElement(SimpleItem):
     try:    
         searchQuery=ZSQLExtendFolder.ZSQLSimpleSearch
     except:
-        zLOG.LOG('ECHO_Nav',zLOG.INFO,'ZSQLSimpleSearch not supported')
+        logger('ECHO_Nav',logging.INFO,'ZSQLSimpleSearch not supported')
             
     def getNavList(self): 
         """ausgabe der treffer list fuer navigation"""
@@ -297,7 +303,7 @@ class ECHO_sqlElement(SimpleItem):
                 try:
                     ret.append((getattr(record,self.field),self.baseUrl+urllib.quote(str(getattr(record,self.getSearchField())))))
                 except:
-                    zLOG.LOG('ECHO_Nav',zLOG.INFO,"error, search")
+                    logger('ECHO_Nav',logging.INFO,"error, search")
                     """notrhing"""
                     
             return ret
@@ -496,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"""
@@ -628,8 +625,9 @@ class ECHO_navigation(Folder):
 
         # if not generate new hash
         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)
@@ -707,7 +705,7 @@ class ECHO_navigation(Folder):
                             try:
                                 label=temp[x][1].getTitle()
                             except:
-                                zLOG.LOG("ECHO_Nav",zLOG.ERROR,"%s has neither getLabel nor getTile implemented"%temp[x][1].getId())
+                                logger("ECHO_Nav",logging.ERROR,"%s has neither getLabel nor getTile implemented"%temp[x][1].getId())
                                 label=""
                     else:
                         label=temp[x][1].getTitle()
@@ -899,7 +897,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)