SimpleWebPresenter: Page.inc comparison

Improved caching of flag and sitemap.

author	Tom Fredrik "BFG" Klaussen <bfg@blenning.no>
date	Sun, 14 Sep 2014 21:11:27 +0200
parents	2370f4450983
children	0a33803ee026

comparison

equal deleted inserted replaced

-:f2d52fed708c
+:d98e315308cd
 abstract function cacheCheck();
 /**
 * Generates an appropriate response to the request.
 *
-* Eg. 302 NOT CHANGED, error message or the actual content
+* Eg. 304 NOT CHANGED, error message or the actual content
 */
 function genPage()
 {
-if ($this->cacheCheck()) {
+$cacheable = $this->cacheCheck();
-$this->cache->CheckHttpModified();
+if ($cacheable == Cacheable::YES) {
+if (!CheckHttpModified($this->cache))
+	return false;
 }
 $res = $this->generateContent();
+if ($cacheable == Cacheable::UNDETERMINED) {
+$cacheable = $this->cacheCheck();
+if ($cacheable == Cacheable::YES) {
+	if (!CheckHttpModified($this->cache))
+	  return false;
+}
+}
 if ($this->mayValidate()) {
 /*
 $request = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 $validator = new OnlineUriValidator($request);
 */
 * Printing headers and content.
 */
 function display()
 {
 $res = $this->genPage();
-foreach ($res->headers as $header => $value) {
+if ($res) {
-header("${header}: ${value}");
+foreach ($res->headers as $header => $value) {
-}
+	header("${header}: ${value}");
-print $res;
+}
+print $res;
+}
 }
 }
 ?>

Mercurial > SimpleWebPresenter