Changeset 56899a in indico

Timestamp:

06/14/10 16:59:50 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

c4a9d4

Parents:

295bac

git-author:

Leszek Syroka <leszek.marek.syroka@…> (05/21/10 15:37:26)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (06/14/10 16:59:50)

Message:

[FIX] Vars.js.tpl.tmp caching

• Vars.js.tpl.tmp is now reloaded when:
  • it doesn't exist
  • vars.js.tpl was modified after var.js.tpl.tmp
  • indico.conf was modified after var.js.tpl.tmp
  • location was added or deleted
  • roombooking module was switched
  • default location was changed
• fix#191
• review by jbenito: remove the file instead of regenerate

Location:

indico/MaKaC

Files:

• common/info.py (modified) (1 diff)
• rb_location.py (modified) (3 diffs)
• webinterface/rh/JSContent.py (modified) (3 diffs)

indico/MaKaC/common/info.py

@@ -291 +291 @@
     def setRoomBookingModuleActive( self, active = False ):
         self._roomBookingModuleActive = active
+        from MaKaC.webinterface.rh.JSContent import RHGetVarsJs
+        RHGetVarsJs.removeTmpVarsFile()
 
     # Only for default Indico/ZODB plugin

indico/MaKaC/rb_location.py

@@ -125 +125 @@
         root = MaKaC.common.DBMgr.getInstance().getDBConnection().root()
         root[_DEFAULT_ROOM_BOOKING_LOCATION] = locationName
+        from MaKaC.webinterface.rh.JSContent import RHGetVarsJs
+        RHGetVarsJs.removeTmpVarsFile()
 
     @staticmethod
@@ -150 +152 @@
         locations.append( location )
         root[_ROOM_BOOKING_LOCATION_LIST] = locations
+        from MaKaC.webinterface.rh.JSContent import RHGetVarsJs
+        RHGetVarsJs.removeTmpVarsFile()
 
     @staticmethod
@@ -160 +164 @@
         locations = [ loc for loc in locations if loc.friendlyName != locationName ]
         root[_ROOM_BOOKING_LOCATION_LIST] = locations
+        from MaKaC.webinterface.rh.JSContent import RHGetVarsJs
+        RHGetVarsJs.removeTmpVarsFile()
 
     @staticmethod

indico/MaKaC/webinterface/rh/JSContent.py

@@ -14 +14 @@
 class RHTemplateContentJS(base.RH):
     _uh = urlHandlers.Build("JSContent.py")
+    _tplName = ''
 
     def __init__(self, req):
@@ -57 +58 @@
                 self._req.status = apache.HTTP_NOT_MODIFIED
                 self._doProcess = False
+            else:
+                self._regenerate = True
         else:
             # file needs to be regenerated
-            self._regenerate = True;
+            self._regenerate = True
 
 
@@ -98 +101 @@
     _uh = urlHandlers.Derive(RHTemplateContentJS, "getVars")
 
+    _tplName = 'vars.js'
+
     def __init__(self, req):
         RHTemplateContentJS.__init__(self, req)
-        self._tplName = 'vars.js';
         self._dict = {}
 
+    @classmethod
+    def removeTmpVarsFile(cls):
+        cfg = Config.getInstance()
+        fileName = cfg.getTPLFile( cls._tplName )
+
+        if fileName == "":
+            fileName = "%s.tpl"%cls._tplName
+
+        htmlPath = os.path.join(cfg.getTempDir(), fileName+".tmp")
+        if os.access(htmlPath, os.R_OK):
+            os.remove(htmlPath)