--- ECHO_content/ECHO_collection.py	2004/04/15 13:41:01	1.40
+++ ECHO_content/ECHO_collection.py	2004/04/16 09:45:32	1.41
@@ -34,6 +34,7 @@ import xml.dom.minidom
 import urllib
 import xml.dom.minidom
 from ECHO_graphicalOverview import javaHandler,javaScriptMain
+import ECHO_helpers
 
 #List of different types for the graphical linking viewer
 viewClassificationListMaster=['view point','area']
@@ -264,6 +265,8 @@ class ECHO_resource(Folder):
 
     viewClassificationList=viewClassificationListMaster
 
+    getSubCols = ECHO_helpers.getSubCols
+
     def content_html(self):
         """template fuer content"""
         return content_html(self,'resource')
@@ -812,6 +815,9 @@ class ECHO_collection(Folder, Persistent
 
         return ids
     
+<<<<<<< ECHO_collection.py
+    getSubCols = ECHO_helpers.getSubCols
+=======
     def getSubCols(self,sortfield="weight"):
 
         subColTypes=['ECHO_group','ECHO_collection','ECHO_externalLink','ECHO_resource']
@@ -843,8 +849,6 @@ class ECHO_collection(Folder, Persistent
         tmplist.sort()
         return [x for (key,x) in tmplist]
      
-        
-