--- ECHO_content/ECHO_collection.py	2005/02/24 22:59:20	1.213
+++ ECHO_content/ECHO_collection.py	2005/02/28 20:02:08	1.216
@@ -1,3 +1,4 @@
+
 """New version of the product started February, 8th. Without scientific classification, use content-type for further classification."""
 """Echo collection provides the classes for the ECHO content web-site.
 
@@ -212,7 +213,7 @@ class ECHO_fullText(ZopePageTemplate,ECH
 	def getPage(self,nr='1'):
 		"""get page n"""
 		#return self().encode('latin-1','ignore')
-		dom=xml.dom.minidom.parseString(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()
@@ -561,7 +562,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()
 	
@@ -1411,7 +1412,7 @@ def manage_addECHO_linkForm(self):
         return pt()
 
 
-def manage_addECHO_link(self,id,title,label,description,contentType,responsible,link,weight,coords=None,credits=None,RESPONSE=None):
+def manage_addECHO_link(self,id,title,label,description="",contentType="",responsible="",link="",weight="",coords=[],credits=None,RESPONSE=None):
     """Add an external Link"""
 
     newObj=ECHO_link(id,link,title,label,description,contentType,responsible,credits,weight,coords)
@@ -1870,7 +1871,7 @@ class ECHO_collection(Folder, Persistent
 	return ECHO_rerenderLinksMD(self,obj,types)
 
 	
-    def __init__(self,id,title,label,description,contentType,responsible,credits,weight,sortfield,coords,secondaryLinkTitle,secondaryLink,imageTag="",bgcolour=""):
+    def __init__(self,id,title,label,description="",contentType="",responsible="",credits="",weight="",sortfield="",coords=[],secondaryLinkTitle="",secondaryLink="",imageTag="",bgcolour=""):
 
         self.id = id
         """Festlegen der ID"""
@@ -2899,7 +2900,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)