Se corrige un bug.

[mecon/meconlib.git] / lib / MECON / DB / Pager.php

diff --git a/lib/MECON/DB/Pager.php b/lib/MECON/DB/Pager.php
index db801afdf60adf27ec9ba5eab476503be2997a31..7daf5d031ca35bbc2253366a71d063d30f3cfb3e 100644 (file)
--- a/lib/MECON/DB/Pager.php
+++ b/lib/MECON/DB/Pager.php
@@ -60,7 +60,7 @@ require_once 'DB.php';
 * @see http://vulcanonet.com/soft/pager/
 */
 
 * @see http://vulcanonet.com/soft/pager/
 */
 

-class MECON_DB_Pager extends PEAR
+class MECON_DB_Pager extends DB_Result

 {
 
     /**
 {
 
     /**


@@ -100,7 +100,10 @@ class MECON_DB_Pager extends PEAR
     */
     function MECON_DB_Pager (&$res, $from = 0, $limit = 10, $maxpages = 21, $numrows = null)
     {
     */
     function MECON_DB_Pager (&$res, $from = 0, $limit = 10, $maxpages = 21, $numrows = null)
     {

-        $this->res = $res;
+        $this->dbh = $res->dbh;
+        $this->result = $res->result;
+        $this->row_counter = $res->row_counter;
+        $this->limit_from = $res->limit_from;

         $this->from = $from;
         $this->limit = $limit;
         $this->numrows = $numrows;
         $this->from = $from;
         $this->limit = $limit;
         $this->numrows = $numrows;


@@ -116,7 +119,7 @@ class MECON_DB_Pager extends PEAR
     {
         // if there is no numrows given, calculate it
         if ($this->numrows === null) {
     {
         // if there is no numrows given, calculate it
         if ($this->numrows === null) {

-            $this->numrows = $this->res->numrows();
+            $this->numrows = $this->numrows();

             if (DB::isError($this->numrows)) {
                 return $this->numrows;
             }
             if (DB::isError($this->numrows)) {
                 return $this->numrows;
             }


@@ -200,13 +203,13 @@ class MECON_DB_Pager extends PEAR
         $this->current = $this->from - 1;
     }
 
         $this->current = $this->from - 1;
     }
 

-    function fetchRow($mode=DB_FETCHMODE_DEFAULT)
+    function fetchRow($mode=DB_FETCHMODE_DEFAULT, $rownum=null)

     {
         $this->current++;
         if ($this->current >= $this->to) {
             return null;
         }
     {
         $this->current++;
         if ($this->current >= $this->to) {
             return null;
         }

-        return $this->res->fetchRow($mode, $this->current);
+        return $this->fetchRow($mode, $this->current);

     }
 
     function fetchInto(&$arr, $mode=DB_FETCHMODE_DEFAULT)
     }
 
     function fetchInto(&$arr, $mode=DB_FETCHMODE_DEFAULT)


@@ -215,7 +218,7 @@ class MECON_DB_Pager extends PEAR
         if ($this->current >= $this->to) {
             return null;
         }
         if ($this->current >= $this->to) {
             return null;
         }

-        return $this->res->fetchInto($arr, $mode, $this->current);
+        return $this->fetchInto($arr, $mode, $this->current);

     }
 }
 ?>
     }
 }
 ?>