--- ECHO_content/ECHO_Nav.py	2004/02/03 17:31:16	1.4
+++ ECHO_content/ECHO_Nav.py	2004/02/05 17:13:18	1.5
@@ -232,6 +232,7 @@ class ECHO_navigation(Folder):
             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)
                     else:
@@ -241,18 +242,38 @@ class ECHO_navigation(Folder):
         #print nav
         return nav
 
-    def barFromHash(self,hash,start=None):
+    def barFromHash(self,hash,start=None,sortField=None):
         """Erzeuge Navigations Element"""
         #print "hash",hash
         listNav=[]
         if not start:
             temp=hash
+            sortField="weight"
         else: # list mit pfad zum hash
             temp=hash
+            print "HI",sortField
+            if not sortField:
+                tempObj=self.pathToHierarchy[0:]
+                tempObj=re.sub("/",".",tempObj)
+                tempObj="self.aq_parent"+tempObj
+
+                objtemp=eval(tempObj)
+
+                obj=objtemp
+
+                for x in start:
+
+
+                    obj=getattr(obj,x)
+
+                if hasattr(obj,'sortfield'):
+                    sortField=obj.sortfield
+                else:
+                    sortField='weight'
             for x in start:
-                temp=temp[x][0]
-        
-        for x in self.tempSorted(temp):
+                    temp=temp[x][0]
+        print "HELL",sortField
+        for x in self.tempSorted(temp, field=sortField):
             if not temp[x][1].title == "":
                 if temp[x][1].meta_type=="ECHO_sqlElement":
                     for z in temp[x][1].getNavList():
@@ -260,8 +281,8 @@ class ECHO_navigation(Folder):
                 else:
                     listNav.append((temp[x][1].title,createPath(self.absolute_url(),temp[x][1].absolute_url())))
                     
-
-        #print listNav
+        print self.getId(),start
+        print listNav
 
         #html=""
         #for k in listNav:
@@ -270,12 +291,13 @@ class ECHO_navigation(Folder):
 
         return listNav
 
-    def tempSorted(self,hash):
+    def tempSorted(self,hash,field="weight"):
         ls=[]
+        print "SORT",field
         for x in hash.keys():
             #print hash[x][1]
-            if hasattr(hash[x][1],'weight'):
-                weight=hash[x][1].weight
+            if hasattr(hash[x][1],field):
+                weight=getattr(hash[x][1],field)
                 #print weight
             else:
                 weight=0
@@ -327,7 +349,7 @@ class ECHO_navigation(Folder):
                 temp=temp[x][0]
                 #print temp
         
-        for key in temp.keys():
+        for key in self.tempSorted(temp):
             
             description=temp[x][1].title
          
@@ -346,6 +368,7 @@ class ECHO_navigation(Folder):
     def mainNavBar(self):
         """print main navigation bar"""
         keys=""
+        print "NAVBAR",self.getId()
         try:
             keys=self.buttonsFromHash(self.createNavHash(0))
         except:
@@ -356,12 +379,13 @@ class ECHO_navigation(Folder):
     def mainNavElements(self):
         """print main navigation bar"""
         keys=""
+        print "NAVELEMENT",self.getId()
+        #try:
+      
+        keys=self.barFromHash(self.createNavHash(0))
 
-        try:
-            keys=self.barFromHash(self.createNavHash(0))
-
-        except:
-            keys=""
+        #except:
+        #    keys=""
             
         return keys
     
@@ -384,7 +408,7 @@ class ECHO_navigation(Folder):
 
         start=[splitted[2]]
         #print start
-        
+       
         keys=self.barFromHash(hash,start=start)