--- ECHO_content/ECHO_Nav.py 2005/11/25 18:46:40 1.66 +++ ECHO_content/ECHO_Nav.py 2005/12/05 17:18:43 1.68 @@ -430,6 +430,32 @@ class ECHO_navigation(Folder): """Navigations Element""" meta_type="ECHO_Navigation" + def searchExternalCollection(self,url,simpleSearch): + """search external collection via xmlrpc""" + server=xmlrpclib.Server(url) + + results=server.getSubcolsXMLRpc(simpleSearch) + + return results + + def getXMLRpcConnection(self,url): + """getxmlrpc""" + if not hasattr(self,"_v_server"): + self._v_server=[] + + server=xmlrpclib.Server(url) + self._v_server.append(server) + + return len(self._v_server)-1 + + def getXMLRpcMethod(self,nr,method,compressed=None): + """getmethod""" + + ret= eval('self._v_server[%i].%s'%(nr,method)) + if compressed: + ret=decodeRPC(ret) + return ret + def getNavInfo(self): """root informationen""" if hasattr(self,'logo_image'): @@ -608,7 +634,7 @@ class ECHO_navigation(Folder): def barFromHash(self,hash,start=None,sortField=None,location=None): """Erzeuge Navigations Element""" - #print "hash",hash + listNav=[] if not start: temp=hash @@ -840,6 +866,7 @@ class ECHO_navigation(Folder): """Zweite Ordnung Navigationselemente""" hash=self.createNavHash(2,checkOnly="no") + actual_url=self.REQUEST['URL'] ult_temp=re.sub(self.absolute_url(),"",actual_url) @@ -854,7 +881,7 @@ class ECHO_navigation(Folder): start=[splitted[startNr]] #print start - + keys=self.barFromHash(hash,start=start) @@ -940,8 +967,15 @@ def createPath(self,url1,url2): vp=vp[1:] url2=url2.replace(vp+"/",'') + else: + temp1=url1.split("/") + temp2=url2.split("/") + for test in temp1: + if temp2[0]==test: + del temp2[0] + + url2= string.join(temp2,"/") - return url1+"/"+url2 def sortWeight(x,y):