Changeset 2ea62cb in indico

Timestamp:

04/05/12 17:38:53 (14 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

bce3a4

Parents:

e2a398

Message:

[IMP] Using cjson to speed timetable dumps

Files:

• indico/MaKaC/schedule.py (modified) (4 diffs)
• indico/MaKaC/webinterface/pages/conferences.py (modified) (1 diff)
• indico/util/fossilize/conversion.py (modified) (2 diffs)
• setup.py (modified) (1 diff)

indico/MaKaC/schedule.py

@@ -1421 +1421 @@
         if mgmtMode:
             if isinstance(obj, BreakTimeSchEntry):
-                entry = obj.fossilize(IBreakTimeSchEntryMgmtFossil, useAttrCache = useAttrCache, tz = tz)
+                entry = obj.fossilize(IBreakTimeSchEntryMgmtFossil, useAttrCache = useAttrCache, tz = tz, convert=True)
             elif isinstance(obj, ContribSchEntry):
-                entry = obj.fossilize(IContribSchEntryMgmtFossil, useAttrCache = useAttrCache, tz = tz)
+                entry = obj.fossilize(IContribSchEntryMgmtFossil, useAttrCache = useAttrCache, tz = tz, convert=True)
             elif isinstance(obj, LinkedTimeSchEntry):
-                entry = obj.fossilize(ILinkedTimeSchEntryMgmtFossil, useAttrCache = useAttrCache, tz = tz)
+                entry = obj.fossilize(ILinkedTimeSchEntryMgmtFossil, useAttrCache = useAttrCache, tz = tz, convert=True)
             else:
-                entry = obj.fossilize(useAttrCache = useAttrCache, tz = tz)
+                entry = obj.fossilize(useAttrCache = useAttrCache, tz = tz, convert=True)
         else:
             # the fossils used for the display of entries
@@ -1433 +1433 @@
             # in the list of their respective Fossilizable
             # objects
-            entry = obj.fossilize(useAttrCache = useAttrCache, tz = tz)
+            entry = obj.fossilize(useAttrCache = useAttrCache, tz = tz, convert=True)
 
         genId = entry['id']
@@ -1448 +1448 @@
                     if mgmtMode:
                         if isinstance(contrib, ContribSchEntry):
-                            contribData = contrib.fossilize(IContribSchEntryMgmtFossil, useAttrCache = useAttrCache, tz = tz)
+                            contribData = contrib.fossilize(IContribSchEntryMgmtFossil, useAttrCache = useAttrCache, tz = tz, convert=True)
                         elif isinstance(contrib, BreakTimeSchEntry):
-                            contribData = contrib.fossilize(IBreakTimeSchEntryMgmtFossil, useAttrCache = useAttrCache, tz = tz)
+                            contribData = contrib.fossilize(IBreakTimeSchEntryMgmtFossil, useAttrCache = useAttrCache, tz = tz, convert=True)
                         else:
-                            contribData = contrib.fossilize(useAttrCache = useAttrCache, tz = tz)
+                            contribData = contrib.fossilize(useAttrCache = useAttrCache, tz = tz, convert=True)
                     else:
                         # the fossils used for the display of entries
@@ -1458 +1458 @@
                         # in the list of their respective Fossilizable
                         # objects
-                        contribData = contrib.fossilize(useAttrCache = useAttrCache, tz = tz)
+                        contribData = contrib.fossilize(useAttrCache = useAttrCache, tz = tz, convert=True)
 
                     entries[contribData['id']] = contribData

indico/MaKaC/webinterface/pages/conferences.py

@@ -1468 +1468 @@
         vars = wcomponents.WTemplated.getVars( self )
         tz = DisplayTZ(self._aw,self._conf).getDisplayTZ()
-        vars["ttdata"] = json.dumps(schedule.ScheduleToJson.process(self._conf.getSchedule(),
+        sf = schedule.ScheduleToJson.process(self._conf.getSchedule(),
                                                                           tz, self._aw,
                                                                           useAttrCache = True,
-                                                                          hideWeekends = True))
-        eventInfo = fossilize(self._conf, IConferenceEventInfoFossil, tz = tz)
+                                                                          hideWeekends = True)
+        # TODO: Move to beginning of file when proved useful
+        try:
+            import cjson
+            jsonf = cjson.encode
+        except ImportError:
+            jsonf = json.dumps
+        vars["ttdata"] = jsonf(sf)
+        eventInfo = fossilize(self._conf, IConferenceEventInfoFossil, tz=tz)
         eventInfo['isCFAEnabled'] = self._conf.getAbstractMgr().isActive()
         vars['eventInfo'] = json.dumps(eventInfo)

indico/util/fossilize/conversion.py

@@ -29 +29 @@
 
     @classmethod
-    def datetime(cls, dt, tz=None):
+    def datetime(cls, dt, tz=None, convert=False):
         if dt:
             if tz:
@@ -37 +37 @@
             else:
                 date = dt
-            return date
+            if convert:
+                return {'date': str(date.date()), 'time': str(date.time()), 'tz': str(date.tzinfo)}
+            else:
+                return date
         else:
             return None

setup.py

@@ -125 +125 @@
              'lxml', 'cds-indico-extras', 'zc.queue', 'python-dateutil<2.0',
              'pypdf', 'mako>=0.4.1', 'babel', 'icalendar>=3.0', 'pyatom',
-             'simplejson']
+             'simplejson', 'python-cjson']
 
     #for Python older than 2.7