From a5d3ff0b70fb6d797af33b9990cec5c05a8e4b58 Mon Sep 17 00:00:00 2001
From: abijah <abijah@97e9348a-65ac-dc4b-aefc-98561f571b83>
Date: Mon, 3 Aug 2009 19:41:49 +0000
Subject: [PATCH] Added the ability to suppress logging at display time.  I'd
 like to add an additional log level, the first which passes or suppresses the
 print, and the second which defaultly displays or hides the output.  Perhaps
 next checkin.

git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@474 97e9348a-65ac-dc4b-aefc-98561f571b83
---
 site/app_controller.php |  2 ++
 site/app_model.php      | 59 ++++++++++++++++++++++++++++++++---------
 2 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/site/app_controller.php b/site/app_controller.php
index ecf1815..9d306a5 100644
--- a/site/app_controller.php
+++ b/site/app_controller.php
@@ -47,6 +47,8 @@ class AppController extends Controller {
 		 array('name' => 'Customers',   'url' => array('controller' => 'customers',  'action' => 'index')),
 		 array('name' => 'Accounts',    'url' => array('controller' => 'accounts',   'action' => 'index')),
 		 array('name' => 'Debug',      'header' => true),
+		 array('name' => 'Un-Nuke',    'url' => '#', 'htmlAttributes' =>
+		       array('onclick' => '$(".pr-section").show(); return false;')),
 		 array('name' => 'Contacts',    'url' => array('controller' => 'contacts',   'action' => 'index')),
 		 array('name' => 'Ledgers',     'url' => array('controller' => 'ledgers',    'action' => 'index')),
 		 array('name' => 'New Ledgers', 'url' => array('controller' => 'accounts',    'action' => 'newledger')),
diff --git a/site/app_model.php b/site/app_model.php
index 782c285..e021cc6 100644
--- a/site/app_model.php
+++ b/site/app_model.php
@@ -142,12 +142,27 @@ class AppModel extends Model {
     }
 
     static $pr_unique_number = 0;
-    $pr_id = $class . '-' . (++$pr_unique_number);
+    $pr_id = 'pr-section-class-' . $class . '-print-' . (++$pr_unique_number);
+    $pr_trace_id = $pr_id . '-trace';
+
+    $pr_entire_base_class = "pr-section";
+    $pr_entire_class_class = $pr_entire_base_class . '-class-' . $class;
+    $pr_entire_function_class = $pr_entire_class_class . '-function-' . $function;
+    $pr_entire_class = "$pr_entire_base_class $pr_entire_class_class $pr_entire_function_class";
+    $pr_header_class = "pr-caller";
+    $pr_trace_class  = "pr-trace";
+    $pr_output_base_class = 'pr-output';
+    $pr_output_class_class = $pr_output_base_class . '-class-' . $class;
+    $pr_output_function_class = $pr_output_class_class . '-function-' . $function;
+    $pr_output_class = "$pr_output_base_class $pr_output_class_class $pr_output_function_class";
+
+    echo '<DIV class="'.$pr_entire_class.'" id="'.$pr_id.'">'."\n";
+    echo '<DIV class="'.$pr_header_class.'">'."\n";
+    echo '<DIV class="'.$pr_trace_class.'" id="'.$pr_trace_id.'" style="display:none;">'."\n";
+
+    // Flip trace around so the sequence flows from top to bottom
+    // Then print out the entire stack trace (in hidden div)
     $trace = array_reverse($trace);
-
-    echo '<DIV CLASS="pr-caller">'."\n";
-    echo '<DIV id="'.$pr_id.'" style="display:none;">'."\n";
-
     for ($i = 0; $i < count($trace); ++$i) {
       $bline = $trace[$i]['line'];
       $bfile = $trace[$i]['file'];
@@ -162,18 +177,36 @@ class AppModel extends Model {
 	$bclas = null;
       }
 
-      echo("$bfile:$bline (" . ($bclas ? "$bclas::$bfunc" : "entry point") . ")<BR>");
-      //echo(($bclas ? "$bclas::$bfunc" : "entry point") . "; $bfile : $bline<BR>");
+      echo("$bfile:$bline (" . ($bclas ? "$bclas::$bfunc" : "entry point") . ")<BR>\n");
+      //echo(($bclas ? "$bclas::$bfunc" : "entry point") . "; $bfile : $bline<BR>\n");
     }
-    echo '</DIV>' . "\n";
+    echo '</DIV>' . "\n"; // End pr_trace_class
     $file = str_replace(ROOT.DS, '', $file);
     $file = str_replace(CAKE_CORE_INCLUDE_PATH.DS, '', $file);
-    echo '<strong>' . $file . '</strong>:<strong>' . $line . '</strong>'.";\n";
-    echo ' <A HREF="#" onclick="$' . "('#{$pr_id}').slideToggle(); return false;" . '">stack</A>'.";\n";
-    echo ' L' . $level . "\n";
-    echo '</DIV>' . "\n";
+    echo "<strong>$file:$line ($class::$function)</strong>" . ";\n";
+    echo ' L' . $level . ";\n";
+    echo ' <A HREF="#" onclick="$' . "('#{$pr_trace_id}').slideToggle(); return false;" . '">stack</A>'.";\n";
 
-    pr(array("{$class}::{$function}" => $mixed), false, false);
+    echo " all ";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_output_base_class}').show(); return false;" . '">s</A>'."/";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_output_base_class}').hide(); return false;" . '">h</A>'."/";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_entire_base_class}').hide(); return false;" . '">n</A>'.";\n";
+
+    echo " $class ";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_output_class_class}').slideDown(); return false;" . '">s</A>'."/";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_output_class_class}').slideUp(); return false;" . '">h</A>'."/";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_entire_class_class}').hide(); return false;" . '">n</A>'.";\n";
+
+    echo " $function ";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_output_function_class}').slideDown(); return false;" . '">s</A>'."/";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_output_function_class}').slideUp(); return false;" . '">h</A>'."/";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_entire_function_class}').hide(); return false;" . '">n</A>'."\n";
+    echo '</DIV>' . "\n"; // End pr_header_class
+
+    echo '<DIV CLASS="'.$pr_output_class.'">'."\n";
+    pr($mixed, false, false);
+    echo '</DIV>' . "\n"; // End pr_output_class
+    echo '</DIV>' . "\n"; // End pr_entire_class
   }
 
   function pr($level, $mixed, $checkpoint = null) {