ECHO_content/ECHO_Nav.py - diff

Return to ECHO_Nav.py CVS log

Up to [Repository] / ECHO_content

version 1.25, 2004/05/10 15:27:32	version 1.27, 2004/05/11 14:57:35
Line 391 class ECHO_navigation(Folder):	Line 391 class ECHO_navigation(Folder):
for z in temp[x][1].getNavList():	for z in temp[x][1].getNavList():
listNav.append((z[0],z[1],None))	listNav.append((z[0],z[1],None))
else:	else:
# add label fals existiert und nicht leer	# add label falls existiert und nicht leer
if hasattr(temp[x][1],'label'):	if hasattr(temp[x][1],'label'):
if not temp[x][1].label=='':	if not temp[x][1].label=='':
label=temp[x][1].label.encode('utf-8')	label=temp[x][1].label.encode('utf-8')
Line 435 class ECHO_navigation(Folder):	Line 435 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])	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:
return 1	return 1

if re.search(item[1],self.REQUEST['URL']):	if re.search(item[1]+"/",self.REQUEST['URL']):
return 1	return 1
else:	else:
return 0	return 0