--- ECHO_content/ECHO_Nav.py 2005/02/07 19:40:37 1.54 +++ ECHO_content/ECHO_Nav.py 2005/11/25 18:46:40 1.66 @@ -1,5 +1,4 @@ -# Objekte zur Erzeugung von Navigationselementen - +# Objekte zur Erzeugung von Navigationselement from AccessControl import ClassSecurityInfo from Globals import DTMLFile from OFS.Image import Image,cookId @@ -14,7 +13,7 @@ import os.path from Globals import package_home import urllib from ECHO_helpers import * -from ECHO_collection import content_html +from ECHO_collection import content_html from types import * @@ -28,7 +27,7 @@ import re import string from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate import os.path -from Globals import package_home + import urllib from ECHO_helpers import displayTypes,checkOnlyOneInGroup from ECHO_collection import content_html @@ -100,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))) @@ -126,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') @@ -267,9 +269,17 @@ class ECHO_sqlElement(SimpleItem): zLOG.LOG('ECHO_Nav',zLOG.INFO,'ZSQLSimpleSearch not supported') def getNavList(self): - """ausgabe der treffer list für navigation""" + """ausgabe der treffer list fuer navigation""" + + #naechste schritte sind trial and error, warum geht mal das eine mal das andere 2.3 / 2.4 ?? - records=self.searchQuery() + try: + 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(??) if not records: @@ -303,19 +313,27 @@ class ECHO_pageTemplate(ZopePageTemplate meta_type="ECHO_pageTemplate" security=ClassSecurityInfo() + _default_content_fn = os.path.join(package_home(globals()), 'html/ECHO_pageTemplateDefault.html') manage_options=ZopePageTemplate.manage_options+ECHO_basis.manage_options+( {'label':'Main Config','action':'changeECHO_pageTemplateMainForm'}, + {'label':'Graphic Coords','action':'ECHO_graphicEntry'}, ) security.declarePublic('content_html') + def addChanges(self): + """do nothing leere methode, notwendig, da bei veerbung + von dieser klasse nur ueberschrieben werden kann, + falls methode per url aufgerufen werden soll""" + + return True def content_html(self): - """content_html""" - return content_html(self,'pageTemplate') + """content_html""" + return content_html(self,'pageTemplate') def changeECHO_pageTemplateMainForm(self): """change""" @@ -412,6 +430,15 @@ class ECHO_navigation(Folder): """Navigations Element""" meta_type="ECHO_Navigation" + def getNavInfo(self): + """root informationen""" + if hasattr(self,'logo_image'): + if hasattr(self.logo_image,'tag'): + imageTag=self.logo_image.tag() + else: + imageTag='' + return (self.title,imageTag) + def linkBar(self,parent): """linkbarer balken""" str="" @@ -438,37 +465,37 @@ class ECHO_navigation(Folder): return str.encode('latin-1') def ECHOFormatListStr(self,list,search="\n",replace="
"): """formatiert liste im str""" - if list: - return re.sub(search,replace,list) - else: - return + if list: + return re.sub(search,replace,list) + else: + return def ECHO_cacheManageForm(self): - """change form""" - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ECHO_cacheManageForm')).__of__(self) - pt.content_type="text/html" - return pt() + """change form""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'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: + """cachemanager""" + if cacheManagerName=="": chacheManagerName=None + + self.cacheManagerName=cacheManagerName + self.setCache(managerName=cacheManagerName) + + if deleteCache: try: - self.deleteCache() + self.deleteCache() except: for roots in self.ZopeFind(self,obj_metatypes=['ECHO_root'],search_sub=1): roots[1].deleteCache() - self.activateCache=activateCache + self.activateCache=activateCache - if RESPONSE is not None: - RESPONSE.redirect('manage_main') - + if RESPONSE is not None: + RESPONSE.redirect('manage_main') + def setCache(self,obj=None,RESPONSE=None,managerName='CacheManager'): """setze alle collections auf cache = CacheManager""" @@ -476,10 +503,9 @@ class ECHO_navigation(Folder): if not obj: obj = self - entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_collection'],search_sub=1) + entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_collection','VLP_resource'],search_sub=1) for entry in entries: - #print entry[0] entry[1].ZCacheable_setManagerId(managerName) @@ -495,8 +521,8 @@ class ECHO_navigation(Folder): return viewers def getR(self): - """re""" - return self.REQUEST + """re""" + return self.REQUEST def __init__(self,id,title,pathToHierarchy): """init""" @@ -594,7 +620,7 @@ class ECHO_navigation(Folder): tempObj=self.pathToHierarchy[0:] tempObj=re.sub("/",".",tempObj) tempObj="self.aq_parent"+tempObj - #print tempObj + #print tempObj objtemp=eval(tempObj) obj=objtemp @@ -635,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"): @@ -712,8 +746,15 @@ class ECHO_navigation(Folder): return 1 else: return 0 + - + def getPathStyle(self, item, style=""): + """returns a string with the given style + 'sel' if the path is already selected.""" + + if self.isSelectedPath(item): + return style + 'sel' + else: + return style def buttonsFromHash(self,hash,start=None,orientation="horizontal"): @@ -742,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 @@ -780,9 +822,9 @@ class ECHO_navigation(Folder): return keys def numberOfMainNavElements(self): - """number of main elements""" + """number of main elements""" - return len(self.barFromHash(self.createNavHash(0))) + return len(self.barFromHash(self.createNavHash(0))) def startOfHierarchy(self,list): splitted=self.pathToHierarchy.split("/") @@ -795,9 +837,7 @@ class ECHO_navigation(Folder): return nr+1 def secondNavElements(self): - """Zweite Ordnung Navigationselemente - - """ + """Zweite Ordnung Navigationselemente""" hash=self.createNavHash(2,checkOnly="no") actual_url=self.REQUEST['URL'] @@ -807,12 +847,12 @@ class ECHO_navigation(Folder): splitted=ult_temp.split("/") - #print "AU",self.absolute_url(),splitted - #start=[splitted[2]] #orig + #print "AU",self.absolute_url(),splitted + #start=[splitted[2]] #orig startNr= self.startOfHierarchy(splitted) - start=[splitted[startNr]] - + start=[splitted[startNr]] + #print start keys=self.barFromHash(hash,start=start) @@ -840,7 +880,7 @@ class ECHO_navigation(Folder): #start=splitted[2:order+1] #orig startNr= self.startOfHierarchy(splitted) #print startNr - start=splitted[startNr:order+startNr-1] + start=splitted[startNr:order+startNr-1] #print start keys=self.barFromHash(hash,start=start) @@ -891,15 +931,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]