--- ECHO_content/ECHO_Nav.py	2004/07/27 14:05:46	1.38
+++ ECHO_content/ECHO_Nav.py	2004/08/31 17:20:31	1.41
@@ -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"""
@@ -310,23 +312,24 @@ class ECHO_pageTemplate(ZopePageTemplate
                                        'html/ECHO_pageTemplateDefault.html')
 
     manage_options=ZopePageTemplate.manage_options+(
-        {'label':'Main Config','action':'changeECHO_pageTemplateWeightForm'},
+        {'label':'Main Config','action':'changeECHO_pageTemplateMainForm'},
         )
 
     def content_html(self):
 	"""content_html"""
 	return content_html(self,'pageTemplate')
 
-    def changeECHO_pageTemplateWeightForm(self):
+    def changeECHO_pageTemplateMainForm(self):
         """change"""
-        pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateWeight.zpt').__of__(self)
+        pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateMain.zpt').__of__(self)
         return pt()
 
-    def changeECHO_pageTemplateWeight(self,weight,contentType,label,RESPONSE=None):
+    def changeECHO_pageTemplateMain(self,weight,contentType,label,description,RESPONSE=None):
         """change"""
         self.weight=weight
         self.contentType=contentType
         self.label=label
+        self.description=description
         
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
@@ -414,6 +417,48 @@ class ECHO_navigation(Folder):
     """Navigations Element"""
     meta_type="ECHO_Navigation"
 
+    def ECHOFormatListStr(self,list,search="\n",replace="<br>"):
+        """formatiert liste im str"""
+        return re.sub(search,replace,list)
+    
+    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):
@@ -433,6 +478,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):
@@ -467,27 +514,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)
             
-            if hasattr(x,"meta_type"):
+        #store in cache if activated
+        if getattr(self,'activateCache',None):
+            
+            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):
@@ -497,7 +555,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: