--- ECHO_content/ECHO_Nav.py 2004/08/28 01:06:03 1.40 +++ ECHO_content/ECHO_Nav.py 2004/09/27 14:39:59 1.47 @@ -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,15 @@ 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,suffix=None,prefix=None): """change""" self.weight=weight self.contentType=contentType self.label=label self.description=description + self.isAlwaysClickable=isAlwaysClickable + self.suffix=suffix + self.prefix=prefix if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -335,6 +340,7 @@ class ECHO_pageTemplate(ZopePageTemplate def getLabel(self): if hasattr(self,'label'): return self.label.encode('utf-8') + else: return 0 @@ -415,6 +421,55 @@ class ECHO_navigation(Folder): """Navigations Element""" meta_type="ECHO_Navigation" + def ECHOFormatListStr(self,list,search="\n",replace="
"): + """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: + try: + self.deleteCache() + except: + for roots in self.ZopeFind(self,obj_metatypes=['ECHO_root'],search_sub=1): + roots[1].deleteCache() + + + 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 +489,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): @@ -473,40 +530,32 @@ class ECHO_navigation(Folder): objtemp=eval(temp) nav={} - #print getattr(self,'v_hash',None) - try: - #print "cash",self.getId(),str(depth) - return self._v_hash[str(depth)] - except: - """nothing""" - #print "nocash",self.getId(),str(depth) - - 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"): - - 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) - - - #print nav - try: - self._v_hash[str(depth)]={} - except: - self._v_hash={} - self._v_hash[str(depth)]={} + #store in cache if activated + if getattr(self,'activateCache',None): - for x in nav.keys(): - self._v_hash[str(depth)][x]=nav[x] + try: + self._v_hash[str(depth)]={} + except: + self._v_hash={} + self._v_hash[str(depth)]={} + + for x in nav.keys(): + self._v_hash[str(depth)][x]=nav[x] return nav @@ -517,7 +566,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: @@ -555,14 +604,15 @@ class ECHO_navigation(Folder): if (temp[x][1].meta_type=="ECHO_sqlElement") or (temp[x][1].meta_type=="ECHO_ZCatalogElement"): for z in temp[x][1].getNavList(): - listNav.append((z[0],z[1],None)) + listNav.append((z[0],z[1],None,'','')) else: # add label falls existiert und nicht leer if hasattr(temp[x][1],'label'): + if not temp[x][1].label=='': try: - label=temp[x][1].label.encode('utf-8','ignore') + label=temp[x][1].getLabel() except: label=temp[x][1].label else: @@ -573,9 +623,9 @@ class ECHO_navigation(Folder): if location: loc=getattr(temp[x][1],'location','top') if (loc==location): - listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1])) + listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),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()),temp[x][1])) + listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) return listNav @@ -601,17 +651,44 @@ class ECHO_navigation(Folder): def isSelectedPath(self,item): """test is path is already selected""" - found=re.search("\?(.*)/",item[1]) + + testStr=re.sub("/index_html",'',self.REQUEST.get('URL','')) + + #falls exakte Übereinstimmung dann immer 1 + if (testStr==item[1]) and (self.REQUEST.get('QUERY_STRING','')==''): + + return 1 + + 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 (getattr(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"):