Changeset 07abe7 in indico

Timestamp:

03/16/11 10:32:00 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

e88004

Parents:

6328a5

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (03/16/11 10:31:23)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (03/16/11 10:32:00)

Message:

[FIX] Once again, CategoryStatistics?

Location:

indico

Files:

• MaKaC/statistics.py (modified) (2 diffs)
• modules/scheduler/tasks.py (modified) (1 diff)

indico/MaKaC/statistics.py

@@ -48 +48 @@
     def updateStatistics(cls, cat, logger=None):
         dbi = DBMgr.getInstance()
+
         cls._updateStatistics(cat, dbi, 0, logger)
         if logger:
             logger.info("Statistics calculation finished")
+
+        dbi.commit()
 
     @classmethod
@@ -92 +95 @@
     def _updateStatistics(cls, cat, dbi, level=0, logger=None):
 
-        statistics = cat.getStatistics()
-        statistics["events"] = {}
-        statistics["contributions"] = {}
-        statistics["resources"] = 0
+        stats = cat.getStatistics()
+        stats["events"] = {}
+        stats["contributions"] = {}
+        stats["resources"] = 0
 
         if len(cat.getSubCategoryList()) > 0:
-            for cat in cat.getSubCategoryList():
-                cat._p_changed = 1
-
+            for scat in cat.getSubCategoryList():
                 # only at top level
                 if level == 0 and logger:
-                    logger.info("Processing '%s' (%s)" % (cat.getTitle(),
-                                                          cat.getId()))
+                    logger.info("Processing '%s' (%s)" % (scat.getTitle(),
+                                                          scat.getId()))
 
-                cls._updateStatistics(cat, dbi, level + 1, logger)
-                # commit after each category
-                dbi.commit()
+                cls._updateStatistics(scat, dbi, level + 1, logger)
 
-                for year in cat._statistics["events"]:
-                    if year in statistics["events"]:
-                        statistics["events"][year] += cat._statistics["events"][year]
+                for year in scat._statistics["events"]:
+                    if year in stats["events"]:
+                        stats["events"][year] += scat._statistics["events"][year]
                     else:
-                        statistics["events"][year] = cat._statistics["events"][year]
-                for year in cat._statistics["contributions"]:
-                    if year in statistics["contributions"]:
-                        statistics["contributions"][year] += cat._statistics["contributions"][year]
+                        stats["events"][year] = scat._statistics["events"][year]
+                for year in scat._statistics["contributions"]:
+                    if year in stats["contributions"]:
+                        stats["contributions"][year] += scat._statistics["contributions"][year]
                     else:
-                        statistics["contributions"][year] = cat._statistics["contributions"][year]
-                statistics["resources"] += cat._statistics["resources"]
+                        stats["contributions"][year] = scat._statistics["contributions"][year]
+                stats["resources"] += scat._statistics["resources"]
 
         elif len(cat.getConferenceList()) > 0:
             for event in cat.getConferenceList():
-                cls._processEvent(dbi, event, statistics)
+                cls._processEvent(dbi, event, stats)
 
-        statistics["updated"] = nowutc()
-        cat._statistics = statistics
+        stats["updated"] = nowutc()
+        cat._statistics = stats
         cat._p_changed = 1
-        return statistics
+
+        dbi.commit()
+
+        if level == 1:
+            logger.info("%s : %s" % (cat.getId(), cat._statistics))
+
+        return stats

indico/modules/scheduler/tasks.py

@@ -326 +326 @@
         from MaKaC.statistics import CategoryStatistics
         CategoryStatistics.updateStatistics(self._cat,
-                                            self._v_logger)
+                                            self.getLogger())