--- ECHO_content/ECHO_Nav.py 2004/02/05 17:13:18 1.5
+++ ECHO_content/ECHO_Nav.py 2004/09/01 21:51:38 1.45
@@ -1,6 +1,24 @@
# Objekte zur Erzeugung von Navigationselementen
+from Globals import DTMLFile
+from OFS.Image import Image,cookId
+from OFS.Folder import Folder
+from OFS.SimpleItem import SimpleItem
+from Products.PageTemplates.PageTemplateFile import PageTemplateFile
+from Products.PageTemplates.PageTemplate import PageTemplate
+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
+
+
+from Globals import DTMLFile
+from OFS.Image import Image,cookId
from OFS.Folder import Folder
from OFS.SimpleItem import SimpleItem
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
@@ -11,25 +29,196 @@ from Products.PageTemplates.ZopePageTemp
import os.path
from Globals import package_home
import urllib
+from ECHO_helpers import displayTypes,checkOnlyOneInGroup
+from ECHO_collection import content_html
+
+
+
+
+class ECHO_ZCatalogElement(SimpleItem):
+ """Erzeuge navigation aus ZCatalog-abfrage"""
+ meta_type="ECHO_ZCatalogElement"
+ baseUrl=""
+
+ def __init__(self,id,title,field,catalogId,baseUrl,weight,contentType):
+ """init"""
+ self.id=id
+ self.title=title
+ self.catalogId=catalogId
+ self.field=field
+
+ self.baseUrl=baseUrl
+ self.weight=weight
+ self.content=contentType
+
+ manage_options= SimpleItem.manage_options+(
+ {'label':'Main Config','action':'changeECHO_ZCatalogElementForm'},
+ )
+
+
+ def getWeight(self):
+ """get weight"""
+ if hasattr(self,'weight'):
+ return self.weight
+ else:
+ return 0
+
+ def getcontentType(self):
+ """get weight"""
+
+ if hasattr(self,'contentType'):
+ return self.contentType
+ else:
+ return 0
+
+
+ def changeECHO_ZCatalogElementForm(self):
+ """change"""
+
+ pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_ZCatalogElement.zpt').__of__(self)
+ return pt()
+
+ def changeECHO_ZCatalogElement(self,title,field,catalogId,baseUrl,weight,contentType,RESPONSE=None):
+ """change"""
+ self.title=title
+ self.catalogId=catalogId
+ self.field=field
+ self.baseUrl=baseUrl
+ self.weight=weight
+ self.contentType=contentType
+
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+ def getKeywordList(self):
+ return getattr(self,self.catalogId).uniqueValuesFor(self.field)
+
+ def getNavList(self):
+ """ausgabe der treffer list für navigation"""
+
+ records=self.getKeywordList()
+
+
+ if not records:
+ return []
+ else:
+ ret=[]
+ for record in records:
+ #print "RC",record
+ #if record:
+ # ret.append((record,self.baseUrl+urllib.quote(record)))
+ try:
+ ret.append((record,self.baseUrl+urllib.quote(record)))
+ except:
+ """nothing"""
+
+ return ret
+
+
+def manage_addECHO_ZCatalogElementForm(self):
+ """Form for adding"""
+ pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_ZCatalogElement.zpt').__of__(self)
+ return pt()
+
+def manage_addECHO_ZCatalogElement(self,id,title,field,baseUrl,weight,contentType,RESPONSE=None):
+ """Add an ECHO_ZCatalogelement"""
+ self._setObject(id,ECHO_ZCatalogElement(id,title,field,baseUrl,weight,contentType))
+
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+
+
+
+class ECHO_contentType(Image):
+ """ContentType Object"""
+
+ meta_type="ECHO_contentType"
+
+
+ manage_options=Image.manage_options+(
+ {'label':'Change Description','action':'changeECHO_contentTypeForm'},
+ )
+
+ def changeECHO_contentTypeForm(self):
+ """Change the description text"""
+ pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_contentType.zpt').__of__(self)
+ return pt()
+
+ def changeECHO_contentType(self,description,RESPONSE=None):
+ """Change the Content"""
+ self.description=description
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+
+manage_addECHO_contentTypeForm=DTMLFile('dtml/ECHO_contentTypeAdd',globals(),
+ Kind='ECHO_contentType',kind='ECHO_contentType')
+
+def manage_addECHO_contentType(self, id, file=None, title='', precondition='', content_type='', description='',
+ REQUEST=None):
+ """
+ Add a new Image object.
+
+ Creates a new Image object 'id' with the contents of 'file'.
+ """
+
+ id=str(id)
+ title=str(title)
+ content_type=str(content_type)
+ precondition=str(precondition)
+
+ id, title = cookId(id, title, file)
+
+ self=self.this()
+
+ # First, we create the image without data:
+ self._setObject(id, ECHO_contentType(id,title,'',content_type, precondition))
+
+ self._getOb(id).description=description
+
+ # Now we "upload" the data. By doing this in two steps, we
+ # can use a database trick to make the upload more efficient.
+ if file:
+ self._getOb(id).manage_upload(file)
+ if content_type:
+ self._getOb(id).content_type=content_type
+
+ if REQUEST is not None:
+ try: url=self.DestinationURL()
+ except: url=REQUEST['URL1']
+ REQUEST.RESPONSE.redirect('%s/manage_main' % url)
+ return id
+
class ECHO_sqlElement(SimpleItem):
"""Erzeuge navigation aus sql-abfrage"""
meta_type="ECHO_sqlElement"
baseUrl=""
+
+
- def __init__(self,id,title,query,field,baseUrl,weight):
+ def __init__(self,id,title,query,field,searchField,baseUrl,weight,contentType):
"""init"""
self.id=id
self.title=title
self.query=query
self.field=field
+ if searchField=="":
+ self.searchField=field
+ else:
+ self.searchField=searchField
self.baseUrl=baseUrl
- self.weight=weight
+
+ self.content=contentType
manage_options= SimpleItem.manage_options+(
{'label':'Main Config','action':'changeECHO_sqlElementForm'},
)
+ def getSearchField(self):
+ try:
+ return self.searchField
+ except:
+ return self.field
+
def getWeight(self):
"""get weight"""
if hasattr(self,'weight'):
@@ -37,47 +226,79 @@ class ECHO_sqlElement(SimpleItem):
else:
return 0
+ def getcontentType(self):
+ """get weight"""
+
+ if hasattr(self,'contentType'):
+ return self.contentType
+ else:
+ return 0
def changeECHO_sqlElementForm(self):
"""change"""
- pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_sqlElement.zpt').__of__(self)
+
+ pt=PageTemplateFile('Products/ECHO_content/zpt/changeECHO_sqlElement.zpt').__of__(self)
return pt()
- def changeECHO_sqlElement(self,title,query,field,baseUrl,weight,RESPONSE=None):
+ def changeECHO_sqlElement(self,title,query,field,searchField,baseUrl,weight,contentType,RESPONSE=None):
"""change"""
self.title=title
self.query=query
self.field=field
+ self.searchField=searchField
self.baseUrl=baseUrl
self.weight=weight
-
+ self.contentType=contentType
+
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
- def searchQuery(self):
- return self.search(var=self.query)
+ def searchQuery(self,query=None,obj=None):
+ #presently a hack, tests if search is of the search method, if not look at the next level.
+ #
+ #return self.ZSQLsimpleSearch(var=self.query)
+ if not query:
+ query=self.query
+
+ if self.search.meta_type=="Z SQL Method":
+ return self.search(var=self.query)
+ else:
+ if self.aq_parent.aq_parent.search.meta_type=="Z SQL Method":
+ return self.aq_parent.aq_parent.search(var=self.query)
+ else:
+ return []
+
+
+
def getNavList(self):
"""ausgabe der treffer list für navigation"""
+
records=self.searchQuery()
+
+
if not records:
return []
else:
ret=[]
for record in records:
- ret.append((getattr(record,self.field),self.baseUrl+str(getattr(record,self.field))))
+ try:
+ ret.append((getattr(record,self.field),self.baseUrl+urllib.quote(str(getattr(record,self.getSearchField())))))
+ except:
+ """notrhing"""
+
return ret
-def manage_AddECHO_sqlElementForm(self):
+def manage_addECHO_sqlElementForm(self):
"""Form for adding"""
- pt=PageTemplateFile('Products/ECHO_content/AddECHO_sqlElement.zpt').__of__(self)
+ pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_sqlElement.zpt').__of__(self)
return pt()
-def manage_AddECHO_sqlElement(self,id,title,query,field,baseUrl,RESPONSE=None):
+def manage_addECHO_sqlElement(self,id,title,query,field,searchField,baseUrl,weight,contentType,RESPONSE=None):
"""Add an ECHO_sqlelement"""
- self._setObject(id,ECHO_sqlElement(id,title,query,field,baseUrl))
+ self._setObject(id,ECHO_sqlElement(id,title,query,field,searchField,baseUrl,weight,contentType))
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -88,23 +309,37 @@ class ECHO_pageTemplate(ZopePageTemplate
meta_type="ECHO_pageTemplate"
_default_content_fn = os.path.join(package_home(globals()),
- 'ECHO_pageTemplateDefault.html')
+ 'html/ECHO_pageTemplateDefault.html')
manage_options=ZopePageTemplate.manage_options+(
- {'label':'Weight','action':'changeECHO_pageTemplateWeightForm'},
+ {'label':'Main Config','action':'changeECHO_pageTemplateMainForm'},
)
- def changeECHO_pageTemplateWeightForm(self):
+ def content_html(self):
+ """content_html"""
+ return content_html(self,'pageTemplate')
+
+ def changeECHO_pageTemplateMainForm(self):
"""change"""
- pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_pageTemplateWeight.zpt').__of__(self)
+ pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateMain.zpt').__of__(self)
return pt()
- def changeECHO_pageTemplateWeight(self,weight,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')
+
+ def getLabel(self):
+ if hasattr(self,'label'):
+ return self.label.encode('utf-8')
+ else:
+ return 0
def getWeight(self):
"""get weight"""
@@ -112,25 +347,33 @@ class ECHO_pageTemplate(ZopePageTemplate
return self.weight
else:
return 0
+
+ def getcontentType(self):
+ """get contentType"""
+ if hasattr(self,'contentType'):
+ return self.contentType
+ else:
+ return 0
+
- ## def __init__(self, id, text=None, content_type=None):
+ ## def __init__(self, id, text=None, contentType=None):
## self.id = str(id)
## self.ZBindings_edit(self._default_bindings)
## if text is None:
## text = open(self._default_cont).read()
-## self.pt_edit(text, content_type)
+## self.pt_edit(text, contentType)
-def manage_AddECHO_pageTemplateForm(self):
+def manage_addECHO_pageTemplateForm(self):
"""Form for adding"""
- pt=PageTemplateFile('Products/ECHO_content/AddECHO_pageTemplate.zpt').__of__(self)
+ pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_pageTemplate.zpt').__of__(self)
return pt()
from urllib import quote
-def manage_AddECHO_pageTemplate(self, id, weight= 0,title=None, text=None,
+def manage_addECHO_pageTemplate(self, id, label, weight= 0,contentType=0,title=None, text=None,
REQUEST=None, submit=None):
"Add a Page Template with optional file content."
@@ -140,6 +383,8 @@ def manage_AddECHO_pageTemplate(self, id
self._setObject(id, ECHO_pageTemplate(id, text))
ob = getattr(self, id)
setattr(ob,'weight',weight)
+ setattr(ob,'label',label)
+ setattr(ob,'contentType',contentType)
if title:
ob.pt_setTitle(title)
return ob
@@ -149,12 +394,15 @@ def manage_AddECHO_pageTemplate(self, id
if headers is None or not file.filename:
zpt = ECHO_pageTemplate(id)
else:
- zpt = ECHO_pageTemplate(id, file, headers.get('content_type'))
+ zpt = ECHO_pageTemplate(id, file, headers.get('contentType'))
self._setObject(id, zpt)
ob = getattr(self, id)
setattr(ob,'weight',weight)
-
+ setattr(ob,'label',label)
+ if title:
+ ob.pt_setTitle(title)
+
try:
u = self.DestinationURL()
except AttributeError:
@@ -170,8 +418,62 @@ class ECHO_navigation(Folder):
"""Navigations Element"""
meta_type="ECHO_Navigation"
- displayedMetaTypes=['ECHO_collection','ECHO_pageTemplate','ZSQLExtendFolder','ECHO_sqlElement']
+ 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:
+ 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):
+ """images"""
+ viewers=self.ZopeFind(self.standardImageViewer,obj_metatypes=['OSAS_ViewerObject'])
+ return viewers
+ def getR(self):
+ """re"""
+ return self.REQUEST
+
def __init__(self,id,title,pathToHierarchy):
"""init"""
self.id=id
@@ -180,11 +482,13 @@ class ECHO_navigation(Folder):
manage_options = Folder.manage_options+(
{'label':'Main Config','action':'ECHO_navigationConfigForm'},
+ {'label':'Cache','action':'ECHO_cacheManageForm'},
+
)
def ECHO_navigationConfigForm(self):
"""configForm"""
- pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_navigation.zpt').__of__(self)
+ pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_navigation.zpt').__of__(self)
return pt()
def ECHO_navigationConfig(self,title,pathToHierarchy,RESPONSE=None):
@@ -196,73 +500,79 @@ class ECHO_navigation(Folder):
RESPONSE.redirect('manage_main')
- def getColls(self,obj,depth):
+ def getColls(self,obj,depth,checkOnly="no"):
nav={}
#print "HERE",obj.
- for keys in obj.__dict__.keys():
- x=getattr(obj,keys)
- if hasattr(x,"meta_type"):
- if x.meta_type in self.displayedMetaTypes:
- if depth>1:
- nav[x.getId()]=(self.getColls(x,depth-1),x)
- else:
- nav[x.getId()]=(None,x)
+ for x_objs in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes):
+ x=x_objs[1]
+ if checkOnly=="yes":
+ x = checkOnlyOneInGroup(x)
+ if depth>1:
+ nav[x.getId()]=(self.getColls(x,depth-1),x)
+ else:
+ nav[x.getId()]=(None,x)
return nav
- def createNavHash(self,depth):
+ def createNavHash(self,depth,checkOnly="no"):
"""Auslesen des Hierarchiebuames"""
temp=self.pathToHierarchy[0:]
temp=re.sub("/",".",temp)
temp="self.aq_parent"+temp
+
objtemp=eval(temp)
nav={}
- obj=objtemp
- #exec(obj)
+ #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):
+
+ try:
+ self._v_hash[str(depth)]={}
+ except:
+ self._v_hash={}
+ self._v_hash[str(depth)]={}
- #objtemp = compile(temp,'','single')
- #obj=eval(objtemp)
- #print obj
-
- #print obj.__dict__.keys()
-
- for keys in obj.__dict__.keys():
- x=getattr(obj,keys)
- if hasattr(x,"meta_type"):
- #print x.meta_type
- if x.meta_type in self.displayedMetaTypes:
-
- if depth>1:
- nav[x.getId()]=(self.getColls(x,int(depth)-1),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):
+ def barFromHash(self,hash,start=None,sortField=None,location=None):
"""Erzeuge Navigations Element"""
#print "hash",hash
listNav=[]
if not start:
temp=hash
sortField="weight"
- else: # list mit pfad zum hash
+ else: # liste mit pfad zum hash
temp=hash
- print "HI",sortField
+ #print "HI",sortField
if not sortField:
tempObj=self.pathToHierarchy[0:]
tempObj=re.sub("/",".",tempObj)
tempObj="self.aq_parent"+tempObj
-
+ #print tempObj
objtemp=eval(tempObj)
obj=objtemp
for x in start:
-
+ #print "OBJ",start,obj,obj.getId(),x
obj=getattr(obj,x)
@@ -270,30 +580,50 @@ class ECHO_navigation(Folder):
sortField=obj.sortfield
else:
sortField='weight'
+ #print "START",start
for x in start:
+ #print "N2",x,temp[x]
+ try:
temp=temp[x][0]
- print "HELL",sortField
+ except:
+ """nothing"""
+ return []
+ #print "TEMP",temp,self.tempSorted(temp, field=sortField)
+
for x in self.tempSorted(temp, field=sortField):
+
if not temp[x][1].title == "":
- if temp[x][1].meta_type=="ECHO_sqlElement":
+
+ 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]))
+ listNav.append((z[0],z[1],None))
+
else:
- listNav.append((temp[x][1].title,createPath(self.absolute_url(),temp[x][1].absolute_url())))
-
- print self.getId(),start
- print listNav
+ # 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')
+ except:
+ label=temp[x][1].label
+ else:
+ label=temp[x][1].title.encode('utf-8')
+ else:
+ label=temp[x][1].title.encode('utf-8')
- #html=""
- #for k in listNav:
- # print k
- # html=html+"%s "% (self.absolute_url()+createPath(k[1][1].absolute_url()),k[0])
+ 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]))
+ else:
+ listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()),temp[x][1]))
return listNav
def tempSorted(self,hash,field="weight"):
ls=[]
- print "SORT",field
+
for x in hash.keys():
#print hash[x][1]
if hasattr(hash[x][1],field):
@@ -313,17 +643,44 @@ class ECHO_navigation(Folder):
def isSelectedPath(self,item):
"""test is path is already selected"""
+
+ 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 re.search(item[1]+"/",self.REQUEST['URL']):
+ if getattr(item[2],'isAlwaysClickable',None): #immer auswaehlbar?
+
+ return 2
+ else:
+ return 1
else:
return 0
+
+
def buttonsFromHash(self,hash,start=None,orientation="horizontal"):
@@ -368,7 +725,7 @@ class ECHO_navigation(Folder):
def mainNavBar(self):
"""print main navigation bar"""
keys=""
- print "NAVBAR",self.getId()
+
try:
keys=self.buttonsFromHash(self.createNavHash(0))
except:
@@ -376,23 +733,62 @@ class ECHO_navigation(Folder):
return keys
- def mainNavElements(self):
+ def mainNavElements(self,location=None):
"""print main navigation bar"""
keys=""
- print "NAVELEMENT",self.getId()
+ #print "NAVELEMENT",self.getId()
#try:
-
- keys=self.barFromHash(self.createNavHash(0))
-
+
+ keys=self.barFromHash(self.createNavHash(0),location=location)
+
#except:
# keys=""
return keys
+
+ def numberOfMainNavElements(self):
+ """number of main elements"""
+
+ return len(self.barFromHash(self.createNavHash(0)))
+
+ def startOfHierarchy(self,list):
+ splitted=self.pathToHierarchy.split("/")
+ last=splitted[len(splitted)-1]
+ #print last,list
+ try:
+ nr=list.index(last)
+ except:
+ nr=0
+ return nr+1
def secondNavElements(self):
"""Zweite Ordnung"""
- hash=self.createNavHash(2)
+ hash=self.createNavHash(2,checkOnly="no")
+ actual_url=self.REQUEST['URL']
+
+ ult_temp=re.sub(self.absolute_url(),"",actual_url)
+ #print ult_temp
+
+ splitted=ult_temp.split("/")
+
+ #print "AU",self.absolute_url(),splitted
+ #start=[splitted[2]] #orig
+ startNr= self.startOfHierarchy(splitted)
+
+ start=[splitted[startNr]]
+
+ #print start
+
+ keys=self.barFromHash(hash,start=start)
+
+
+ return keys
+
+ def navElements(self,order):
+ """n-te Ordnung"""
+
+ hash=self.createNavHash(order)
actual_url=self.REQUEST['URL']
ult_temp=re.sub(self.absolute_url(),"",actual_url)
@@ -406,7 +802,10 @@ class ECHO_navigation(Folder):
## else:
## start=[splitted[len(splitted)-1]]
- start=[splitted[2]]
+ #start=splitted[2:order+1] #orig
+ startNr= self.startOfHierarchy(splitted)
+ #print startNr
+ start=splitted[startNr:order+startNr-1]
#print start
keys=self.barFromHash(hash,start=start)
@@ -440,12 +839,12 @@ class ECHO_navigation(Folder):
return keys
-def manage_AddECHO_navigationForm(self):
+def manage_addECHO_navigationForm(self):
"""Form for adding"""
- pt=PageTemplateFile('Products/ECHO_content/AddECHO_navigation.zpt').__of__(self)
+ pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_navigation.zpt').__of__(self)
return pt()
-def manage_AddECHO_navigation(self,id,title,pathToHierarchy,RESPONSE=None):
+def manage_addECHO_navigation(self,id,title,pathToHierarchy,RESPONSE=None):
"""Add an ECHO_root"""
self._setObject(id,ECHO_navigation(id,title,pathToHierarchy))
@@ -464,6 +863,7 @@ def createPath(url1,url2):
if temp2[0]==test:
del temp2[0]
+ #print "CP:"+url1+"::"+url2+"::"+url1+"/"+string.join(temp2,"/")
return url1+"/"+string.join(temp2,"/")
def sortWeight(x,y):