--- ECHO_content/ECHO_Nav.py	2005/10/28 12:21:43	1.63
+++ ECHO_content/ECHO_Nav.py	2005/12/04 09:10:55	1.67
@@ -99,16 +99,18 @@ class ECHO_ZCatalogElement(SimpleItem):
         return getattr(self,self.catalogId).uniqueValuesFor(self.field)
     
     def getNavList(self):
-        """ausgabe der treffer list für navigation"""
+        """ausgabe der treffer list fuer navigation"""
         
         records=self.getKeywordList()
         
-        
+        records=[x.encode('utf-8') for x in records]
+        records.sort()
         if not records:
             return []
         else:
             ret=[]
             for record in records:
+             
                 #print "RC",record
                 #if record:
                 #    ret.append((record,self.baseUrl+urllib.quote(record)))
@@ -125,9 +127,10 @@ def manage_addECHO_ZCatalogElementForm(s
     pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddECHO_ZCatalogElement.zpt')).__of__(self)
     return pt()
 
-def manage_addECHO_ZCatalogElement(self,id,title,field,baseUrl,weight,contentType,RESPONSE=None):
+def manage_addECHO_ZCatalogElement(self,id,title,field,catalogId,baseUrl,weight,contentType,RESPONSE=None):
     """Add an ECHO_ZCatalogelement"""
-    self._setObject(id,ECHO_ZCatalogElement(id,title,field,baseUrl,weight,contentType))
+
+    self._setObject(id,ECHO_ZCatalogElement(id,title,field,catalogId,baseUrl,weight,contentType))
     
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')
@@ -427,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'):
@@ -673,10 +702,13 @@ class ECHO_navigation(Folder):
 
                         loc=getattr(temp[x][1],'location','top')
                         if (loc==location):
-                            listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url())+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix','')))
-                    else:
-                        listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url())+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix','')))
 
+                            
+                            listNav.append((label,createPath(self,self.absolute_url(),temp[x][1].absolute_url(relative=1))+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix','')))
+                    else:
+                        
+                        listNav.append((label,createPath(self,self.absolute_url(),temp[x][1].absolute_url(relative=1))+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix','')))
+        #print self.REQUEST
         return listNav
 
     def tempSorted(self,hash,field="weight"):
@@ -777,8 +809,9 @@ class ECHO_navigation(Folder):
         for key in self.tempSorted(temp):
             
             description=temp[x][1].title
-         
-            url=createPath(self.absolute_url(),temp[key][1].absolute_url())
+            
+            
+            url=createPath(self,self.absolute_url(),temp[key][1].absolute_url(relative=1))
 
             if (self.REQUEST['URL']==url) | (self.REQUEST['URL']==url+"/index_html"):
                 html=html+startTag+"[%s]" % description+endTag
@@ -924,15 +957,18 @@ def manage_addECHO_navigation(self,id,ti
 
 
 
-def createPath(url1,url2):
-    temp1=url1.split("/")
-    temp2=url2.split("/")
-    for test in temp1:
-        if temp2[0]==test:
-            del temp2[0]
-
-    #print "CP:"+url1+"::"+url2+"::"+url1+"/"+string.join(temp2,"/")
-    return url1+"/"+string.join(temp2,"/")
+def createPath(self,url1,url2):
+    #bugfix in absolute_url, ploetzlich erschein in absolute_url der physikalische pfad.
+    
+    if self.REQUEST.has_key('VirtualRootPhysicalPath'):
+        vp="/".join(self.REQUEST['VirtualRootPhysicalPath'])
+        if vp[0]=="/":
+            vp=vp[1:]
+        
+        url2=url2.replace(vp+"/",'')
+        
+       
+    return url1+"/"+url2
 
 def sortWeight(x,y):
     #print x[1],y[1]