Changeset 91 for branches/1.1dev/lib

Timestamp:

Apr 9, 2006 3:39:08 AM (18 years ago)

Author:

scdev

Message:

added tree functions to print nested <li>

Location:

branches/1.1dev/lib

Files:

• Hierarchy.inc.php (modified) (12 diffs)
• ScriptTimer.inc.php (modified) (2 diffs)

branches/1.1dev/lib/Hierarchy.inc.php

@@ -354 +354 @@
                 $child_id =& $this->child_id;
             } else {
-                logMsg(_("getParents failed. Arguments not specified properly."), LOG_ERR, __FILE__, __LINE__);
+                logMsg(_("getParents failed. Arguments not specified properly."), resource_tbl, __FILE__, __LINE__);
                 return false;
             }
@@ -402 +402 @@
                 $child_id =& $this->child_id;
             } else {
-                logMsg(_("getNode failed. Arguments not specified properly."), LOG_ERR, __FILE__, __LINE__);
+                logMsg(_("getNode failed. Arguments not specified properly."), resource_tbl, __FILE__, __LINE__);
                 return false;
             }
@@ -408 +408 @@
         
         $qid = dbQuery("
-            SELECT child_type, child_id, title, subnode_quantity
+            SELECT *
             FROM node_tbl 
             WHERE child_type = '" . mysql_real_escape_string($child_type) . "'
@@ -443 +443 @@
                 $child_id =& $this->child_id;
             } else {
-                logMsg(_("getChildren failed. Arguments not specified properly."), LOG_ERR, __FILE__, __LINE__);
+                logMsg(_("getChildren failed. Arguments not specified properly."), resource_tbl, __FILE__, __LINE__);
                 return false;
             }
@@ -492 +492 @@
                 $child_id =& $this->child_id;
             } else {
-                logMsg(_("getNumberChildren failed. Arguments not specified properly."), LOG_ERR, __FILE__, __LINE__);
+                logMsg(_("getNumberChildren failed. Arguments not specified properly."), resource_tbl, __FILE__, __LINE__);
                 return false;
             }
@@ -530 +530 @@
                 $child_id =& $this->child_id;
             } else {
-                logMsg(_("isLeaf failed. Arguments not specified properly."), LOG_ERR, __FILE__, __LINE__);
+                logMsg(_("isLeaf failed. Arguments not specified properly."), resource_tbl, __FILE__, __LINE__);
                 return false;
             }
@@ -641 +641 @@
                 $child_id =& $this->child_id;
             } else {
-                logMsg(_("nodeExists failed. Arguments not specified properly."), LOG_ERR, __FILE__, __LINE__);
+                logMsg(_("nodeExists failed. Arguments not specified properly."), resource_tbl, __FILE__, __LINE__);
                 return false;
             }
@@ -748 +748 @@
     }
     
-    function convertListToTree($curr, $child_type=null, $child_id=null, $_return_flag=true)
+    function convertListToTree($curr, $child_type=null, $child_id=null, $_indent=0)
     {
         if (!is_array($curr) || empty($curr)) {
@@ -757 +757 @@
         static $children_map;
         static $node_map;
-        
+
         // The original $curr contains the full list. Save a copy of this.
         if (!isset($orig)) {
@@ -765 +765 @@
             $children_map = array();
             foreach ($orig as $i => $n) {
-                $n_parent = $this->toStringID($n['parent_type'], $n['parent_id']);
+                $n_parent = ('' != $n['parent_type'] && '' != $n['parent_id']) ? $this->toStringID($n['parent_type'], $n['parent_id']) : 'null__00';
                 $n_child = $this->toStringID($n['child_type'], $n['child_id']);
                 $children_map[$n_parent][] = $n_child;
@@ -786 +786 @@
             }
         }
-        
+
+        if (!isset($curr['indent'])) {
+            $curr['indent'] = $_indent;
+        }
+
         // Get children of current node.
         $curr_str_id = $this->toStringID($curr['child_type'], $curr['child_id']);
@@ -794 +798 @@
         if (!empty($curr_children)) {
             foreach ($curr_children as $child) {
-                $curr['children'][] = $this->convertListToTree($orig[$node_map[$child]], null, null, false);
-            }
-        }
-        
-        if ($_return_flag) {
+                $curr['children'][] = $this->convertListToTree($orig[$node_map[$child]], null, null, $_indent + 1);
+            }
+        }
+        
+        if ($_indent === 0) {
             // We must reset the static variables so that they do
             // not fill up during subsequent function calls.

branches/1.1dev/lib/ScriptTimer.inc.php

@@ -7 +7 @@
 class ScriptTimer {
 
-    var $time_format = '%.10f';
-    var $_timing_start_times;
-    var $_timing_stop_times;
+    var $time_format = '%.10s';
+    var $_timing_start_times = array();
+    var $_timing_stop_times = array();
+    var $_timing_cumulative_times = array();
     
-    function start ($name = 'default') {
+    function start($name='default') {
         $this->_timing_start_times[$name] = explode(' ', microtime());
     }
     
-    function stop($name = 'default') {
-        $this->_timing_stop_times[$name] = explode(' ', microtime());
+    function stop($name='default') {
+        $this->_timing_cumulative_times[$name] += $this->getTime($name);
     }
     
-    function getTime($name = 'default') {
+    function getTime($name='default') {
         if (!isset($this->_timing_start_times[$name])) {
             return 0;
@@ -31 +32 @@
         $current = $stop_time[1] - $this->_timing_start_times[$name][1];
         $current += $stop_time[0] - $this->_timing_start_times[$name][0];
-        return sprintf($this->time_format, $current);
+        return $current;
+    }
+    
+    function printAll($sort_by_time=false)
+    {
+        $names = array_map('strlen', array_keys($this->_timing_start_times));
+        sort($names);
+        $name_len = end($names);
+        
+        if ($sort_by_time) {
+           arsort($this->_timing_cumulative_times, SORT_NUMERIC);
+        }
+        
+        $this->_timing_cumulative_times["TOTAL"] = array_sum($this->_timing_cumulative_times);
+
+        echo '<pre>';
+        foreach ($this->_timing_cumulative_times as $name => $time) {
+            printf("\n%-{$name_len}s $this->time_format", $name, $time);
+        }
+        echo '</pre>';
     }
 }