version 1.43, 2004/09/01 14:32:32
|
version 1.46, 2004/09/02 12:16:52
|
Line 439 class ECHO_navigation(Folder):
|
Line 439 class ECHO_navigation(Folder):
|
self.setCache(managerName=cacheManagerName) |
self.setCache(managerName=cacheManagerName) |
|
|
if deleteCache: |
if deleteCache: |
|
try: |
self.deleteCache() |
self.deleteCache() |
|
except: |
|
for roots in self.ZopeFind(self,obj_metatypes=['ECHO_root'],search_sub=1): |
|
roots[1].deleteCache() |
|
|
|
|
print activateCache |
|
self.activateCache=activateCache |
self.activateCache=activateCache |
|
|
if RESPONSE is not None: |
if RESPONSE is not None: |
Line 644 class ECHO_navigation(Folder):
|
Line 648 class ECHO_navigation(Folder):
|
def isSelectedPath(self,item): |
def isSelectedPath(self,item): |
"""test is path is already selected""" |
"""test is path is already selected""" |
|
|
found=re.search("\?(.*)/",item[1]) |
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]) |
|
|
if found: |
if found: |
temp=re.sub(" ","%20",found.group(0)) |
temp=re.sub(" ","%20",found.group(0)) |
|
|
#print temp+"::"+self.REQUEST['QUERY_STRING'] |
#print temp+"::"+self.REQUEST['QUERY_STRING'] |
if ("?"+self.REQUEST['QUERY_STRING'])==temp: |
if ("?"+self.REQUEST['QUERY_STRING'])==temp: |
if getattr(item[2],'isAlwaysClickable',None): #immer auswaehlbar? |
if getattr(item[2],'isAlwaysClickable',None): #immer auswaehlbar? |
Line 655 class ECHO_navigation(Folder):
|
Line 668 class ECHO_navigation(Folder):
|
else: |
else: |
return 1 |
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? |
if getattr(item[2],'isAlwaysClickable',None): #immer auswaehlbar? |
|
|
return 2 |
return 2 |