Log message for revision 115010: Some style fixes, simplify code, as _getSortInfo isn't implemented
Changed: U Zope/branches/andig-catalog-report/src/Products/ZCatalog/ZCatalog.py -=- Modified: Zope/branches/andig-catalog-report/src/Products/ZCatalog/ZCatalog.py =================================================================== --- Zope/branches/andig-catalog-report/src/Products/ZCatalog/ZCatalog.py 2010-07-24 14:37:20 UTC (rev 115009) +++ Zope/branches/andig-catalog-report/src/Products/ZCatalog/ZCatalog.py 2010-07-24 14:47:25 UTC (rev 115010) @@ -163,7 +163,6 @@ manage_objectInformation = DTMLFile('dtml/catalogObjectInformation', globals()) - Indexes = ZCatalogIndexes() threshold=10000 @@ -192,7 +191,7 @@ self._catalog = Catalog() self._migrated_280 = True - self.long_query_time = 0.1 + self.long_query_time = 0.1 # in seconds def __len__(self): # Perform a migration of _catalog.__len__ to _catalog._length @@ -1013,26 +1012,21 @@ # # Catalog report methods # - + security.declareProtected(manage_zcatalog_entries, 'getCatalogReport') def getCatalogReport(self): """ Reports about the duration of queries """ - - - #sort_by, sort_reverse = self._getSortInfo() - sort_by, sort_reverse = ('duration',True) rval = self._catalog.getCatalogReport().report() - - if sort_by: - rval.sort(lambda e1, e2, sort_by=sort_by: - cmp(e1[sort_by], e2[sort_by])) - if sort_reverse: - rval.reverse() + sort_by = 'duration' + rval.sort(lambda e1, e2, sort_by=sort_by: + cmp(e1[sort_by], e2[sort_by])) + rval.reverse() return rval - security.declareProtected(manage_zcatalog_entries, 'manage_resetCatalogReport') - def manage_resetCatalogReport(self,REQUEST=None, RESPONSE=None, URL1=None): + security.declareProtected(manage_zcatalog_entries, + 'manage_resetCatalogReport') + def manage_resetCatalogReport(self, REQUEST=None, RESPONSE=None, URL1=None): """ resets the catalog reports """ self._catalog.getCatalogReport().reset() _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins