--- MPIWGWeb/MPIWGStaff.py	2004/10/01 16:44:36	1.6
+++ MPIWGWeb/MPIWGStaff.py	2005/04/25 17:21:48	1.10
@@ -3,6 +3,7 @@ from OFS.Folder import Folder
 from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate
+from Products.ZCatalog.CatalogPathAwareness import CatalogAware
 import os
 from Globals import package_home
 
@@ -10,17 +11,22 @@ from Globals import package_home
 def getTemplate(self, tpName):
     """get a template file either form the instance or from the product"""
     ext=self.ZopeFind(self.aq_parent,obj_ids=[tpName])
-    
     if ext:
-        return getattr(self,ext[0][1].getId())
-    
-    pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/'+tpName)).__of__(self)
+        pt = getattr(self,ext[0][1].getId())
+    else:
+        pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/'+tpName)).__of__(self)
+    assert(pt)
     return pt
 
-class MPIWGStaff(ZSQLExtendFolder):
+class MPIWGStaff(CatalogAware,ZSQLExtendFolder):
     """Staff"""
 
     meta_type="MPIWGStaff"
+    default_catalog='MembersCatalog'
+    
+    def PrincipiaSearchSource(self):
+        """Return cataloguable key for ourselves."""
+        return str(self)
 
     manage_options = Folder.manage_options+(
         {'label':'Edit','action':'changeMPIWGStaffForm'},
@@ -40,22 +46,22 @@ class MPIWGStaff(ZSQLExtendFolder):
 
     def publications_full(self):
         """show publication"""
-        pt=getTemplate(self, "publications_full")
+        pt=getTemplate(self, "publications_full_main")
         return pt()
 
     def talks_full(self):
         """show talks"""
-        pt=getTemplate(self, 'talks_full')
+        pt=getTemplate(self, 'talks_full_main')
         return pt()
 
     def teaching_full(self):
         """show talks"""
-        pt=getTemplate(self, 'teaching_full')
+        pt=getTemplate(self, 'teaching_full_main')
         return pt()
     
     def changeMPIWGStaffForm(self):
         """change form"""
-        pt=PageTemplateFile('Products/MPIWGWeb/zpt/edit_MPIWGStaff.zpt').__of__(self)
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_MPIWGStaff.zpt')).__of__(self)
         return pt()
 
     def changeMPIWGStaff(self,lastName,firstName,RESPONSE=None):
@@ -71,7 +77,7 @@ class MPIWGStaff(ZSQLExtendFolder):
 
 def manage_addMPIWGStaffForm(self):
     """form for adding the project"""
-    pt=PageTemplateFile('Products/MPIWGWeb/zpt/addMPIWGStaffForm.zpt').__of__(self)
+    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addMPIWGStaffForm.zpt')).__of__(self)
     return pt()
 
 def manage_addMPIWGStaff(self,id,lastName,firstName,RESPONSE=None):