search paging

diff --git a/data/templates/search.htm b/data/templates/search.htm
index 51bf9827fb47e2ef44652839aa2bcb27a3cca170..39350c0577544230a6d4974e2c9b782ce0bc40cd 100644 (file)
--- a/data/templates/search.htm
+++ b/data/templates/search.htm
@@ -15,6 +15,7 @@
    {% include 'repo-list.htm' %}
  {% endfor %}
  </ul>
+ {{pager.getLinks.all|raw}}
 {% endif %}
 
 {% endblock %}

diff --git a/src/phorkie/Search/Result.php b/src/phorkie/Search/Result.php
index e64a3a65ccf29aa540d6753a16475f2cd78eb491..00bb1ec960e5cefcb3195a2b711fed252bbe87b2 100644 (file)
--- a/src/phorkie/Search/Result.php
+++ b/src/phorkie/Search/Result.php
@@ -42,6 +42,11 @@ class Search_Result
     {
         return $this->perPage;
     }
+
+    public function getLink($query)
+    {
+        return '/search?q=' . urlencode($query);
+    }
 }
 
 ?>

diff --git a/www/search.php b/www/search.php
index aef209f2ebdd82721c25aa999601c9eff229f050..9461b0dd7eb83a53cc0c22004bacfc96d23e18b1 100644 (file)
--- a/www/search.php
+++ b/www/search.php
@@ -16,7 +16,8 @@ if (isset($_GET['page'])) {
     if (!is_numeric($_GET['page'])) {
         throw new Exception_Input('List page is not numeric');
     }
-    $page = (int)$_GET['page'];
+    //PEAR Pager begins at 1
+    $page = (int)$_GET['page'] - 1;
 }
 $perPage = 10;
 
@@ -24,11 +25,28 @@ $db     = new Database();
 $search = $db->getSearch();
 
 $sres = $search->search($query, $page, $perPage);
+
+//fix non-static factory method error
+error_reporting(error_reporting() & ~E_STRICT);
+$pager = \Pager::factory(
+    array(
+        'mode'        => 'Sliding',
+        'perPage'     => 10,
+        'delta'       => 2,
+        'totalItems'  => $sres->getResults(),
+        'currentPage' => $page + 1,
+        'urlVar'      => 'page',
+        'path'        => '/',
+        'fileName'    => $sres->getLink($query),
+    )
+);
+
 render(
     'search',
     array(
         'query' => $query,
         'sres'  => $sres,
+        'pager' => $pager
     )
 );
 ?>