minor refactoring

till · Oct 5, 2009 · a8ecabf · a8ecabf
1 parent 87af17f
commit a8ecabf
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 5 deletions.
diff --git a/library/PlanetPEAR.php b/library/PlanetPEAR.php
@@ -5,6 +5,11 @@ class PlanetPEAR
     protected $queryRestriction; // no idea
     protected $tally = 10; // blog entries per page
 
+    /**
+     * Request data.
+     */
+    protected $controller, $action, $from, $query;
+
     /**
      * @param MDB2_Common $db Optional MDB2 object.
      *
@@ -76,6 +81,24 @@ public function getBlogs($section = 'default', $forceAll = false)
         return $res;
     }
 
+    public function getCacheName()
+    {
+        if ($this->isQuery()) {
+            return 'search' . $query;
+        }
+        return sprintf(
+            '%s-%s-%s',
+            $this->controller,
+            $this->action,
+            $this->from
+        );
+    }
+
+    public function getController()
+    {
+        return $this->controller;
+    }
+
     /**
      * Fetch and return a list of all feeds
      *
@@ -219,6 +242,8 @@ public function getNavigation($startKey)
         return $navigation;
     }
 
+
+
     public function isQuery()
     {
         if (!empty($this->query)) {
@@ -227,6 +252,24 @@ public function isQuery()
         return false;
     }
 
+    public function setAction($action)
+    {
+        $this->action = strtolower($action);
+        return $this;
+    }
+
+    public function setController($controller)
+    {
+        $this->controller = ucfirst(strtolower($controller));
+        return $this;
+    }
+
+    public function setFrom($from)
+    {
+        $this->from = $from;
+        return $this;
+    }
+
     public function setQuery($query)
     {
         $this->query = trim($query);

diff --git a/public/router.php b/public/router.php
@@ -26,19 +26,36 @@
 $query = (string) @$_GET['search'];
 if (!empty($query)) {
     $match['action'] = 'page';
+} else {
+    $query = null;
+}
+
+if (!isset($match['from'])) {
+    $from = 0;
+} else {
+    $from = (int) $match['from'];
 }
 
 $planet = new PlanetPEAR;
+$planet->setController($match['controller']);
+$planet->setAction($match['action']);
+$planet->setFrom($from);
 $planet->setQuery($query);
 
-$controller = 'PlanetPEAR_Controller_' . ucfirst(strtolower($match['controller']));
-
+$controller    = 'PlanetPEAR_Controller_' . $planet->getController();
 $controllerObj = new $controller($planet);
 
-if (!isset($match['from'])) {
-    $from = 0;
+$cacheName = $planet->getCacheName();
+
+if ($query !== null) {
+    $cacheName = 'search' . $query;
 } else {
-    $from = (int) $match['from'];
+    $cacheName = sprintf(
+        '%s-%s-%s',
+        strtolower($match['controller']),
+        strtolower($match['action']),
+        $from
+    );
 }
 
 try {