--- ECHO_content/ECHO_Nav.py 2004/09/01 17:48:31 1.44 +++ ECHO_content/ECHO_Nav.py 2004/09/01 21:51:38 1.45 @@ -643,10 +643,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?