Changeset 214 for trunk/trax/vendor

Timestamp:

05/31/06 21:33:29 (6 years ago)

Author:

john

Message:

fixed paging syntax in find_all

Location:

trunk/trax/vendor/trax

Files:

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

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

@@ -619 +619 @@
     }    
     
-    function pagination_range_text($object_name_or_object, $showing_text = "Showing", $showing_type = "items") {
+    function pagination_range_text($object_name_or_object, $range_text = "Showing", $range_type = "items") {
         if(is_object($object_name_or_object)) {
             $object = $object_name_or_object;
@@ -635 +635 @@
         }
         
-        return "{$showing_text} {$start} - {$end} of {$object->pagination_count} {$showing_type}.";                     
+        return "{$range_text} {$start} - {$end} of {$object->pagination_count} {$range_type}.";                     
     }
     

trunk/trax/vendor/trax/active_record.php

@@ -564 +564 @@
 
             if(@array_key_exists("order", $parameters))
-                $orderings = $parameters['order'];
+                $order = $parameters['order'];
             elseif($parameters[1] != "")
-                $orderings = $parameters[1];
+                $order = $parameters[1];
 
             if(@array_key_exists("limit", $parameters))
@@ -606 +606 @@
         # Set up the SQL segments
         $conditions = "{$join_table}.{$this_foreign_key}=".intval($this->id);
-        $orderings = null;
+        $order = null;
         $limit = null;
         $joins .= "LEFT JOIN {$join_table} ON {$other_table_name}.id = {$other_foreign_key}";
 
         # Get the list of other_class_name objects
-        return $object->find_all($conditions, $orderings, $limit, $joins);
+        return $object->find_all($conditions, $order, $limit, $joins);
     }
 
@@ -633 +633 @@
 
             if(@array_key_exists("order", $parameters))
-                $orderings = $parameters['order'];
+                $order = $parameters['order'];
             elseif($parameters[1] != "")
-                $orderings = $parameters[1];
+                $order = $parameters[1];
 
             if(@array_key_exists("limit", $parameters))
@@ -684 +684 @@
 
         # Get the list of other_class_name objects
-        return $other_class_object->find_all($conditions, $orderings, $limit, $joins);
+        return $other_class_object->find_all($conditions, $order, $limit, $joins);
     }
 
@@ -723 +723 @@
         
         # Get the list of other_class_name objects
-        $result = $other_class_object->find_first($conditions, $orderings);
+        $result = $other_class_object->find_first($conditions, $order);
         # There should only be one result, an object, if so return it
         if(is_object($result)) {
@@ -769 +769 @@
         
         # Get the list of other_class_name objects
-        $result = $other_class_object->find_first($conditions, $orderings);
+        $result = $other_class_object->find_first($conditions, $order);
         # There should only be one result, an object, if so return it
         if(is_object($result)) {
@@ -998 +998 @@
                         $method_params .= implode("_",$field)."='".$parameters[$param_cnt++]."'";
                         if($parameters[$param_cnt]) {
-                            $orderings = $parameters[$param_cnt];
+                            $order = $parameters[$param_cnt];
                         }
                     }
@@ -1006 +1006 @@
 
             if($find_all) {
-                return $this->find_all($method_params, $orderings);
+                return $this->find_all($method_params, $order);
             } else {
-                return $this->find_first($method_params, $orderings);
+                return $this->find_first($method_params, $order);
             }
         }
@@ -1018 +1018 @@
      *  If no rows match, an empty array is returned.
      *  @param string  SQL to use in the query.  If
-     *    $conditions contains "SELECT", then $orderings, $limit and
+     *    $conditions contains "SELECT", then $order, $limit and
      *    $joins are ignored and the query is completely specified by
      *    $conditions.  If $conditions is omitted or does not contain
@@ -1027 +1027 @@
      *  @param string  Argument to "ORDER BY" in query.
      *    If specified, the query will include
-     *    "ORDER BY $orderings". If omitted, no ordering will be
+     *    "ORDER BY $order". If omitted, no ordering will be
      *    applied.  
      *  @param integer[] Page, rows per page???
@@ -1045 +1045 @@
      *  @throws {@link ActiveRecordError}
      */
-    function find_all($conditions = null, $orderings = null,
+    function find_all($conditions = null, $order = null,
                       $limit = null, $joins = null) {
         //error_log("find_all(".(is_null($conditions)?'null':$conditions)
-        //          .', ' . (is_null($orderings)?'null':$orderings)
+        //          .', ' . (is_null($order)?'null':$order)
         //          .', ' . (is_null($limit)?'null':var_export($limit,true))
         //          .', ' . (is_null($joins)?'null':$joins).')');
@@ -1063 +1063 @@
             # named parameters.
             if(is_array($conditions)) {
-                extract($conditions);  
+                if(@array_key_exists("per_page", $conditions) && !is_numeric($conditions['per_page'])) {
+                    extract($conditions); 
+                    $per_page = 0;   
+                } else {
+                    extract($conditions);     
+                }
+                # If conditions wasn't in the array set it to null
                 if(is_array($conditions)) {
                     $conditions = null;    
@@ -1081 +1087 @@
 
             # If ordering specified, include it
-            if(!is_null($orderings)) {
-                $sql .= "ORDER BY $orderings ";
-            }
-
-            # 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 {
+            if(!is_null($order)) {
+                $sql .= "ORDER BY $order ";
+            }
+
+            # Is output to be generated in pages?
+            if(is_numeric($limit) || is_numeric($offset) || is_numeric($per_page)) {
+
+                if(is_numeric($limit)) {    
                     $this->rows_per_page = $limit;        
                 }
-                if(!is_null($per_page)) {
+                if(is_numeric($per_page)) {
                     $this->rows_per_page = $per_page;            
                 }
@@ -1116 +1118 @@
                 # $sql .= "LIMIT $offset, $this->rows_per_page";
         
-                # Send query to database
-                # Set number of total pages in result set 
-                # without the LIMIT  
+                # Set number of total pages in result set  
                 if($count = $this->count_all("*", $conditions, $joins)) {
                     $this->pagination_count = $count;
@@ -1129 +1129 @@
         }
 
-        # echo "ActiveRecord::find_all() - sql: $sql\n<br>";
+        echo "ActiveRecord::find_all() - sql: $sql\n<br>";
         # echo "query: $sql\n";
         if($this->is_error($rs = $this->query($sql))) {
@@ -1169 +1169 @@
      *    select based on some column other than "id", you must pass a
      *    string argument ready to insert in the SQL SELECT.
-     *  @param string $orderings Argument to "ORDER BY" in query.
+     *  @param string $order Argument to "ORDER BY" in query.
      *    If specified, the query will include "ORDER BY
-     *    $orderings". If omitted, no ordering will be applied.
+     *    $order". If omitted, no ordering will be applied.
      *  @param integer[] $limit Page, rows per page???
      *  @param string $joins ???
@@ -1188 +1188 @@
      *  @throws {@link ActiveRecordError}
      */
-    function find($id, $orderings = null, $limit = null, $joins = null) {
+    function find($id, $order = null, $limit = null, $joins = null) {
         if(is_array($id)) {
             $conditions = "id IN(".implode(",",$id).")";
@@ -1198 +1198 @@
 
         if(is_array($id)) {
-            return $this->find_all($conditions, $orderings, $limit, $joins);
-        } else {
-            return $this->find_first($conditions, $orderings, $limit, $joins);
+            return $this->find_all($conditions, $order, $limit, $joins);
+        } else {
+            return $this->find_first($conditions, $order, $limit, $joins);
         }
     }
@@ -1209 +1209 @@
      *  If no rows match, null is returned.
      *  @param string $conditions SQL to use in the query.  If
-     *    $conditions contains "SELECT", then $orderings, $limit and
+     *    $conditions contains "SELECT", then $order, $limit and
      *    $joins are ignored and the query is completely specified by
      *    $conditions.  If $conditions is omitted or does not contain
@@ -1216 +1216 @@
      *    include "WHERE $conditions".  If $conditions is null, the
      *    entire table is returned.
-     *  @param string $orderings Argument to "ORDER BY" in query.
+     *  @param string $order Argument to "ORDER BY" in query.
      *    If specified, the query will include
-     *    "ORDER BY $orderings". If omitted, no ordering will be
+     *    "ORDER BY $order". If omitted, no ordering will be
      *    applied.  
      *  FIXME This parameter doesn't seem to make sense
@@ -1229 +1229 @@
      *  @throws {@link ActiveRecordError}
      */
-    function find_first($conditions, $orderings = null, $limit = null, $joins = null) {
-        $result = $this->find_all($conditions, $orderings, $limit, $joins);
+    function find_first($conditions, $order = null, $limit = null, $joins = null) {
+        $result = $this->find_all($conditions, $order, $limit, $joins);
         return @current($result);
     }