--- ECHO_content/ECHO_Nav.py	2004/04/18 09:54:14	1.15
+++ ECHO_content/ECHO_Nav.py	2004/05/06 10:42:58	1.19
@@ -12,6 +12,7 @@ from Products.PageTemplates.ZopePageTemp
 import os.path
 from Globals import package_home
 import urllib
+from ECHO_helpers import displayTypes,checkOnlyOneInGroup
 
 class ECHO_contentType(Image):
     """ContentType Object"""
@@ -196,7 +197,7 @@ class ECHO_pageTemplate(ZopePageTemplate
 
     def getLabel(self):
         if hasattr(self,'label'):
-            return self.label
+            return self.label.encode('utf-8')
         else:
             return 0
         
@@ -276,7 +277,7 @@ class ECHO_navigation(Folder):
     """Navigations Element"""
     meta_type="ECHO_Navigation"
 
-    displayedMetaTypes=['ECHO_group','ImageCollectionIFrame','ECHO_collection','ECHO_pageTemplate','ZSQLExtendFolder','ZSQLBibliography','ECHO_sqlElement','ECHO_resource','ECHO_externalLink']
+    displayedMetaTypes=displayTypes
     
     def __init__(self,id,title,pathToHierarchy):
         """init"""
@@ -302,20 +303,21 @@ class ECHO_navigation(Folder):
             RESPONSE.redirect('manage_main')
 
 
-    def getColls(self,obj,depth):
+    def getColls(self,obj,depth,checkOnly="no"):
         nav={}
         #print "HERE",obj.
-        for keys in obj.__dict__.keys():
-            x=getattr(obj,keys)
-            if hasattr(x,"meta_type"):
-                if x.meta_type in self.displayedMetaTypes:
-                    if depth>1:
-                        nav[x.getId()]=(self.getColls(x,depth-1),x)
-                    else:
-                        nav[x.getId()]=(None,x)
+        for x_objs in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes):
+            x=x_objs[1]
+            print checkOnly,x.label
+            if checkOnly=="yes":
+                x = checkOnlyOneInGroup(x)
+            if depth>1:
+                nav[x.getId()]=(self.getColls(x,depth-1),x)
+            else:
+                nav[x.getId()]=(None,x)
         return nav
     
-    def createNavHash(self,depth):
+    def createNavHash(self,depth,checkOnly="no"):
         """Auslesen des Hierarchiebuames"""
         temp=self.pathToHierarchy[0:]
         temp=re.sub("/",".",temp)
@@ -324,23 +326,16 @@ class ECHO_navigation(Folder):
         objtemp=eval(temp)
         nav={}
         obj=objtemp
-        
-        #exec(obj)
 
-        #objtemp = compile(temp,'<string>','single')
-        #obj=eval(objtemp)
-        #print obj 
-        
-        #print obj.__dict__.keys()
         
         for keys in obj.__dict__.keys():
             x=getattr(obj,keys)
             if hasattr(x,"meta_type"):
-                #print x.meta_type
+
                 if x.meta_type in self.displayedMetaTypes:
                    
                     if depth>1:
-                        nav[x.getId()]=(self.getColls(x,int(depth)-1),x)
+                        nav[x.getId()]=(self.getColls(x,int(depth)-1,checkOnly),x)
                     else:
                         nav[x.getId()]=(None,x)
                     
@@ -390,17 +385,17 @@ class ECHO_navigation(Folder):
             if not temp[x][1].title == "":
                 if temp[x][1].meta_type=="ECHO_sqlElement":
                     for z in temp[x][1].getNavList():
-                        listNav.append((z[0],z[1]))
+                        listNav.append((z[0],z[1],None))
                 else:
                     # add label fals existiert und nicht leer
                     if hasattr(temp[x][1],'label'):
                         if not temp[x][1].label=='':
-                            label=temp[x][1].label
+                            label=temp[x][1].label.encode('utf-8')
                             
                         else:
-                            label=temp[x][1].title
+                            label=temp[x][1].title.encode('utf-8')
                     else:
-                        label=temp[x][1].title                            
+                        label=temp[x][1].title.encode('utf-8')                            
                     
                     listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))
                     
@@ -520,7 +515,7 @@ class ECHO_navigation(Folder):
     def secondNavElements(self):
         """Zweite Ordnung"""
         
-        hash=self.createNavHash(2)
+        hash=self.createNavHash(2,checkOnly="yes")
         actual_url=self.REQUEST['URL']
         
         ult_temp=re.sub(self.absolute_url(),"",actual_url)
@@ -529,11 +524,6 @@ class ECHO_navigation(Folder):
         splitted=ult_temp.split("/")
         
 
-        ## if splitted[len(splitted)-1]=="index_html":
-##             start=[splitted[len(splitted)-2]]
-##         else:
-##             start=[splitted[len(splitted)-1]]
-
         start=[splitted[2]]
         #print start