--- ECHO_content/ECHO_Nav.py 2005/08/04 17:42:07 1.57 +++ ECHO_content/ECHO_Nav.py 2007/01/31 14:12:38 1.79 @@ -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 * @@ -32,12 +31,18 @@ import os.path import urllib from ECHO_helpers import displayTypes,checkOnlyOneInGroup 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') @@ -97,19 +102,28 @@ 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 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 +140,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') @@ -264,14 +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 für navigation""" + """ausgabe der treffer list fuer navigation""" - records=self.searchQuery() + #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 (??) + except: + records=self.searchQuery(query=self.query)#python 2.3 version(??) - + if not records: return [] else: @@ -280,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 @@ -314,10 +338,16 @@ class ECHO_pageTemplate(ZopePageTemplate 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""" @@ -413,6 +443,50 @@ def manage_addECHO_pageTemplate(self, id 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) + + results=server.getSubcolsXMLRpc(simpleSearch) + + return results + + def getXMLRpcConnection(self,url): + """getxmlrpc""" + if not hasattr(self,"_v_server"): + self._v_server=[] + + server=xmlrpclib.Server(url) + self._v_server.append(server) + + return len(self._v_server)-1 + + def getXMLRpcMethod(self,nr,method,compressed=None): + """getmethod""" + + ret= eval('self._v_server[%i].%s'%(nr,method)) + if compressed: + ret=decodeRPC(ret) + return ret + + 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""" @@ -430,47 +504,48 @@ class ECHO_navigation(Folder): """decoder""" if not str: return "" - if type(str)==StringType: + if type(str) is StringType: + try: + return str.decode('utf-8') + except: + return str.decode('latin-1') + else: return str - else: - try: - return str.encode('utf-8') - except: - 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""" @@ -478,10 +553,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) @@ -497,8 +571,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""" @@ -560,8 +634,9 @@ class ECHO_navigation(Folder): # if not generate new hash obj=objtemp - + for keys in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes): + logging.info("createNavHash: %s"%repr(keys)) x=keys[1] if depth>1: nav[x.getId()]=(self.getColls(x,int(depth)-1,checkOnly),x) @@ -584,7 +659,7 @@ class ECHO_navigation(Folder): def barFromHash(self,hash,start=None,sortField=None,location=None): """Erzeuge Navigations Element""" - #print "hash",hash + listNav=[] if not start: temp=hash @@ -596,7 +671,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 @@ -621,11 +696,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,'','')) @@ -633,24 +708,29 @@ class ECHO_navigation(Folder): # add label falls existiert und nicht leer if hasattr(temp[x][1],'label'): - if not temp[x][1].label=='': - try: + if not temp[x][1].getLabel()=='': label=temp[x][1].getLabel() - except: - label=temp[x][1].label else: - label=temp[x][1].title.encode('utf-8') + 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].title.encode('utf-8') - + label=temp[x][1].getTitle() + + 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"): @@ -680,9 +760,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 @@ -717,12 +799,12 @@ class ECHO_navigation(Folder): def getPathStyle(self, item, style=""): - """returns a string with the given style + 'sel' if the path is already selected.""" + """returns a string with the given style + 'sel' if the path is already selected.""" - if self.isSelectedPath(item): - return style + 'sel' - else: - return style + if self.isSelectedPath(item): + return style + 'sel' + else: + return style def buttonsFromHash(self,hash,start=None,orientation="horizontal"): @@ -751,8 +833,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 @@ -785,13 +868,13 @@ class ECHO_navigation(Folder): #except: # keys="" - + 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("/") @@ -803,10 +886,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") + logging.info("secondNavElements %s"%repr(hash)) actual_url=self.REQUEST['URL'] ult_temp=re.sub(self.absolute_url(),"",actual_url) @@ -814,14 +914,14 @@ 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) @@ -847,7 +947,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) @@ -898,15 +998,26 @@ 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: +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 (len(vp)>0): + if vp[0]=="/": + vp=vp[1:] + + url2=url2.replace(vp+"/",'') + else: + 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,"/") + + url2= string.join(temp2,"/") + + return url1+"/"+url2 def sortWeight(x,y): #print x[1],y[1]