[open-ils-commits] r18736 - branches/rel_1_6/Open-ILS/src/reporter (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-11-15 10:16:52 -0500 (Mon, 15 Nov 2010)
New Revision: 18736

Modified:
   branches/rel_1_6/Open-ILS/src/reporter/clark-kent.pl
Log:
Reverting and extending r18472 to correct implementation thinko

Modified: branches/rel_1_6/Open-ILS/src/reporter/clark-kent.pl
===================================================================
--- branches/rel_1_6/Open-ILS/src/reporter/clark-kent.pl	2010-11-15 15:16:13 UTC (rev 18735)
+++ branches/rel_1_6/Open-ILS/src/reporter/clark-kent.pl	2010-11-15 15:16:52 UTC (rev 18736)
@@ -477,10 +477,12 @@
 
 	{	no warnings;
 		print $debug '<h1>Generated SQL</h1><pre>' . $r->{resultset}->toSQL() . "</pre><a href='$file'>Back to output index</a><hr/>";
-		print $debug '<h1>Template</h1><pre>' . Dumper( OpenSRF::Utils::JSON->JSON2perl( $r->{report}->{template} ) ) . "</pre><a href='$file'>Back to output index</a><hr/>";
-		print $debug '<h1>Report Parameter</h1><pre>' . Dumper( OpenSRF::Utils::JSON->JSON2perl( $r->{report} ) ) . "</pre><a href='$file'>Back to output index</a><hr/>";
+		print $debug '<h1>Template</h1><pre>' . Dumper( $r->{report}->{template} ) . "</pre><a href='$file'>Back to output index</a><hr/>";
+		print $debug '<h1>Template Data</h1><pre>' . Dumper( OpenSRF::Utils::JSON->JSON2perl( $r->{report}->{template}->{data} ) ) . "</pre><a href='$file'>Back to output index</a><hr/>";
+		print $debug '<h1>Report Parameter</h1><pre>' . Dumper( $r->{report} ) . "</pre><a href='$file'>Back to output index</a><hr/>";
+		print $debug '<h1>Report Parameter Data</h1><pre>' . Dumper( OpenSRF::Utils::JSON->JSON2perl( $r->{report}->{data} ) ) . "</pre><a href='$file'>Back to output index</a><hr/>";
 		print $debug '<h1>Report Run Time</h1><pre>' . $r->{resultset}->relative_time . "</pre><a href='$file'>Back to output index</a><hr/>";
-		print $debug '<h1>OpenILS::Reporter::SQLBuilder::ResultSet Object</h1><pre>' . Dumper( $r->{resultset} ) . "</pre><a href='report-data.html'>Back to output index</a>";
+		print $debug '<h1>OpenILS::Reporter::SQLBuilder::ResultSet Object</h1><pre>' . Dumper( $r->{resultset} ) . "</pre><a href='$file'>Back to output index</a>";
 	}
 
 	print $debug '</body></html>';