--- ECHO_content/ECHO_Nav.py	2004/07/05 18:15:16	1.36
+++ ECHO_content/ECHO_Nav.py	2004/07/21 16:36:18	1.37
@@ -89,14 +89,15 @@ class ECHO_ZCatalogElement(SimpleItem):
         
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
-
     def getKeywordList(self):
         return getattr(self,self.catalogId).uniqueValuesFor(self.field)
     
     def getNavList(self):
         """ausgabe der treffer list für navigation"""
+        
         records=self.getKeywordList()
         
+        
         if not records:
             return []
         else:
@@ -251,12 +252,26 @@ class ECHO_sqlElement(SimpleItem):
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
-    def searchQuery(self):
-        return self.search(var=self.query)
+    def searchQuery(self,query=None,obj=None):
+        #presently a hack, tests if search is of the search method, if not look at the next level.
+        if not query:
+            query=self.query
+            
+        if self.search.meta_type=="Z SQL Method":
+            return self.search(var=self.query)
+        else:
+            if self.aq_parent.aq_parent.search.meta_type=="Z SQL Method":
+                return self.aq_parent.aq_parent.search(var=self.query)
+            else:
+                return []
+
     
     def getNavList(self):
         """ausgabe der treffer list für navigation"""
+        
         records=self.searchQuery()
+      
+        
         if not records:
             return []
         else:
@@ -454,8 +469,10 @@ class ECHO_navigation(Folder):
         obj=objtemp
 
         
-        for keys in obj.__dict__.keys():
-            x=getattr(obj,keys)
+
+        for keys in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes):
+            x=keys[1]
+            
             if hasattr(x,"meta_type"):
 
                 if x.meta_type in self.displayedMetaTypes:
@@ -508,13 +525,14 @@ class ECHO_navigation(Folder):
             #print "TEMP",temp,self.tempSorted(temp, field=sortField)
 
         for x in self.tempSorted(temp, field=sortField):
+            
             if not temp[x][1].title == "":
                 
                 if (temp[x][1].meta_type=="ECHO_sqlElement") or (temp[x][1].meta_type=="ECHO_ZCatalogElement"):
-                
+            
                     for z in temp[x][1].getNavList():
                         listNav.append((z[0],z[1],None))
-                        
+            
                 else:
                     # add label falls existiert und nicht leer
                     if hasattr(temp[x][1],'label'):
@@ -532,13 +550,6 @@ class ECHO_navigation(Folder):
                             listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))
                     else:
                         listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))
-        #print self.getId(),start
-        #print listNav
-
-        #html=""
-        #for k in listNav:
-        #    print k
-        #    html=html+"<a href='%s'>%s</a>   "% (self.absolute_url()+createPath(k[1][1].absolute_url()),k[0])
 
         return listNav