--- ECHO_content/ECHO_Nav.py 2006/03/02 19:59:03 1.74 +++ ECHO_content/ECHO_Nav.py 2012/01/18 16:57:00 1.84.2.1 @@ -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) + +STORAGEMANAGER_URL_DEFAULT = "http://storage-web.mpiwg-berlin.mpg.de/storage/storeOnline?path=" 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') @@ -273,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: @@ -297,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 @@ -495,16 +502,7 @@ class ECHO_navigation(Folder): def decode(self,str): """decoder""" - if not str: - return "" - if type(str) is StringType: - try: - return str.decode('utf-8') - except: - return str.decode('latin-1') - else: - - return str + return unicodify(str) def ECHOFormatListStr(self,list,search="\n",replace="
"): """formatiert liste im str""" @@ -581,17 +579,20 @@ class ECHO_navigation(Folder): ) displayedMetaTypes=displayTypes + def getStorageManagerURL(self): + """returns the URL to the storagemanager""" + return getattr(self,"storageManagerURL",STORAGEMANAGER_URL_DEFAULT) def ECHO_navigationConfigForm(self): """configForm""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeECHO_navigation.zpt')).__of__(self) return pt() - def ECHO_navigationConfig(self,title,pathToHierarchy,displayedMetaTypes=displayTypes,RESPONSE=None): + def ECHO_navigationConfig(self,title,pathToHierarchy,storageManagerURL="",displayedMetaTypes=displayTypes,RESPONSE=None): """config""" self.title=title self.pathToHierarchy=pathToHierarchy self.displayedMetaTypes=toList(displayedMetaTypes)[0:] - + self.storageManagerURL=storageManagerURL if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -627,8 +628,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) @@ -688,11 +690,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,'','')) @@ -706,7 +708,7 @@ class ECHO_navigation(Folder): try: label=temp[x][1].getTitle() except: - zLOG.LOG("ECHO_Nav",zLOG.ERROR,"%s has neither getLabel nor getTile implemented"%temp[x][1].getId()) + logger("ECHO_Nav",logging.ERROR,"%s has neither getLabel nor getTile implemented"%temp[x][1].getId()) label="" else: label=temp[x][1].getTitle() @@ -755,7 +757,7 @@ class ECHO_navigation(Folder): if len(item)<2: return 0 - #falls exakte Übereinstimmung dann immer 1 + #falls exakte Uebereinstimmung dann immer 1 if (testStr==item[1]) and (self.REQUEST.get('QUERY_STRING','')==''): return 1 @@ -798,7 +800,15 @@ class ECHO_navigation(Folder): else: return style - + def getHierCrumbs(self): + """returns a list of hierarchical breadcrumbs from self to the ECHO_root""" + # crumb for this object + crumb = {'obj': self, + 'url': self.absolute_url(), + 'label': self.get('label','Home')} + crumbs = [crumb] + return crumbs + def buttonsFromHash(self,hash,start=None,orientation="horizontal"): """Generate Buttons""" @@ -878,11 +888,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) @@ -979,10 +1005,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("/")