--- ECHO_content/ECHO_collection.py	2011/10/13 07:48:27	1.310.2.1
+++ ECHO_content/ECHO_collection.py	2012/01/19 19:03:28	1.310.2.6
@@ -36,6 +36,8 @@ from Globals import Persistent, package_
 from Acquisition import Implicit
 from Products.ZCatalog.CatalogPathAwareness import CatalogAware
 from Products.ZCTextIndex.ZCTextIndex import manage_addLexicon
+import ECHO_helpers
+from Acquisition import aq_parent
 try:
 	from Products.MetaDataProvider.MetaDataClient import MetaDataClient
 except:
@@ -693,6 +695,8 @@ class ECHO_collection(CatalogAware, Fold
     meta_type='ECHO_collection'
     default_catalog='resourceCatalog'
     
+    rootMetaTypes = ['ECHO_root', 'ECHO_main', 'ECHO_nav']
+    
 #    viewClassificationList=viewClassificationListMaster
     displayTypes=displayTypes
 
@@ -705,12 +709,11 @@ class ECHO_collection(CatalogAware, Fold
             return crumbs[0][2].getId()
     
         p = self
-      
         sec = None
         # descend parents to the root (and remember the last id)
-        while p is not None and p.meta_type != 'ECHO_root' and p.meta_type!='ECHO_main' and p.meta_type!='ECHO_nav':
+        while p is not None and p.meta_type not in self.rootMetaTypes:
             sec = p.getId()
-            p = p.aq_parent
+            p = aq_parent(p.context)
      
         return sec
     
@@ -724,12 +727,21 @@ class ECHO_collection(CatalogAware, Fold
         sec = None
         subsec = None
         # descend parents to the root (and remember the last id)
-        while p is not None and p.meta_type != 'ECHO_root' and p.meta_type!='ECHO_main' and p.meta_type!='ECHO_nav':
+        while p is not None and p.meta_type not in self.rootMetaTypes:
             subsec = sec
             sec = p.getId()
-            p = p.aq_parent
+            p = aq_parent(p.context)
           
         return subsec
+    
+    
+    def getCrumb(self):
+        """returns breadcrumb for this object"""
+        return ECHO_helpers.getCrumb(self)
+
+    def getHierCrumbs(self):
+        """returns a list of hierarchical breadcrumbs from self to the ECHO_root"""
+        return ECHO_helpers.getHierCrumbs(self)
 
     
     def exportImportObjects_html(self,RESPONSE):
@@ -1130,20 +1142,7 @@ class ECHO_collection(CatalogAware, Fold
         if RESPONSE is not None:
                     RESPONSE.write("<p>Done</p></body></html>")
 
-    def changeViewerTemplateSets(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix,RESPONSE=None):
-            """change the templates"""
-
-            resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
-
-            for resource in resources:
-
-                    resource[1].changeViewerTemplateSet(project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix)
-
-            if RESPONSE is not None:
-                    RESPONSE.redirect('manage_main')
-
-
-
+ 
 
     def copyTitleToInfoXMLFolder(self,RESPONSE=None):
             """copy title into the title field of info.xml
@@ -1471,8 +1470,15 @@ class ECHO_collection(CatalogAware, Fold
     
     def showOverview(self):
         """overview"""
-        if 'ECHO_overview.html' in self.__dict__.keys():
-            return getattr(self,'ECHO_overview.html')()
+        # use ECHO_overview.html template in this instance
+        if 'ECHO_overview.html' in self:
+            return self['ECHO_overview.html']()
+        
+        # use ECHO_overview_main template in path
+        if hasattr(self, 'ECHO_overview_main'):
+            return getattr(self, 'ECHO_overview_main')()
+        
+        # use template from Product
         pt=zptFile(self, 'zpt/ECHO_content_overview.zpt')
         return pt()
 
@@ -1481,23 +1487,35 @@ class ECHO_collection(CatalogAware, Fold
     def index_html(self):
         """standard page"""
         if self.ZCacheable_isCachingEnabled():
-            
             result = self.ZCacheable_get()
             if result is not None:
                 # Got a cached value.
                 return result
-        
-        if 'index.html' in self.__dict__.keys():
-            ret=getattr(self,'index.html')()
-        
-        elif 'overview' in self.__dict__.keys():
+            
+        # old Zope 2.9 method
+        #if 'index.html' in self.__dict__.keys():
+        #    ret=getattr(self,'index.html')()
+
+        # use Zope 2.12 IContainer for child access
+        if 'index.html' in self:
+            # use index.html template if it exists
+            ret = self['index.html']()
+            
+        elif 'overview' in self:
+            # use red-rectangle template when there's an 'overview'
             ret=self.showOverview()
+
+        # use getattr for acquisition
         elif hasattr(self,'collection_index_template'):
-            ret=self.collection_index_template()    
+            # use 'collection_index_template' in acquisition path
+            ret=self.collection_index_template()
+            
         elif hasattr(self,'main_index_template'):
-
+            # use 'main_index_template' in acquisition path
             ret=self.main_index_template.__of__(self)(self.main_template)
+            
         else:
+            # use template from Product
             pt=zptFile(self, 'zpt/ECHO_main_index_template_standard.zpt')
             pt.content_type="text/html"
             ret=pt.render()
@@ -1526,8 +1544,8 @@ class ECHO_collection(CatalogAware, Fold
 
     def area_img(self):
         """area image"""
-        bt = BrowserCheck(self)
-        if bt.isIE or bt.isN4:
+        bt = browserType(self)
+        if bt['isIE'] or bt['isN4']:
             return sendFile(self, 'images/red.gif', 'image/gif')
         else:
             return sendFile(self, 'images/reda.png', 'image/png')
@@ -1900,9 +1918,11 @@ class ECHO_root(Folder,Persistent,Implic
     
     def getECHORoot(self):
         return self
-    
 
-   
+    def getBrowserType(self):
+        """returns browserType object"""
+        return browserType(self)
+    
     def mod_re_sub(self,pattern,replace,string):
         """re.sub aus mod re zur Verfuegung stellen"""
         return re.sub(pattern,replace,string)