Changeset 327 for trunk

Timestamp:

09/26/09 09:40:51 (3 years ago)

Author:

john

Message:

AR changed the count on paginated queries, added session_cookie_domain to the Trax class

Location:

trunk/trax/vendor/trax

Files:

• action_mailer.php (modified) (1 diff)
• action_view/helpers/active_record_helper.php (modified) (1 diff)
• active_record.php (modified) (8 diffs)
• session.php (modified) (1 diff)
• trax.php (modified) (1 diff)

trunk/trax/vendor/trax/action_mailer.php

@@ -219 +219 @@
         $this->template_path = "{$this->template_root}/".Inflector::underscore(get_class($this));
         $this->template = $this->template ? $this->template : $method_name;        
-        $this->headers = $this->headers ? $this->headers : array();
-        $this->body = $this->body ? $this->body : array();
+        #$this->headers = $this->headers ? $this->headers : array();
+        $this->headers = array();
+        #$this->body = $this->body ? $this->body : array();    
+        $this->body = null;
         $this->default_from = "nobody@".($_SERVER['HTTP_HOST'] ? $_SERVER['HTTP_HOST'] : 'domain.com');
         $this->head_charset = $this->head_charset ? $this->head_charset : $this->default_charset;

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

@@ -729 +729 @@
         }
         $end = $object->rows_per_page * $object->page;
-        $start = $end - ($object->rows_per_page - 1);
+        $start = $end - ($object->rows_per_page - 1);  
         if($end >= $object->pagination_count) {
             $end = $object->pagination_count;
-        }
+        } 
 
         return $object->pagination_count ? sprintf($format, $start, $end, $object->pagination_count) : null;

trunk/trax/vendor/trax/active_record.php

@@ -1041 +1041 @@
             if(@array_key_exists("foreign_key", $parameters)) {
                 $foreign_key = $parameters['foreign_key'];
-            }         
+            }  
+            if(@array_key_exists("primary_key", $parameters)) {
+                $other_primary_key = $parameters['primary_key'];
+            }       
             if(@array_key_exists("class_name", $parameters)) {
                 $other_object_name = $parameters['class_name'];
@@ -1052 +1055 @@
         $other_class_object = new $other_class_name();
 
-        # This class primary key
-        $other_primary_key = $other_class_object->primary_keys[0];
+        # This class primary key   
+        if(!$other_primary_key) {
+            $other_primary_key = $other_class_object->primary_keys[0];
+        }        
 
         if(!$foreign_key) {
@@ -1118 +1123 @@
         #echo "$aggregate_type sql:$sql<br>";
         //print_r($parameters[0]);
-        //echo $sql;
+        //echo $sql; 
+        #error_log("$aggregate_type:$sql");
         $rs = $this->query($sql, true);
         $row = $rs->fetchRow();
@@ -1455 +1461 @@
 
         # Test source of SQL for query 
-        if(stristr($conditions, "SELECT ")) {
-            # SQL completely specified in argument so use it as is
-            $sql = $conditions;
-        } 
-        else {
+        if(stristr($conditions, "SELECT ")) {        
+            # SQL completely specified in argument so use it as is
+            $sql = $conditions;      
+        } else {
 
             # If select fields not specified just do a SELECT *
@@ -1483 +1488 @@
             } elseif(array_key_exists('conditions', $this->default_scope) 
                      && !is_null($this->default_scope['conditions'])) {
-                $sql .= "WHERE ".$this->default_scope['conditions']." ";
+                $conditions = $this->default_scope['conditions'];
+                $sql .= "WHERE {$conditions} ";
             }
             
@@ -1542 +1548 @@
                 }
 
-                $sql .= "LIMIT {$this->rows_per_page} OFFSET {$offset}";
-                # $sql .= "LIMIT $offset, $this->rows_per_page";
-                
-                if($paginate) {
-                    #error_log("I am going to paginate.");
-                    # Set number of total pages in result set
-                    if($count = $this->count_all($this->primary_keys[0], $conditions, $joins)) {
+                if($paginate) {      
+                    #error_log("pagination sql:$sql");                          
+                    $pagination_rs = $this->query($sql); 
+                    if($count = $pagination_rs->numRows()) {
                         $this->pagination_count = $count;
                         $this->pages = (($count % $this->rows_per_page) == 0)
                             ? $count / $this->rows_per_page
                             : floor($count / $this->rows_per_page) + 1; 
-                    }
-                }
+                    } 
+                    /*                  
+                    #error_log("I am going to paginate.");
+                    # Set number of total pages in result set          
+                    $count_all_params = array(
+                        'conditions' => $conditions,
+                        'joins' => $joins,
+                        'group' => $group,
+                        'having' => $having
+                    );   
+                    
+                    if($count = $this->count_all($this->primary_keys[0], $count_all_params)) {
+                        $this->pagination_count = $count;
+                        $this->pages = (($count % $this->rows_per_page) == 0)
+                            ? $count / $this->rows_per_page
+                            : floor($count / $this->rows_per_page) + 1; 
+                    }  
+                    */
+                }  
+                
+                $sql .= "LIMIT {$this->rows_per_page} OFFSET {$offset}";
+                # $sql .= "LIMIT $offset, $this->rows_per_page";                
+                
             }
         }
@@ -1636 +1660 @@
             }
             # If callback is defined in model run it.
-            # this will probably hurt performance...
-            if(method_exists($object, 'after_find')) {
+            # this will probably hurt performance...  
+            if(method_exists($object, 'after_find')) { 
                 $object->after_find();    
-            }
+            } elseif(isset($this->after_find) && method_exists($object, $this->after_find)) {   
+                $object->{$this->after_find}();
+            }
             unset($object);
         }
@@ -1955 +1981 @@
             $this->raise($primary_key_value->getMessage());
         }            
-        $this->$primary_key = $primary_key_value;
+        $this->$primary_key = $primary_key_value;  
+        $this->new_record = false;
         if($primary_key_value != '') {
             if($this->auto_save_habtm) {

trunk/trax/vendor/trax/session.php

@@ -98 +98 @@
         Trax::$session_maxlifetime_minutes = Trax::$session_maxlifetime_minutes ? Trax::$session_maxlifetime_minutes : self::TRAX_SESSION_MAXLIFETIME_MINUTES;
         
-        # set the session default for this app
+        # set the session default for this app 
         ini_set('session.name', Trax::$session_name);
-        ini_set('session.use_cookies', 1);
+        ini_set('session.use_cookies', 1);     
+        if(Trax::$session_cookie_domain) {
+            ini_set('session.cookie_domain',  Trax::$session_cookie_domain); 
+        }       
         ini_set('session.cookie_lifetime', Trax::$session_lifetime);
         ini_set('session.gc_probability', 1);

trunk/trax/vendor/trax/trax.php

@@ -65 +65 @@
         $session_save_path = "",
         $session_name = "TRAXSESSID",
+        $session_cookie_domain = null,
         $session_lifetime = "0",
         $session_maxlifetime_minutes = "20",