Changeset 213 for trunk/trax/vendor

Timestamp:

05/31/06 14:47:07 (6 years ago)

Author:

john

Message:

moved paging to AR Helper, find_all can take an array now, bug fixes

Location:

trunk/trax/vendor/trax

Files:

• action_view/helpers/active_record_helper.php (modified) (2 diffs)
• active_record.php (modified) (18 diffs)

trunk/trax/vendor/trax/action_view/helpers/active_record_helper.php

@@ -482 +482 @@
         return $column['type'];
     }
-
+    
+    /**
+     * Paging html functions
+     *  @todo Document this API
+     */
+    function pagination_limit_select($object_name_or_object, $default_text = "per page:") {
+
+        if(is_object($object_name_or_object)) {
+            $object = $object_name_or_object;
+        } else {
+            $object = $this->object($object_name_or_object);  
+        }
+
+        if(!is_object($object)) {
+            return null;    
+        }
+
+        if($object->pages > 0) {
+            $html .= "
+                <select name=\"per_page\" onChange=\"document.location = '?".escape_javascript($object->paging_extra_params)."&per_page=' + this.options[this.selectedIndex].value;\">
+                    <option value=\"$object->rows_per_page\" selected>$default_text</option>
+                    <option value=10>10</option>
+                    <option value=20>20</option>
+                    <option value=50>50</option>
+                    <option value=100>100</option>
+                    <option value=999999999>ALL</option>
+                </select>
+            ";
+        }
+        return $html;
+    }
+
+    /**
+     *  @todo Document this API
+     *
+     *  @return string HTML to link to previous and next pages
+     *  @uses $display
+     *  @uses $page
+     *  @uses $pages
+     *  @uses $paging_extra_params
+     *  @uses rows_per_page
+     */
+    function pagination_links($object_name_or_object){
+        
+        if(is_object($object_name_or_object)) {
+            $object = $object_name_or_object;
+        } else {
+            $object = $this->object($object_name_or_object);  
+        }
+
+        if(!is_object($object)) {
+            return null;    
+        }
+           
+        //$html  = "<pre>".print_r($object,1);
+        /* Print the first and previous page links if necessary */
+        if(($object->page != 1) && ($object->page)) {
+            $html .= link_to("<<", 
+                                  "?$object->paging_extra_params&page=1&per_page=$object->rows_per_page",
+                                  array(
+                                    "class" => "pageList",
+                                    "title" => "First page"
+                                  ))." ";
+        }
+        if(($object->page-1) > 0) {
+            $html .= link_to("<", 
+                                  "?$object->paging_extra_params&page=".($object->page-1)."&per_page=$object->rows_per_page",
+                                  array(
+                                    "class" => "pageList",
+                                    "title" => "Previous Page"                                    
+                                  ));
+        }
+        
+        if($object->pages < $object->display) {
+            $object->display = $object->pages;
+        }
+        
+        if($object->page == $object->pages) {
+            if(($object->pages - $object->display) == 0) {
+                $start = 1;
+            } else {
+                $start = $object->pages - $object->display;
+            }
+            $end = $object->pages;
+        } else {
+            if($object->page >= $object->display) {
+                $start = $object->page - ($object->display / 2);
+                $end   = $object->page + (($object->display / 2) - 1);
+            } else {
+                $start = 1;
+                $end   = $object->display;
+            }
+        }
+
+        if($end >= $object->pages) {
+            $end = $object->pages;
+        }
+                
+        /* Print the numeric page list; make the current page unlinked and bold */
+        if($end != 1) {
+            for($i=$start; $i<=$end; $i++) {
+                if($i == $object->page) {
+                    $html .= "<span class=\"pageList\"><b>".$i."</b></span>";
+                } else {
+                    $html .= link_to($i,
+                                          "?$object->paging_extra_params&page=$i&per_page=$object->rows_per_page",
+                                          array(
+                                            "class" => "pageList",
+                                            "title" => "Page $i"                                           
+                                          ));
+                }
+                $html .= " ";
+            }
+        }
+
+        /* Print the Next and Last page links if necessary */
+        if(($object->page+1) <= $object->pages) {
+            $html .= link_to(">",
+                                  "?$object->paging_extra_params&page=".($object->page+1)."&per_page=$object->rows_per_page",
+                                  array(
+                                    "class" => "pageList",
+                                    "title" => "Next Page"                                    
+                                  ));
+        }
+        if(($object->page != $object->pages) && ($object->pages != 0)) {
+            $html .= link_to(">>",
+                                  "?$object->paging_extra_params&page=".$object->pages."&per_page=$object->rows_per_page",
+                                  array(
+                                    "class" => "pageList",
+                                    "title" => "Last Page"                                    
+                                  ));
+        }
+        $html .= "\n";
+
+        return $html;
+    }    
+    
+    function pagination_range_text($object_name_or_object, $showing_text = "Showing", $showing_type = "items") {
+        if(is_object($object_name_or_object)) {
+            $object = $object_name_or_object;
+        } else {
+            $object = $this->object($object_name_or_object);  
+        }
+
+        if(!is_object($object)) {
+            return null;    
+        }
+        $end = $object->rows_per_page * $object->page;
+        $start = $end - ($object->rows_per_page - 1);
+        if($end >= $object->pagination_count) {
+            $end = $object->pagination_count;
+        }
+        
+        return "{$showing_text} {$start} - {$end} of {$object->pagination_count} {$showing_type}.";                     
+    }
+    
 }
 
@@ -537 +692 @@
     $args = func_get_args();
     return call_user_func_array(array($ar_helper, 'input_scaffolding'), $args);
+}
+
+/**
+ *
+ *  @uses ActiveRecordHelper::pagination_limit_select()
+ */
+function pagination_limit_select() {
+    $ar_helper = new ActiveRecordHelper();
+    $args = func_get_args();
+    return call_user_func_array(array($ar_helper, 'pagination_limit_select'), $args);
+}
+
+/**
+ *
+ *  @uses ActiveRecordHelper::pagination_links()
+ */
+function pagination_links() {
+    $ar_helper = new ActiveRecordHelper();
+    $args = func_get_args();
+    return call_user_func_array(array($ar_helper, 'pagination_links'), $args);
+}
+
+/**
+ *
+ *  @uses ActiveRecordHelper::pagination_range_text()
+ */
+function pagination_range_text() {
+    $ar_helper = new ActiveRecordHelper();
+    $args = func_get_args();
+    return call_user_func_array(array($ar_helper, 'pagination_range_text'), $args);
 }
 

trunk/trax/vendor/trax/active_record.php

@@ -100 +100 @@
 
     /**
+     *  Class name
+     *
+     *  Name of the child class. (this is optional and will automatically be determined)
+     *  Normally set to the singular camel case form of the table name.  
+     *  May be overridden.
+     *  @var string
+     */
+    public $class_name = null; 
+
+    /**
      *  Table name
      *
@@ -290 +300 @@
      */
     public $display = 10; # Pagination how many numbers in the list << < 1 2 3 4 > >>
+
+    /**
+     *  @todo Document this variable
+     */    
+    public $pagination_count = 0;
 
     /**
@@ -540 +555 @@
      */
     private function find_all_habtm($other_table_name, $parameters = null) {
-        $other_class_name = Inflector::classify($other_table_name);
+
+        # Use any passed-in parameters
+        if (!is_null($parameters)) {
+            if(@array_key_exists("conditions", $parameters))
+                $additional_conditions = $parameters['conditions'];
+            elseif($parameters[0] != "")
+                $additional_conditions = $parameters[0];
+
+            if(@array_key_exists("order", $parameters))
+                $orderings = $parameters['order'];
+            elseif($parameters[1] != "")
+                $orderings = $parameters[1];
+
+            if(@array_key_exists("limit", $parameters))
+                $limit = $parameters['limit'];
+            elseif($parameters[2] != "")
+                $limit = $parameters[2];
+
+            if(@array_key_exists("joins", $parameters))
+                $additional_joins = $parameters['joins'];
+            elseif($parameters[3] != "")
+                $additional_joins = $parameters[3];
+
+            if(!empty($additional_conditions))
+                $conditions .= " AND (" . $additional_conditions . ")";
+            if(!empty($additional_joins))
+                $joins .= " " . $additional_joins;
+                
+            if(@array_key_exists("class_name", $parameters)) {
+                $other_object_name = $parameters['class_name'];
+            }            
+            if(@array_key_exists("join_table", $parameters)) {
+                $join_table = $parameters['join_table'];
+            } 
+        }
+        if(!is_null($other_object_name)) {
+            $other_class_name = Inflector::camelize($other_object_name);    
+        } else {
+            $other_class_name = Inflector::classify($other_table_name);
+        }
         # Instantiate an object to access find_all
-        $results = new $other_class_name();
+        $object = new $other_class_name();
 
         # Prepare the join table name primary keys (fields) to do the join on
-        $join_table = $this->get_join_table_name($this->table_name, $other_table_name);
+        if(is_null($join_table)) {
+            $join_table = $this->get_join_table_name($this->table_name, $other_table_name);
+        }
         $this_foreign_key = Inflector::singularize($this->table_name)."_id";
         $other_foreign_key = Inflector::singularize($other_table_name)."_id";
@@ -552 +608 @@
         $orderings = null;
         $limit = null;
-        $joins = "LEFT JOIN {$join_table} ON {$other_table_name}.id = {$other_foreign_key}";
-
-        # Use any passed-in parameters
-        if (!is_null($parameters)) {
-            if(@array_key_exists("conditions", $parameters))
-                $additional_conditions = $parameters['conditions'];
-            elseif($parameters[0] != "")
-                $additional_conditions = $parameters[0];
-
-            if(@array_key_exists("orderings", $parameters))
-                $orderings = $parameters['orderings'];
-            elseif($parameters[1] != "")
-                $orderings = $parameters[1];
-
-            if(@array_key_exists("limit", $parameters))
-                $limit = $parameters['limit'];
-            elseif($parameters[2] != "")
-                $limit = $parameters[2];
-
-            if(@array_key_exists("joins", $parameters))
-                $additional_joins = $parameters['joins'];
-            elseif($parameters[3] != "")
-                $additional_joins = $parameters[3];
-
-            if (!empty($additional_conditions))
-                $conditions .= " AND (" . $additional_conditions . ")";
-            if (!empty($additional_joins))
-                $joins .= " " . $additional_joins;
-        }
+        $joins .= "LEFT JOIN {$join_table} ON {$other_table_name}.id = {$other_foreign_key}";
 
         # Get the list of other_class_name objects
-        return $results->find_all($conditions, $orderings, $limit, $joins);
+        return $object->find_all($conditions, $orderings, $limit, $joins);
     }
 
@@ -595 +623 @@
      */
     private function find_all_has_many($other_table_name, $parameters = null) {
-        # Prepare the class name and primary key, e.g. if
-        # customers has_many contacts, then we'll need a Contact
-        # object, and the customer_id field name.
-        if(@array_key_exists("foreign_key", $parameters))
-            $foreign_key = $parameters['foreign_key'];
-        else
-            $foreign_key = Inflector::singularize($this->table_name)."_id";
-
-        $other_class_name = Inflector::classify($other_table_name);
-        $conditions = "{$foreign_key}=$this->id";
 
         # Use any passed-in parameters
@@ -614 +632 @@
                 $additional_conditions = $parameters[0];
 
-            if(@array_key_exists("orderings", $parameters))
-                $orderings = $parameters['orderings'];
+            if(@array_key_exists("order", $parameters))
+                $orderings = $parameters['order'];
             elseif($parameters[1] != "")
                 $orderings = $parameters[1];
@@ -633 +651 @@
             if(!empty($additional_joins))
                 $joins .= " " . $additional_joins;
+
+            if(@array_key_exists("class_name", $parameters)) {
+                $other_object_name = $parameters['class_name'];
+            }  
+        }
+
+        if(!is_null($other_object_name)) {
+            $other_class_name = Inflector::camelize($other_object_name);    
+        } else {
+            $other_class_name = Inflector::classify($other_table_name);
         }
 
         # Instantiate an object to access find_all
         $other_class_object = new $other_class_name();
+        
+        if(@array_key_exists("foreign_key", $parameters)) {
+            $foreign_key = $parameters['foreign_key'];
+        } else {
+            $foreign_key = Inflector::singularize($this->table_name)."_id";
+        }
+        if(count($other_class_object->primary_keys) == 1) {
+            $id = $other_class_object->primary_keys[0];    
+        } else {
+            $id = "id";    
+        }
+        $id_value = $this->$id;
+        if(is_numeric($id_value)) {
+            $conditions = "$foreign_key={$id_value}";
+        } else {
+            $conditions = "$foreign_key='{$id_value}'";        
+        }         
+
         # Get the list of other_class_name objects
-        $results = $other_class_object->find_all($conditions, $orderings, $limit, $joins);
-
-        return $results;
+        return $other_class_object->find_all($conditions, $orderings, $limit, $joins);
     }
 
@@ -652 +696 @@
      */
     private function find_one_has_one($other_object_name, $parameters = null) {
-        # Prepare the class name and primary key, e.g. if
-        # customers has_many contacts, then we'll need a Contact
-        # object, and the customer_id field name.
-        $other_  = Inflector::camelize($other_object_name);
-        if(@array_key_exists("foreign_key", $parameters))
+        if(@array_key_exists("class_name", $parameters)) {
+            $other_object_name = $parameters['class_name'];
+        }
+        $other_class_name = Inflector::camelize($other_object_name);
+        
+        # Instantiate an object to access find_all
+        $other_class_object = new $other_class_name();
+
+        if(@array_key_exists("foreign_key", $parameters)) {
             $foreign_key = $parameters['foreign_key'];
-        else
+        } else {
             $foreign_key = Inflector::singularize($this->table_name)."_id";
-
-        $conditions = "$foreign_key='{$this->id}'";
-        # Instantiate an object to access find_all
-        $results = new $other_class_name();
+        }
+        
+        if(count($other_class_object->primary_keys) == 1) {
+            $id = $other_class_object->primary_keys[0];    
+        } else {
+            $id = "id";    
+        }
+        $id_value = $this->$id;
+        if(is_numeric($id_value)) {
+            $conditions = "$foreign_key={$id_value}";
+        } else {
+            $conditions = "$foreign_key='{$id_value}'";        
+        }         
+        
         # Get the list of other_class_name objects
-        $results = $results->find_first($conditions, $orderings);
+        $result = $other_class_object->find_first($conditions, $orderings);
         # There should only be one result, an object, if so return it
-        if(is_object($results)) {
-            return $results;
+        if(is_object($result)) {
+            return $result;
         } else {
             return null;
@@ -684 +742 @@
      */
     private function find_one_belongs_to($other_object_name, $parameters = null) {
-        # Prepare the class name and primary key, e.g. if
-        # customers has_many contacts, then we'll need a Contact
-        # object, and the customer_id field name.
+        if(@array_key_exists("class_name", $parameters)) {
+            $other_object_name = $parameters['class_name'];
+        }        
         $other_class_name = Inflector::camelize($other_object_name);
-        if(@array_key_exists("foreign_key", $parameters))
+     
+        # Instantiate an object to access find_all
+        $other_class_object = new $other_class_name();
+
+        if(@array_key_exists("foreign_key", $parameters)) {
             $foreign_key = $parameters['foreign_key'];
-        else
+        } else {
             $foreign_key = $other_object_name."_id";
-
-        $conditions = "id='".$this->$foreign_key."'";
-        # Instantiate an object to access find_all
-        $results = new $other_class_name();
+        }
+        
+        if(count($other_class_object->primary_keys) == 1) {
+            $id = $other_class_object->primary_keys[0];    
+        } else {
+            $id = "id";    
+        }
+        $foreign_key_value = $this->$foreign_key;
+        if(is_numeric($foreign_key_value)) {
+            $conditions = "$id = $foreign_key_value";
+        } else {
+            $conditions = "$id = '$foreign_key_value'";        
+        }           
+        
         # Get the list of other_class_name objects
-        $results = $results->find_first($conditions, $orderings);
+        $result = $other_class_object->find_first($conditions, $orderings);
         # There should only be one result, an object, if so return it
-        if(is_object($results)) {
-            return $results;
+        if(is_object($result)) {
+            return $result;
         } else {
             return null;
@@ -744 +816 @@
         if(!empty($conditions)) $sql .= "WHERE $conditions ";
 
-        //echo "sql:$sql<br>";
+        # echo "$aggregrate_type sql:$sql<br>";
         if($this->is_error($rs = $this->query($sql))) {
             $this->raise($rs->getMessage());
         } else {
             $row = $rs->fetchRow();
-            return $row["agg_result"];
+            if($row["agg_result"]) {
+                return $row["agg_result"];    
+            }
         }
         return 0;
@@ -978 +1052 @@
         //          .', ' . (is_null($joins)?'null':$joins).')');
 
-        //  Is output to be generated in pages?
-        if (is_array($limit)) {
-
-            //  Yes, get next page number and rows per page from argument
-            list($this->page, $this->rows_per_page) = $limit;
-            if($this->page <= 0) {
-                $this->page = 1;
-            }
-            # Default for rows_per_page:
-            if ($this->rows_per_page == null) {
-                $this->rows_per_page = $this->rows_per_page_default;
-            }
-            # Set the LIMIT string segment for the SQL in the find_all
-            $this->offset = ($this->page - 1) * $this->rows_per_page;
-            # mysql 3.23 doesn't support OFFSET
-            //$limit = "$rows_per_page OFFSET $offset";
-            $limit = $this->offset.", ".$this->rows_per_page;
-
-            //  Remember that we're generating output in pages
-            //  so $limit needs to be added to the query
-            $set_pages = true;
-        }
-
-        //  Test source of SQL for query
+        # Test source of SQL for query
         if(stristr($conditions, "SELECT")) {
-
-            //  SQL completely specified in argument so use it as is
+            # SQL completely specified in argument so use it as is
             $sql = $conditions;
         } else {
-
-            //  SQL will be built from specifications in argument
+            # SQL will be built from specifications in argument
             $sql  = "SELECT * FROM ".$this->table_name." ";
-
-            //  If join specified, include it
+            
+            # this is if they passed in an associative array to emulate
+            # named parameters.
+            if(is_array($conditions)) {
+                extract($conditions);  
+                if(is_array($conditions)) {
+                    $conditions = null;    
+                }  
+            }
+            
+            # If join specified, include it
             if(!is_null($joins)) {
                 if(substr($joins,0,4) != "LEFT") $sql .= ",";
@@ -1017 +1075 @@
             }
 
-            //  If conditions specified, include them
+            # If conditions specified, include them
             if(!is_null($conditions)) {
                 $sql .= "WHERE $conditions ";
             }
 
-            //  If ordering specified, include it
+            # If ordering specified, include it
             if(!is_null($orderings)) {
                 $sql .= "ORDER BY $orderings ";
             }
 
-            //  If limit specified, divide into pages
-            if(!is_null($limit)) {
-                //  FIXME: Isn't the  second test redundant?
-                if($set_pages) {
-
-                    //  Send query to database
-                    //echo "query: $sql\n";
-                    if($this->is_error($rs = $this->query($sql))) {
-
-                        //  Error returned, throw error exception
-                        $this->raise($rs->getMessage());
-                        //  Execution doesn't return here
-                    } else {
-
-                        # Set number of total pages in result set 
-                        # without the LIMIT  
-                        if($count = $rs->numRows())
-                            $this->pages = (
-                               ($count % $this->rows_per_page) == 0)
-                                ? $count / $this->rows_per_page
-                                : floor($count / $this->rows_per_page) + 1;
-                    }
+            # If limit specified, divide into pages
+            if(!is_null($limit) || !is_null($offset) || !is_null($per_page)) {
+
+                # Is output to be generated in pages?
+                if(is_array($limit)) {    
+                    # Yes, get next page number and rows per page from argument
+                    list($this->page, $this->rows_per_page) = $limit;
+                } else {
+                    $this->rows_per_page = $limit;        
                 }
-                $sql .= "LIMIT $limit";
-            }
-        }
-
-        //echo "ActiveRecord::find_all() - sql: $sql\n<br>";
-        //echo "query: $sql\n";
+                if(!is_null($per_page)) {
+                    $this->rows_per_page = $per_page;            
+                }
+                # Default for rows_per_page:
+                if ($this->rows_per_page <= 0) {
+                    $this->rows_per_page = $this->rows_per_page_default;
+                }
+                                
+                $this->page = $_REQUEST['page'];
+                if($this->page <= 0) {
+                    $this->page = 1;
+                }
+                                
+                # Set the LIMIT string segment for the SQL
+                if(!$offset) {
+                    $offset = ($this->page - 1) * $this->rows_per_page;
+                }
+
+                $sql .= "LIMIT $this->rows_per_page OFFSET $offset";
+                # $sql .= "LIMIT $offset, $this->rows_per_page";
+        
+                # Send query to database
+                # Set number of total pages in result set 
+                # without the LIMIT  
+                if($count = $this->count_all("*", $conditions, $joins)) {
+                    $this->pagination_count = $count;
+                    $this->pages = (
+                       ($count % $this->rows_per_page) == 0)
+                        ? $count / $this->rows_per_page
+                        : floor($count / $this->rows_per_page) + 1;
+                } 
+            }
+        }
+
+        # echo "ActiveRecord::find_all() - sql: $sql\n<br>";
+        # echo "query: $sql\n";
         if($this->is_error($rs = $this->query($sql))) {
             $this->raise($rs->getMessage());
@@ -1062 +1137 @@
         $objects = array();
         while($row = $rs->fetchRow()) {
-            $class = get_class($this);
-            #$class = Inflector::classify($this->table_name);
-            $object = new $class();
+            $class_name = $this->get_class_name();
+            $object = new $class_name();
             $object->new_record = false;
-            foreach($row as $field => $val) {
-                $object->$field = $val;
+            foreach($row as $field => $value) {
+                $object->$field = $value;
                 if($field == $this->index_on) {
-                    $objects_key = $val;
+                    $objects_key = $value;
                 }
             }
@@ -1210 +1284 @@
             }
         } else {
-            $class = get_class($this);
-            $object = new $class();
+            $class_name = $this->get_class_name();
+            $object = new $class_name();
             $object->save($attributes, $dont_validate);
         }
@@ -1968 +2042 @@
     function set_table_name_using_class_name() {
         if(!$this->table_name) {
-            $this->table_name = Inflector::tableize(get_class($this));
-        }
+            $class_name = $this->get_class_name();
+            $this->table_name = Inflector::tableize($class_name);
+        }
+    }
+
+    /**
+     *  Get class name of child object 
+     *
+     *  this will return the manually set name or get_class($this)
+     *  @return string child class name
+     */    
+    private function get_class_name() {
+        if(!is_null($this->class_name)) {
+            $class_name = $this->class_name;
+        } else {
+            $class_name = get_class($this);        
+        } 
+        return $class_name;               
     }
 
@@ -2096 +2186 @@
      */
     function raise($message) {
-        $error_message  = "Model Class: ".get_class($this)."<br>";
+        $error_message  = "Model Class: ".$this->get_class_name()."<br>";
         $error_message .= "Error Message: ".$message;
         throw new ActiveRecordError($error_message, "ActiveRecord Error", "500");
@@ -2225 +2315 @@
         $validated_ok = true;
         $attrs = $this->get_attributes();
-        $methods = get_class_methods(get_class($this));
+        $methods = get_class_methods($this->get_class_name());
         foreach($methods as $method) {
             if(preg_match('/^validate_(.+)/', $method, $matches)) {
@@ -2372 +2462 @@
     }
 
-    /**
-     * Paging html functions
-     *  @todo Document this API
-     */
-    function limit_select($controller =null, $additional_query = null) {
-        if($this->pages > 0) {
-            $html = "
-                <select name=\"per_page\" onChange=\"document.location = '?$this->paging_extra_params&per_page=' + this.options[this.selectedIndex].value;\">
-                    <option value=\"$this->rows_per_page\" selected>per page:</option>
-                    <option value=10>10</option>
-                    <option value=20>20</option>
-                    <option value=50>50</option>
-                    <option value=100>100</option>
-                    <option value=999999999>ALL</option>
-                </select>
-            ";
-        }
-        return $html;
-    }
-
-    /**
-     *  @todo Document this API
-     *
-     *  @return string HTML to link to previous and next pages
-     *  @uses $display
-     *  @uses $page
-     *  @uses $pages
-     *  @uses $paging_extra_params
-     *  @uses rows_per_page
-     */
-    function page_list(){
-        $page_list  = "";
-
-        /* Print the first and previous page links if necessary */
-        if(($this->page != 1) && ($this->page))
-            $page_list .= "<a href=\"?$this->paging_extra_params&page=1&per_page=$this->rows_per_page\" class=\"page_list\" title=\"First Page\"><<</a> ";
-
-        if(($this->page-1) > 0)
-            $page_list .= "<a href=\"?$this->paging_extra_params&page=".($this->page-1)."&per_page=$this->rows_per_page\" class=\"page_list\" title=\"Previous Page\"><</a> ";
-
-        if($this->pages < $this->display)
-            $this->display = $this->pages;
-
-        if($this->page == $this->pages) {
-            if($this->pages - $this->display == 0)
-                $start = 1;
-            else
-                $start = $this->pages - $this->display;
-            $max = $this->pages;
-        } else {
-            if($this->page >= $this->display) {
-                $start = $this->page - ($this->display / 2);
-                $max   = $this->page + (($this->display / 2)-1);
-            } else {
-                $start = 1;
-                $max   = $this->display;
-            }
-        }
-
-        if($max >= $this->pages)
-            $max = $this->pages;
-
-        /* Print the numeric page list; make the current page unlinked and bold */
-        if($max != 1) {
-            for ($i=$start; $i<=$max; $i++) {
-                if ($i == $this->page)
-                    $page_list .= "<span class=\"pageList\"><b>".$i."</b></span>";
-                else
-                    $page_list .= "<a href=\"?$this->paging_extra_params&page=$i&per_page=$this->rows_per_page\" class=\"page_list\" title=\"Page ".$i."\">".$i."</a>";
-
-                $page_list .= " ";
-            }
-        }
-
-        /* Print the Next and Last page links if necessary */
-        if(($this->page+1) <= $this->pages)
-            $page_list .= "<a href=\"?$this->paging_extra_params&page=".($this->page+1)."&per_page=$this->rows_per_page\" class=\"page_list\" title=\"Next Page\">></a> ";
-
-        if(($this->page != $this->pages) && ($this->pages != 0))
-            $page_list .= "<a href=\"?$this->paging_extra_params&page=".$this->pages."&per_page=$this->rows_per_page\" class=\"page_list\" title=\"Last Page\">>></a> ";
-
-        $page_list .= "\n";
-
-        //error_log("Page list=[$page_list]");
-        return $page_list;
-    }
-
 }