--- ECHO_content/ECHO_Nav.py	2005/10/26 16:14:29	1.61
+++ ECHO_content/ECHO_Nav.py	2005/11/24 18:31:31	1.65
@@ -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')
@@ -269,8 +272,12 @@ class ECHO_sqlElement(SimpleItem):
         """ausgabe der treffer list fuer navigation"""
         
         #naechste schritte sind trial and error, warum geht mal das eine mal das andere 2.3 / 2.4 ??
+        
         try:
-            records=self.searchQuery(self.aq_parent,query=self.query) #python 2.4 version (??)
+	    try:
+		records=self.ZSQLSimpleSearch(query=self.query)
+	    except:
+            	records=self.searchQuery(self.aq_parent,query=self.query) #python 2.4 version (??)
         except:
             records=self.searchQuery()#python 2.3 version(??)
       
@@ -654,20 +661,28 @@ class ECHO_navigation(Folder):
                             try:
                                 label=temp[x][1].getLabel()
                             except:
-                                label=temp[x][1].label
+                                label=temp[x][1].label.encode('utf-8')
                         else:
                             label=temp[x][1].title.encode('utf-8')
                     else:
                         label=temp[x][1].title.encode('utf-8')                            
                     
+                    try:
+                        label=label.encode('utf-8')
+                    except:
+                        label=label.decode('latin-1')
+                        
                     if location:
 
                         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"):
@@ -768,8 +783,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
@@ -915,15 +931,17 @@ 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.
+    
+    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]