--- ECHO_content/ECHO_Nav.py	2006/10/11 16:55:26	1.77
+++ ECHO_content/ECHO_Nav.py	2007/01/31 14:12:38	1.79
@@ -31,12 +31,18 @@ import os.path
 import urllib
 from ECHO_helpers import displayTypes,checkOnlyOneInGroup
 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
@@ -628,8 +634,9 @@ class ECHO_navigation(Folder):
 
         # if not generate new hash
         obj=objtemp      
-
+        
         for keys in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes):
+            logging.info("createNavHash: %s"%repr(keys))
             x=keys[1]
             if depth>1:
                 nav[x.getId()]=(self.getColls(x,int(depth)-1,checkOnly),x)
@@ -707,7 +714,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()
@@ -879,11 +886,27 @@ class ECHO_navigation(Folder):
             nr=0
         return nr+1
     
+    def subNavStatic(self,obj):
+        """subnav" von self"""
+        def sortWeight(x,y):
+            x1=int(getattr(x[1],'weight','0'))
+            y1=int(getattr(y[1],'weight','0'))
+            return cmp(x1,y1)
+        print "obj",obj
+        subs=self.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes)
+        subret=[]
+        
+        for x in subs:
+            if not(x[1].title==""):
+                subret.append(x)
+        subret.sort(sortWeight)
+        return subret
+    
     def secondNavElements(self):
         """Zweite Ordnung Navigationselemente"""
         
         hash=self.createNavHash(2,checkOnly="no")
-        
+        logging.info("secondNavElements %s"%repr(hash))
         actual_url=self.REQUEST['URL']
         
         ult_temp=re.sub(self.absolute_url(),"",actual_url)