--- ECHO_content/ECHO_collection.py	2005/02/07 18:29:07	1.209
+++ ECHO_content/ECHO_collection.py	2005/02/28 14:09:55	1.215
@@ -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('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(
@@ -561,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()
 	
@@ -655,7 +655,7 @@ class ECHO_resource(Folder,Persistent,EC
 
     
 
-	
+    security.declarePublic('content_html')	
     def content_html(self):
         """template fuer content"""
         return ECHO_basis.content_html(self,'resource')
@@ -1321,7 +1321,7 @@ class ECHO_externalLink(Folder,ECHO_basi
     security=ClassSecurityInfo()
     meta_type='ECHO_externalLink'
 
-
+    security.declarePublic('content_html')
     def content_html(self):
         """template fuer content"""
         return ECHO_basis.content_html(self,'externalLink')
@@ -1397,7 +1397,7 @@ class ECHO_link(ECHO_externalLink):
 
 	meta_type="ECHO_link"
 	
-
+        
 	def content_html(self):
 		"""template fuer link"""
 		if hasattr(self,"link_template"):
@@ -1765,7 +1765,8 @@ class ECHO_collection(Folder, Persistent
 		    ret+="<p>"+label+"</p>"
 		    manage_addECHO_resource(self,id,label.encode('ascii'),label.encode('ascii'),"","","",link.encode('ascii'),"","")
 	    return ret
-    
+        
+    security.declarePublic('getImageTag')
     def getImageTag(self):
         """GetTag"""
         try:
@@ -1990,6 +1991,7 @@ class ECHO_collection(Folder, Persistent
 	self.ZCacheable_set(ret)
         return ret
 
+    security.declarePublic('content_html')
     def content_html(self,**argv):
         """template fuer content"""
 	#print "NN",argv
@@ -2034,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
@@ -2169,6 +2171,7 @@ class ECHO_group(ECHO_collection):
                 except:
                     return "ECHO_groups"
 
+        security.declarePublic('content_html')
 	def content_html(self):
 		"""template fuer content"""
 		return ECHO_basis.content_html(self,'group')
@@ -2350,6 +2353,20 @@ class ECHO_root(Folder,Persistent,Implic
     
     meta_type="ECHO_root"
 
+    def printer(self,txt):
+        print txt
+        print txt[2]
+        print txt[2].getImageTag()
+        print "HO"
+        return txt[2].getImageTag()
+
+    def printer2(self,txt):
+        print txt
+
+
+    def item2(self,txt):
+        return txt[2]
+        
     def getContentOverviewTemplate(self):
 	"""produces overview template with macro"""
 	pt = zptObjectOrFile(self, 'content_overview_template')
@@ -2599,10 +2616,12 @@ class ECHO_root(Folder,Persistent,Implic
 		    return getattr(found,field).decode('ascii','ignore')
 	    except:
 		    return ""
-    
+
+    security.declarePublic('getImageTag')
     def getImageTag(self):
 	    """needed by main_template"""
 	    return ""
+        
     secondaryLink="" #needed by main_template
     secondaryLinkTitle="" #needed by main_template
     
@@ -2880,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)