--- ECHO_content/ECHO_collection.py 2005/07/29 11:17:08 1.231 +++ ECHO_content/ECHO_collection.py 2005/08/19 07:53:16 1.233 @@ -1509,12 +1509,13 @@ class ECHO_collection(Folder, Persistent def localizeObjects(self): """localize all objects""" - contents=self.ZopeFind(self,obj_metatypes=['ECHO_link','ECHO_mapText']) + contents=self.ZopeFind(self,obj_metatypes=['ECHO_externalLink','ECHO_link','ECHO_mapText']) + find=self.ZopeFind(self,obj_ids=('locale_en')) if not find: self.manage_addECHO_locale("en",'','') for content in contents: - if content[1].meta_type=='ECHO_link': + if content[1].meta_type in['ECHO_link','ECHO_externalLink']: find=content[1].ZopeFind(content[1],obj_metatypes=('ECHO_mapText')) if find: root=find[0][1] @@ -3119,13 +3120,14 @@ class ECHO_root(Folder,Persistent,Implic #str= dom.toxml('utf-8') buf = cStringIO.StringIO() - PrettyPrint(dom, stream=buf, encoding='UTF-8') + PrettyPrint(dom, stream=buf) str = buf.getvalue() buf.close() #str=PrettyPrint(dom.documentElement,encoding='UTF-8') #print link.toxml('utf-8') #print type(str) retStr=regexpPage.search(str) + try: # hack warum fehtl manchmal page?? return retStr.group(1) except: @@ -3142,7 +3144,7 @@ class ECHO_root(Folder,Persistent,Implic except: """nothing""" - dbs={'vl_technology':'','vl_people':'','vl_sites':''} + dbs={'vl_technology':'','vl_people':" AND complete='yes'",'vl_sites':''} res=None for db in dbs.keys(): res=res or self.search(var=str("select reference from %s where reference =\'%s\' %s"%(db,ref,dbs[db])))