--- ECHO_content/ECHO_Nav.py	2004/09/01 14:32:32	1.43
+++ ECHO_content/ECHO_Nav.py	2004/09/27 14:39:59	1.47
@@ -324,13 +324,15 @@ class ECHO_pageTemplate(ZopePageTemplate
         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateMain.zpt').__of__(self)
         return pt()
 
-    def changeECHO_pageTemplateMain(self,weight,contentType,label,description,RESPONSE=None,isAlwaysClickable=None):
+    def changeECHO_pageTemplateMain(self,weight,contentType,label,description,RESPONSE=None,isAlwaysClickable=None,suffix=None,prefix=None):
         """change"""
         self.weight=weight
         self.contentType=contentType
         self.label=label
         self.description=description
         self.isAlwaysClickable=isAlwaysClickable
+        self.suffix=suffix
+        self.prefix=prefix
         
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
@@ -338,6 +340,7 @@ class ECHO_pageTemplate(ZopePageTemplate
     def getLabel(self):
         if hasattr(self,'label'):
             return self.label.encode('utf-8')
+        
         else:
             return 0
         
@@ -439,9 +442,13 @@ class ECHO_navigation(Folder):
 	    self.setCache(managerName=cacheManagerName)
 	    
 	    if deleteCache:
+                try:
 		    self.deleteCache()
+                except:
+                    for roots in self.ZopeFind(self,obj_metatypes=['ECHO_root'],search_sub=1):
+                        roots[1].deleteCache()
+                    
 
-	    print activateCache
 	    self.activateCache=activateCache
 
 	    if RESPONSE is not None:
@@ -597,14 +604,15 @@ class ECHO_navigation(Folder):
                 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))
+                        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=='':
                             try:
-                                label=temp[x][1].label.encode('utf-8','ignore')
+                                label=temp[x][1].getLabel()
                             except:
                                 label=temp[x][1].label
                         else:
@@ -615,9 +623,9 @@ class ECHO_navigation(Folder):
                     if location:
                         loc=getattr(temp[x][1],'location','top')
                         if (loc==location):
-                            listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))
+                            listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix','')))
                     else:
-                        listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))
+                        listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix','')))
 
         return listNav
 
@@ -643,10 +651,19 @@ class ECHO_navigation(Folder):
             
     def isSelectedPath(self,item):
         """test is path is already selected"""
+
+        testStr=re.sub("/index_html",'',self.REQUEST.get('URL',''))
+
+        #falls exakte Übereinstimmung dann immer 1
+        if (testStr==item[1]) and (self.REQUEST.get('QUERY_STRING','')==''):
+            
+            return 1
+           
+        found=re.search("\?(.*)",item[1])
         
-        found=re.search("\?(.*)/",item[1])
         if found:
             temp=re.sub(" ","%20",found.group(0))
+          
             #print temp+"::"+self.REQUEST['QUERY_STRING']
             if ("?"+self.REQUEST['QUERY_STRING'])==temp:
                 if getattr(item[2],'isAlwaysClickable',None): #immer auswaehlbar?
@@ -655,7 +672,7 @@ class ECHO_navigation(Folder):
                 else:
                     return 1
 
-        if (item[2].meta_type=="ECHO_pageTemplate") and (re.search(item[1],self.REQUEST['URL'])):
+        if (getattr(item[2],'meta_type','')=="ECHO_pageTemplate") and (re.search(item[1],self.REQUEST['URL'])):
             if getattr(item[2],'isAlwaysClickable',None): #immer auswaehlbar?
                 
                 return 2