--- ECHO_content/ECHO_collection.py 2005/02/10 16:17:52 1.212 +++ ECHO_content/ECHO_collection.py 2005/02/28 14:09:55 1.215 @@ -211,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('utf-8','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( @@ -560,7 +561,7 @@ class ECHO_resource(Folder,Persistent,EC startpage=self.createImageUrl() params="startpage=%s"%startpage - print 'http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params)) + #print 'http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params)) ECHO_helpers.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))).read() @@ -2898,7 +2899,7 @@ class ECHO_root(Folder,Persistent,Implic if self.checkRef(ref): if pn: - link.setAttribute("href",self.aq_parent.absolute_url()+"/references?id="+ref+"&p="+pn) + link.setAttribute("href",self.aq_parent.absolute_url()+"/references?id="+ref+"&page="+pn) else: link.setAttribute("href",self.aq_parent.absolute_url()+"/references?id="+ref)