--- MPIWGWeb/MPIWGStaff.py 2012/01/03 09:26:45 1.10.2.78 +++ MPIWGWeb/MPIWGStaff.py 2012/01/09 10:36:48 1.10.2.80 @@ -99,6 +99,9 @@ class MPIWGStaff(CatalogAware,ZSQLExtend def getKeyUTF8(self): """get db_key utf8""" + logging.debug("KEY - MPIWGStaff:"+self.getKey()) + logging.debug("KEY - MPIWGStaff:"+utf8ify(self.getKey())) + return utf8ify(self.getKey()) def setKey(self,key): @@ -355,15 +358,23 @@ class MPIWGStaff(CatalogAware,ZSQLExtend return pt() - def harvest_page(self): + def harvest_page(self,mode="normal"): """harvest""" + if not self.isPublished(): - return "" - st = getattr(self.en.staff.members,self.getId()).index_html() - return st + return + st = getattr(self.en.staff.members,self.getId()).index_html(mode) + + templates = self.en.getHarvestCache() + #templates = getattr(self,'getHarvestCache',self.en.getHarvestCache)() + rendered = st + templates[self.absolute_url()]=rendered + + return rendered + - def index_html(self): + def index_html(self,mode="normal"): """show homepage""" bound_names={} @@ -394,7 +405,10 @@ class MPIWGStaff(CatalogAware,ZSQLExtend pt = getattr(self, "index.html") # else use template else: - pt = getTemplate(self, "members_main") + if mode=="slim": + pt = getTemplate(self, "members_main_slim") + else: + pt = getTemplate(self, "members_main") # Execute the template in a new security context. security.addContext(self)