--- ECHO_content/ECHO_Nav.py	2004/02/09 11:45:46	1.6
+++ ECHO_content/ECHO_Nav.py	2004/03/16 10:20:58	1.7
@@ -17,12 +17,16 @@ class ECHO_sqlElement(SimpleItem):
     meta_type="ECHO_sqlElement"
     baseUrl=""
     
-    def __init__(self,id,title,query,field,baseUrl,weight,content_type):
+    def __init__(self,id,title,query,field,searchField,baseUrl,weight,content_type):
         """init"""
         self.id=id
         self.title=title
         self.query=query
         self.field=field
+        if searchField=="":
+            self.searchField=field
+        else:
+            self.searchField=searchField
         self.baseUrl=baseUrl
         self.weight=weight
         self.content=content_type
@@ -31,6 +35,12 @@ class ECHO_sqlElement(SimpleItem):
         {'label':'Main Config','action':'changeECHO_sqlElementForm'},
         )
 
+    def getSearchField(self):
+        try:
+            return self.searchField
+        except:
+            return self.field
+        
     def getWeight(self):
         """get weight"""
         if hasattr(self,'weight'):
@@ -53,11 +63,12 @@ class ECHO_sqlElement(SimpleItem):
         pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_sqlElement.zpt').__of__(self)
         return pt()
 
-    def changeECHO_sqlElement(self,title,query,field,baseUrl,weight,content_type,RESPONSE=None):
+    def changeECHO_sqlElement(self,title,query,field,searchField,baseUrl,weight,content_type,RESPONSE=None):
         """change"""
         self.title=title
         self.query=query
         self.field=field
+        self.searchField=searchField
         self.baseUrl=baseUrl
         self.weight=weight
         self.content_type=content_type
@@ -76,7 +87,11 @@ class ECHO_sqlElement(SimpleItem):
         else:
             ret=[]
             for record in records:
-                ret.append((getattr(record,self.field),self.baseUrl+str(getattr(record,self.field))))
+                try:
+                    ret.append((getattr(record,self.field),self.baseUrl+urllib.quote(str(getattr(record,self.getSearchField())))))
+                except:
+                    """notrhing"""
+                    
             return ret
     
 
@@ -85,9 +100,9 @@ def manage_addECHO_sqlElementForm(self):
     pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_sqlElement.zpt').__of__(self)
     return pt()
 
-def manage_addECHO_sqlElement(self,id,title,query,field,baseUrl,weight,content_type,RESPONSE=None):
+def manage_addECHO_sqlElement(self,id,title,query,field,searchField,baseUrl,weight,content_type,RESPONSE=None):
     """Add an ECHO_sqlelement"""
-    self._setObject(id,ECHO_sqlElement(id,title,query,field,baseUrl,weight,content_type))
+    self._setObject(id,ECHO_sqlElement(id,title,query,field,searchField,baseUrl,weight,content_type))
     
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')
@@ -190,7 +205,7 @@ class ECHO_navigation(Folder):
     """Navigations Element"""
     meta_type="ECHO_Navigation"
 
-    displayedMetaTypes=['ECHO_collection','ECHO_pageTemplate','ZSQLExtendFolder','ECHO_sqlElement']
+    displayedMetaTypes=['ImageCollectionIFrame','ECHO_collection','ECHO_pageTemplate','ZSQLExtendFolder','ECHO_sqlElement','ECHO_resource','ECHO_externalLink']
     
     def __init__(self,id,title,pathToHierarchy):
         """init"""
@@ -271,7 +286,7 @@ class ECHO_navigation(Folder):
             sortField="weight"
         else: # list mit pfad zum hash
             temp=hash
-            print "HI",sortField
+            #print "HI",sortField
             if not sortField:
                 tempObj=self.pathToHierarchy[0:]
                 tempObj=re.sub("/",".",tempObj)
@@ -282,7 +297,7 @@ class ECHO_navigation(Folder):
                 obj=objtemp
 
                 for x in start:
-
+                    #print "OBJ",start,obj,obj.getId(),x
 
                     obj=getattr(obj,x)
 
@@ -290,8 +305,15 @@ class ECHO_navigation(Folder):
                     sortField=obj.sortfield
                 else:
                     sortField='weight'
+            #print "START",start
             for x in start:
+                #print "N2",x,temp[x]
+                try:
                     temp=temp[x][0]
+                except:
+                    """nothing"""
+                    return []
+            #print "TEMP",temp,self.tempSorted(temp, field=sortField)
         print "HELL",sortField
         for x in self.tempSorted(temp, field=sortField):
             if not temp[x][1].title == "":
@@ -299,10 +321,20 @@ class ECHO_navigation(Folder):
                     for z in temp[x][1].getNavList():
                         listNav.append((z[0],z[1]))
                 else:
-                    listNav.append((temp[x][1].title,createPath(self.absolute_url(),temp[x][1].absolute_url())))
+                    # add label fals existiert und nicht leer
+                    if hasattr(temp[x][1],'label'):
+                        if not temp[x][1].label=='':
+                            label=temp[x][1].label
+                            print "HAS LABEL",label
+                        else:
+                            label=temp[x][1].title
+                    else:
+                        label=temp[x][1].title                            
+                    
+                    listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url())))
                     
-        print self.getId(),start
-        print listNav
+        #print self.getId(),start
+        #print listNav
 
         #html=""
         #for k in listNav:
@@ -430,6 +462,31 @@ class ECHO_navigation(Folder):
         #print start
        
         keys=self.barFromHash(hash,start=start)
+        
+        
+        return keys
+
+    def navElements(self,order):
+        """n-te Ordnung"""
+        
+        hash=self.createNavHash(order)
+        actual_url=self.REQUEST['URL']
+        
+        ult_temp=re.sub(self.absolute_url(),"",actual_url)
+        #print ult_temp
+
+        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:order+1]
+        #print start
+       
+        keys=self.barFromHash(hash,start=start)
         
         
         return keys