--- ECHO_content/ECHO_Nav.py	2004/07/05 18:15:16	1.36
+++ ECHO_content/ECHO_Nav.py	2004/08/28 01:06:03	1.40
@@ -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:
@@ -203,7 +204,7 @@ class ECHO_sqlElement(SimpleItem):
         else:
             self.searchField=searchField
         self.baseUrl=baseUrl
-        self.weight=weight
+
         self.content=contentType
 
     manage_options= SimpleItem.manage_options+(
@@ -251,12 +252,30 @@ 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.
+        #
+        #return self.ZSQLsimpleSearch(var=self.query)
+        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:
@@ -291,23 +310,24 @@ class ECHO_pageTemplate(ZopePageTemplate
                                        'html/ECHO_pageTemplateDefault.html')
 
     manage_options=ZopePageTemplate.manage_options+(
-        {'label':'Main Config','action':'changeECHO_pageTemplateWeightForm'},
+        {'label':'Main Config','action':'changeECHO_pageTemplateMainForm'},
         )
 
     def content_html(self):
 	"""content_html"""
 	return content_html(self,'pageTemplate')
 
-    def changeECHO_pageTemplateWeightForm(self):
+    def changeECHO_pageTemplateMainForm(self):
         """change"""
-        pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateWeight.zpt').__of__(self)
+        pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateMain.zpt').__of__(self)
         return pt()
 
-    def changeECHO_pageTemplateWeight(self,weight,contentType,label,RESPONSE=None):
+    def changeECHO_pageTemplateMain(self,weight,contentType,label,description,RESPONSE=None):
         """change"""
         self.weight=weight
         self.contentType=contentType
         self.label=label
+        self.description=description
         
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
@@ -448,14 +468,26 @@ class ECHO_navigation(Folder):
         temp=self.pathToHierarchy[0:]
         temp=re.sub("/",".",temp)
         temp="self.aq_parent"+temp
+
         
         objtemp=eval(temp)
         nav={}
+        
+        #print getattr(self,'v_hash',None)
+        try:
+            #print "cash",self.getId(),str(depth)
+            return self._v_hash[str(depth)]
+        except:
+            """nothing"""
+        #print "nocash",self.getId(),str(depth)
+        
         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:
@@ -467,6 +499,15 @@ class ECHO_navigation(Folder):
                     
 
         #print nav
+        try:
+            self._v_hash[str(depth)]={}
+        except:
+            self._v_hash={}
+            self._v_hash[str(depth)]={}
+            
+        for x in nav.keys():
+            self._v_hash[str(depth)][x]=nav[x]
+
         return nav
 
     def barFromHash(self,hash,start=None,sortField=None,location=None):
@@ -508,19 +549,22 @@ 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'):
                         if not temp[x][1].label=='':
-                            label=temp[x][1].label.encode('utf-8','ignore')
-                            
+                            try:
+                                label=temp[x][1].label.encode('utf-8','ignore')
+                            except:
+                                label=temp[x][1].label
                         else:
                             label=temp[x][1].title.encode('utf-8')
                     else:
@@ -532,13 +576,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