--- ECHO_content/ECHO_Nav.py 2004/02/03 17:31:16 1.4 +++ ECHO_content/ECHO_Nav.py 2004/03/16 10:20:58 1.7 @@ -17,19 +17,30 @@ class ECHO_sqlElement(SimpleItem): meta_type="ECHO_sqlElement" baseUrl="" - def __init__(self,id,title,query,field,baseUrl,weight): + def __init__(self,id,title,query,field,searchField,baseUrl,weight,content_type): """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=content_type 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,21 +48,31 @@ class ECHO_sqlElement(SimpleItem): else: return 0 + def getContent_type(self): + """get weight""" + + if hasattr(self,'content_type'): + return self.content_type + 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,content_type,RESPONSE=None): """change""" self.title=title self.query=query self.field=field + self.searchField=searchField self.baseUrl=baseUrl self.weight=weight - + self.content_type=content_type + if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -66,18 +87,22 @@ class ECHO_sqlElement(SimpleItem): 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,content_type,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,content_type)) if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -88,20 +113,21 @@ 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':'Weight and Type','action':'changeECHO_pageTemplateWeightForm'}, ) def changeECHO_pageTemplateWeightForm(self): """change""" - pt=PageTemplateFile('Products/ECHO_content/ChangeECHO_pageTemplateWeight.zpt').__of__(self) + pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_pageTemplateWeight.zpt').__of__(self) return pt() - def changeECHO_pageTemplateWeight(self,weight,RESPONSE=None): + def changeECHO_pageTemplateWeight(self,weight,content_type,RESPONSE=None): """change""" self.weight=weight + self.content_type=content_type if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -112,6 +138,14 @@ class ECHO_pageTemplate(ZopePageTemplate return self.weight else: return 0 + + def getContent_Type(self): + """get weight""" + if hasattr(self,'weight'): + return self.weight + else: + return 0 + @@ -122,15 +156,15 @@ class ECHO_pageTemplate(ZopePageTemplate ## text = open(self._default_cont).read() ## self.pt_edit(text, content_type) -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, weight= 0,content_type=0,title=None, text=None, REQUEST=None, submit=None): "Add a Page Template with optional file content." @@ -140,6 +174,7 @@ def manage_AddECHO_pageTemplate(self, id self._setObject(id, ECHO_pageTemplate(id, text)) ob = getattr(self, id) setattr(ob,'weight',weight) + setattr(ob,'content_type',content_type) if title: ob.pt_setTitle(title) return ob @@ -170,7 +205,7 @@ class ECHO_navigation(Folder): """Navigations Element""" meta_type="ECHO_Navigation" - displayedMetaTypes=['ECHO_collection','ECHO_pageTemplate','ZSQLExtendFolder','ECHO_sqlElement'] + displayedMetaTypes=['ImageCollectionIFrame','ECHO_collection','ECHO_pageTemplate','ZSQLExtendFolder','ECHO_sqlElement','ECHO_resource','ECHO_externalLink'] def __init__(self,id,title,pathToHierarchy): """init""" @@ -184,7 +219,7 @@ class ECHO_navigation(Folder): 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): @@ -232,6 +267,7 @@ class ECHO_navigation(Folder): 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: @@ -241,26 +277,63 @@ class ECHO_navigation(Folder): #print nav return nav - def barFromHash(self,hash,start=None): + def barFromHash(self,hash,start=None,sortField=None): """Erzeuge Navigations Element""" #print "hash",hash listNav=[] if not start: temp=hash + sortField="weight" else: # list mit pfad zum hash temp=hash + #print "HI",sortField + if not sortField: + tempObj=self.pathToHierarchy[0:] + tempObj=re.sub("/",".",tempObj) + tempObj="self.aq_parent"+tempObj + + objtemp=eval(tempObj) + + obj=objtemp + + for x in start: + #print "OBJ",start,obj,obj.getId(),x + + obj=getattr(obj,x) + + if hasattr(obj,'sortfield'): + sortField=obj.sortfield + else: + sortField='weight' + #print "START",start for x in start: - temp=temp[x][0] - - for x in self.tempSorted(temp): + #print "N2",x,temp[x] + try: + temp=temp[x][0] + except: + """nothing""" + return [] + #print "TEMP",temp,self.tempSorted(temp, field=sortField) + print "HELL",sortField + for x in self.tempSorted(temp, field=sortField): if not temp[x][1].title == "": if temp[x][1].meta_type=="ECHO_sqlElement": for z in temp[x][1].getNavList(): listNav.append((z[0],z[1])) else: - listNav.append((temp[x][1].title,createPath(self.absolute_url(),temp[x][1].absolute_url()))) + # add label fals existiert und nicht leer + if hasattr(temp[x][1],'label'): + if not temp[x][1].label=='': + label=temp[x][1].label + print "HAS LABEL",label + else: + label=temp[x][1].title + else: + label=temp[x][1].title - + listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url()))) + + #print self.getId(),start #print listNav #html="" @@ -270,12 +343,13 @@ class ECHO_navigation(Folder): return listNav - def tempSorted(self,hash): + def tempSorted(self,hash,field="weight"): ls=[] + print "SORT",field for x in hash.keys(): #print hash[x][1] - if hasattr(hash[x][1],'weight'): - weight=hash[x][1].weight + if hasattr(hash[x][1],field): + weight=getattr(hash[x][1],field) #print weight else: weight=0 @@ -327,7 +401,7 @@ class ECHO_navigation(Folder): temp=temp[x][0] #print temp - for key in temp.keys(): + for key in self.tempSorted(temp): description=temp[x][1].title @@ -346,6 +420,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: @@ -356,12 +431,13 @@ class ECHO_navigation(Folder): def mainNavElements(self): """print main navigation bar""" keys="" + print "NAVELEMENT",self.getId() + #try: + + keys=self.barFromHash(self.createNavHash(0)) - try: - keys=self.barFromHash(self.createNavHash(0)) - - except: - keys="" + #except: + # keys="" return keys @@ -384,7 +460,32 @@ class ECHO_navigation(Folder): start=[splitted[2]] #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) + #print ult_temp + + splitted=ult_temp.split("/") + + + ## if splitted[len(splitted)-1]=="index_html": +## start=[splitted[len(splitted)-2]] +## else: +## start=[splitted[len(splitted)-1]] + + start=splitted[2:order+1] + #print start + keys=self.barFromHash(hash,start=start) @@ -416,12 +517,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))