--- ECHO_content/ECHO_Nav.py	2004/08/17 15:22:14	1.39
+++ ECHO_content/ECHO_Nav.py	2004/09/01 14:32:32	1.43
@@ -192,6 +192,8 @@ class ECHO_sqlElement(SimpleItem):
     """Erzeuge navigation aus sql-abfrage"""
     meta_type="ECHO_sqlElement"
     baseUrl=""
+
+
     
     def __init__(self,id,title,query,field,searchField,baseUrl,weight,contentType):
         """init"""
@@ -322,12 +324,13 @@ class ECHO_pageTemplate(ZopePageTemplate
         pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateMain.zpt').__of__(self)
         return pt()
 
-    def changeECHO_pageTemplateMain(self,weight,contentType,label,description,RESPONSE=None):
+    def changeECHO_pageTemplateMain(self,weight,contentType,label,description,RESPONSE=None,isAlwaysClickable=None):
         """change"""
         self.weight=weight
         self.contentType=contentType
         self.label=label
         self.description=description
+        self.isAlwaysClickable=isAlwaysClickable
         
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
@@ -415,6 +418,51 @@ class ECHO_navigation(Folder):
     """Navigations Element"""
     meta_type="ECHO_Navigation"
 
+    def ECHOFormatListStr(self,list,search="\n",replace="<br>"):
+        """formatiert liste im str"""
+	if list:
+        	return re.sub(search,replace,list)
+    	else:
+		return 
+
+    def ECHO_cacheManageForm(self):
+	    """change form"""
+	    pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_cacheManageForm').__of__(self)
+	    pt.content_type="text/html"
+	    return pt()
+
+    def ECHO_cacheManage(self,cacheManagerName=None,deleteCache=None, activateCache=None,RESPONSE=None):
+	    """cachemanager"""
+	    if cacheManagerName=="": chacheManagerName=None
+	    
+	    self.cacheManagerName=cacheManagerName
+	    self.setCache(managerName=cacheManagerName)
+	    
+	    if deleteCache:
+		    self.deleteCache()
+
+	    print activateCache
+	    self.activateCache=activateCache
+
+	    if RESPONSE is not None:
+		    RESPONSE.redirect('manage_main')
+	
+    def setCache(self,obj=None,RESPONSE=None,managerName='CacheManager'):
+        """setze alle collections auf cache = CacheManager"""
+
+
+        if not obj:
+            obj = self
+            
+        entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_collection'],search_sub=1)
+
+        for entry in entries:
+            #print entry[0]
+            entry[1].ZCacheable_setManagerId(managerName)
+
+        
+        return "changed all CM in: "+self.title
+
     displayedMetaTypes=displayTypes
 
     def getImageViewers(self):
@@ -434,6 +482,8 @@ class ECHO_navigation(Folder):
 
     manage_options = Folder.manage_options+(
         {'label':'Main Config','action':'ECHO_navigationConfigForm'},
+        {'label':'Cache','action':'ECHO_cacheManageForm'},
+
         )
 
     def ECHO_navigationConfigForm(self):
@@ -468,27 +518,38 @@ class ECHO_navigation(Folder):
         temp=self.pathToHierarchy[0:]
         temp=re.sub("/",".",temp)
         temp="self.aq_parent"+temp
+
         
         objtemp=eval(temp)
         nav={}
-        obj=objtemp
-
         
+        #check if cash is enabled and if already exists and if not empty
+        if getattr(self,'_v_hash',None) and getattr(self,'activateCache',None) and self._v_hash.get(str(depth),None):
+           
+           return self._v_hash[str(depth)]
+
+        # if not generate new hash
+        obj=objtemp      
 
         for keys in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes):
             x=keys[1]
+            if depth>1:
+                nav[x.getId()]=(self.getColls(x,int(depth)-1,checkOnly),x)
+            else:
+                nav[x.getId()]=(None,x)
+            
+        #store in cache if activated
+        if getattr(self,'activateCache',None):
             
-            if hasattr(x,"meta_type"):
+            try:
+                self._v_hash[str(depth)]={}
+            except:
+                self._v_hash={}
+                self._v_hash[str(depth)]={}
 
-                if x.meta_type in self.displayedMetaTypes:
-                   
-                    if depth>1:
-                        nav[x.getId()]=(self.getColls(x,int(depth)-1,checkOnly),x)
-                    else:
-                        nav[x.getId()]=(None,x)
-                    
+            for x in nav.keys():
+                self._v_hash[str(depth)][x]=nav[x]
 
-        #print nav
         return nav
 
     def barFromHash(self,hash,start=None,sortField=None,location=None):
@@ -498,7 +559,7 @@ class ECHO_navigation(Folder):
         if not start:
             temp=hash
             sortField="weight"
-        else: # list mit pfad zum hash
+        else: # liste mit pfad zum hash
             temp=hash
             #print "HI",sortField
             if not sortField:
@@ -582,17 +643,35 @@ class ECHO_navigation(Folder):
             
     def isSelectedPath(self,item):
         """test is path is already selected"""
+        
         found=re.search("\?(.*)/",item[1])
         if found:
             temp=re.sub(" ","%20",found.group(0))
             #print temp+"::"+self.REQUEST['QUERY_STRING']
             if ("?"+self.REQUEST['QUERY_STRING'])==temp:
+                if getattr(item[2],'isAlwaysClickable',None): #immer auswaehlbar?
+                
+                    return 2
+                else:
+                    return 1
+
+        if (item[2].meta_type=="ECHO_pageTemplate") and (re.search(item[1],self.REQUEST['URL'])):
+            if getattr(item[2],'isAlwaysClickable',None): #immer auswaehlbar?
+                
+                return 2
+            else:
                 return 1
 
         if re.search(item[1]+"/",self.REQUEST['URL']):
-            return 1
+            if getattr(item[2],'isAlwaysClickable',None): #immer auswaehlbar?
+                
+                return 2
+            else:
+                return 1
         else:
             return 0
+
+        
         
     
     def buttonsFromHash(self,hash,start=None,orientation="horizontal"):