--- ECHO_content/ECHO_Nav.py 2005/10/26 16:42:51 1.62 +++ ECHO_content/ECHO_Nav.py 2006/02/13 16:41:49 1.73 @@ -96,19 +96,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))) @@ -125,9 +134,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') @@ -426,7 +436,33 @@ def manage_addECHO_pageTemplate(self, id class ECHO_navigation(Folder): """Navigations Element""" meta_type="ECHO_Navigation" - + management_page_charset="utf-8" + 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'): @@ -452,14 +488,15 @@ 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: @@ -605,7 +642,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 @@ -654,24 +691,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: + zLOG.LOG("ECHO_Nav",zLOG.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"): @@ -701,9 +743,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 @@ -772,8 +816,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 @@ -806,7 +851,7 @@ class ECHO_navigation(Folder): #except: # keys="" - + return keys def numberOfMainNavElements(self): @@ -828,6 +873,7 @@ class ECHO_navigation(Folder): """Zweite Ordnung Navigationselemente""" hash=self.createNavHash(2,checkOnly="no") + actual_url=self.REQUEST['URL'] ult_temp=re.sub(self.absolute_url(),"",actual_url) @@ -842,7 +888,7 @@ class ECHO_navigation(Folder): start=[splitted[startNr]] #print start - + keys=self.barFromHash(hash,start=start) @@ -919,15 +965,25 @@ 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 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]