--- ECHO_content/ECHO_collection.py 2005/02/07 19:40:37 1.210 +++ ECHO_content/ECHO_collection.py 2005/02/24 22:59:20 1.213 @@ -153,8 +153,7 @@ class ECHO_layoutTemplate(ZopePageTempla self.ZBindings_edit(self._default_bindings) if text is None: - self._default_content_fn = os.path.join(package_home(globals()), - 'zpt/ECHO_%s_template_standard.zpt'%EchoType) + self._default_content_fn = os.path.join(package_home(globals()),'zpt','ECHO_%s_template_standard.zpt'%EchoType) text = open(self._default_content_fn).read() self.pt_edit(text, content_type) @@ -212,10 +211,11 @@ class ECHO_fullText(ZopePageTemplate,ECH def getPage(self,nr='1'): """get page n""" - dom=xml.dom.minidom.parseString(self()) + #return self().encode('latin-1','ignore') + dom=xml.dom.minidom.parseString(self().encode('latin-1','ignore')) pages=dom.getElementsByTagName('page') - return pages[int(nr)-1].toxml('utf-8') + return pages[int(nr)-1].toxml() # Product registration and Add support manage_addECHO_fullTextForm = PageTemplateFile( @@ -2036,7 +2036,7 @@ class ECHO_collection(Folder, Persistent """Give list of coordinates""" mapColTypes=['ECHO_collection','ECHO_resource'] areas=[] - for entry in self.getSubCols(self,subColTypes=mapColTypes): + for entry in self.getSubCols(subColTypes=mapColTypes): object=entry areas.extend(object.getMapAreas()) return areas