Changeset 1a9ed6 in indico

Timestamp:

10/04/11 15:21:26 (20 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

cb44f7

Parents:

f17f3f

Message:

[IMP] Avoid unneeded connection to DB for getVars

File:

• indico/MaKaC/webinterface/rh/JSContent.py (modified) (3 diffs)

indico/MaKaC/webinterface/rh/JSContent.py

@@ -30 +30 @@
         return hashlib.md5(str(value)).hexdigest()
 
-    def _checkParams( self, params ):
+    def _setHeaders(self):
+        # send out the Etag and Last-Modified headers
+        creationTime = datetime.datetime.fromtimestamp(os.path.getctime(self._htmlPath))
+        self._req.headers_out["Etag"] = self._generateEtag(creationTime)
+        self._req.headers_out["Last-Modified"] = formatdate(time.mktime(creationTime.timetuple()))
+        self._req.content_type = "application/x-javascript"
+
+    def process( self, params ):
 
         # Check incoming headers
@@ -51 +58 @@
         if os.access(self._htmlPath, os.R_OK):
 
-            self._regenerate = False;
-
             # get the OS creation time
             creationTime = datetime.datetime.fromtimestamp(os.path.getctime(self._htmlPath))
@@ -58 +63 @@
                 # if the etag the same, send NOT_MODIFIED
                 self._req.status = apache.HTTP_NOT_MODIFIED
-                self._doProcess = False
+                return
             else:
-                self._regenerate = True
-        else:
-            # file needs to be regenerated
-            self._regenerate = True
+                # Read and send the file
+                fh = open(self._htmlPath, "r")
+                self._htmlData = fh.read()
+                fh.close()
+                self._setHeaders()
+                return self._htmlData
+        # file needs to be regenerated
+        return base.RH.process(self, params)
 
 
     def _process( self ):
         try:
-            # regenerate file if needed
-            if self._regenerate:
-                self._dict["__rh__"] = self
-                self._dict["user"] = None
+            # regenerate file is needed
+            self._dict["__rh__"] = self
+            self._dict["user"] = None
 
-                htmlData = templateEngine.render(self._tplFile, self._dict)
-                fh = open(self._htmlPath, "w")
-                fh.write(htmlData)
-                fh.close()
-            else:
-                # otherwise just send it to the client
-                fh = open(self._htmlPath, "r")
-                htmlData = fh.read()
-                fh.close()
+            self._htmlData = templateEngine.render(self._tplFile, self._dict)
+            fh = open(self._htmlPath, "w")
+            fh.write(self._htmlData)
+            fh.close()
 
-            # send out the Etag and Last-Modified headers
-            creationTime = datetime.datetime.fromtimestamp(os.path.getctime(self._htmlPath))
-            self._req.headers_out["Etag"] = self._generateEtag(creationTime)
-            self._req.headers_out["Last-Modified"] = formatdate(time.mktime(creationTime.timetuple()))
-            self._req.content_type = "application/x-javascript"
+            self._setHeaders()
 
         except Exception, e:
             return 'indicoError: %s' % e
 
-        return htmlData
+        return self._htmlData
 
 class RHGetVarsJs(RHTemplateContentJS):