--- ECHO_content/ECHO_Nav.py 2005/12/13 12:45:21 1.69 +++ ECHO_content/ECHO_Nav.py 2008/08/21 07:44:56 1.82 @@ -29,14 +29,20 @@ from Products.PageTemplates.ZopePageTemp import os.path import urllib -from ECHO_helpers import displayTypes,checkOnlyOneInGroup +from ECHO_helpers import displayTypes,checkOnlyOneInGroup,unicodify from ECHO_collection import content_html -import zLOG +import logging + +#def ersetzt logging +def logger(txt,method,txt2): + """logging""" + logging.info(txt+ txt2) + try: from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder except: - zLOG.LOG('ECHO_Nav',zLOG.INFO,'ZSQLSimpleSearch not supported') + logger('ECHO_Nav',logging.INFO,'ZSQLSimpleSearch not supported') @@ -96,7 +102,14 @@ class ECHO_ZCatalogElement(SimpleItem): if RESPONSE is not None: RESPONSE.redirect('manage_main') def getKeywordList(self): - return getattr(self,self.catalogId).uniqueValuesFor(self.field) + try: + return getattr(self,self.catalogId).uniqueValuesFor(self.field) + except: + #return getattr(self,self.catalogId).query(self.field) + + list= [x for x in getattr(getattr(self,self.catalogId),self.field).words()] + list.sort() + return list def getNavList(self): """ausgabe der treffer list fuer navigation""" @@ -266,22 +279,22 @@ class ECHO_sqlElement(SimpleItem): try: searchQuery=ZSQLExtendFolder.ZSQLSimpleSearch except: - zLOG.LOG('ECHO_Nav',zLOG.INFO,'ZSQLSimpleSearch not supported') + logger('ECHO_Nav',logging.INFO,'ZSQLSimpleSearch not supported') def getNavList(self): """ausgabe der treffer list fuer navigation""" #naechste schritte sind trial and error, warum geht mal das eine mal das andere 2.3 / 2.4 ?? - + try: - try: - records=self.ZSQLSimpleSearch(query=self.query) - except: - records=self.searchQuery(self.aq_parent,query=self.query) #python 2.4 version (??) + 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(??) + records=self.searchQuery(query=self.query)#python 2.3 version(??) - + if not records: return [] else: @@ -290,6 +303,7 @@ class ECHO_sqlElement(SimpleItem): try: ret.append((getattr(record,self.field),self.baseUrl+urllib.quote(str(getattr(record,self.getSearchField()))))) except: + logger('ECHO_Nav',logging.INFO,"error, search") """notrhing""" return ret @@ -430,6 +444,15 @@ class ECHO_navigation(Folder): """Navigations Element""" meta_type="ECHO_Navigation" management_page_charset="utf-8" + + def getUsername(self): + """get name of user""" + username=str(self.REQUEST['AUTHENTICATED_USER']) + if username=='Anonymous User': + return None + else: + return username + def searchExternalCollection(self,url,simpleSearch): """search external collection via xmlrpc""" server=xmlrpclib.Server(url) @@ -479,14 +502,7 @@ class ECHO_navigation(Folder): def decode(self,str): """decoder""" - if not str: - return "" - if type(str) is StringType: - - return str.decode('utf-8') - else: - - return str + return unicodify(str) def ECHOFormatListStr(self,list,search="\n",replace="
"): """formatiert liste im str""" @@ -609,8 +625,9 @@ class ECHO_navigation(Folder): # 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) @@ -670,11 +687,11 @@ class ECHO_navigation(Folder): #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") or (temp[x][1].meta_type=="ECHO_ZCatalogElement"): - + for z in temp[x][1].getNavList(): listNav.append((z[0],z[1],None,'','')) @@ -682,10 +699,14 @@ class ECHO_navigation(Folder): # add label falls existiert und nicht leer if hasattr(temp[x][1],'label'): - if not temp[x][1].label=='': + if not temp[x][1].getLabel()=='': label=temp[x][1].getLabel() else: - label=temp[x][1].getTitle() + try: + label=temp[x][1].getTitle() + except: + logger("ECHO_Nav",logging.ERROR,"%s has neither getLabel nor getTile implemented"%temp[x][1].getId()) + label="" else: label=temp[x][1].getTitle() @@ -730,9 +751,11 @@ class ECHO_navigation(Folder): """test is path is already selected""" testStr=re.sub("/index_html",'',self.REQUEST.get('URL','')) - + + if len(item)<2: + return 0 #falls exakte Übereinstimmung dann immer 1 - if (testStr==item[1]) and (self.REQUEST.get('QUERY_STRING','')==''): + if (testStr==item[1]) and (self.REQUEST.get('QUERY_STRING','')==''): return 1 @@ -836,7 +859,7 @@ class ECHO_navigation(Folder): #except: # keys="" - + return keys def numberOfMainNavElements(self): @@ -854,11 +877,27 @@ class ECHO_navigation(Folder): nr=0 return nr+1 + def subNavStatic(self,obj): + """subnav" von self""" + def sortWeight(x,y): + x1=int(getattr(x[1],'weight','0')) + y1=int(getattr(y[1],'weight','0')) + return cmp(x1,y1) + print "obj",obj + subs=self.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes) + subret=[] + + for x in subs: + if not(x[1].title==""): + subret.append(x) + subret.sort(sortWeight) + return subret + def secondNavElements(self): """Zweite Ordnung Navigationselemente""" hash=self.createNavHash(2,checkOnly="no") - + actual_url=self.REQUEST['URL'] ult_temp=re.sub(self.absolute_url(),"",actual_url) @@ -955,10 +994,11 @@ def createPath(self,url1,url2): if self.REQUEST.has_key('VirtualRootPhysicalPath'): vp="/".join(self.REQUEST['VirtualRootPhysicalPath']) - if vp[0]=="/": - vp=vp[1:] + if (len(vp)>0): + if vp[0]=="/": + vp=vp[1:] - url2=url2.replace(vp+"/",'') + url2=url2.replace(vp+"/",'') else: temp1=url1.split("/") temp2=url2.split("/")