--- ECHO_content/ECHO_Nav.py 2006/02/03 20:41:29 1.72 +++ ECHO_content/ECHO_Nav.py 2006/06/12 15:21:20 1.76 @@ -437,6 +437,15 @@ class ECHO_navigation(Folder): """Navigations Element""" meta_type="ECHO_Navigation" management_page_charset="utf-8" + + def getUsername(self): + """get name of user""" + username=str(self.REQUEST['AUTHENTICATED_USER']) + if username=='Anonymous User': + return None + else: + return username + def searchExternalCollection(self,url,simpleSearch): """search external collection via xmlrpc""" server=xmlrpclib.Server(url) @@ -489,8 +498,10 @@ class ECHO_navigation(Folder): if not str: return "" if type(str) is StringType: - - return str.decode('utf-8') + try: + return str.decode('utf-8') + except: + return str.decode('latin-1') else: return str @@ -968,10 +979,11 @@ def createPath(self,url1,url2): if self.REQUEST.has_key('VirtualRootPhysicalPath'): vp="/".join(self.REQUEST['VirtualRootPhysicalPath']) - if vp[0]=="/": - vp=vp[1:] + if (len(vp)>0): + if vp[0]=="/": + vp=vp[1:] - url2=url2.replace(vp+"/",'') + url2=url2.replace(vp+"/",'') else: temp1=url1.split("/") temp2=url2.split("/")