Changeset 9429

Timestamp:

04/22/08 14:30:06 (6 months ago)

Author:

erickson

Message:

added support for taking pivot info from the report def

Files:

• branches/rel_1_2/Open-ILS/src/reporter/clark-kent.pl (modified) (3 diffs)

branches/rel_1_2/Open-ILS/src/reporter/clark-kent.pl

@@ -14 +14 @@
 use OpenSRF::Utils qw/:daemon/;
 use OpenSRF::Utils::JSON;
-#use OpenSRF::Utils::Logger qw/:level/;
+use OpenSRF::Utils::Logger qw/$logger/;
 use OpenSRF::System;
 use OpenSRF::AppSession;
@@ -133 +133 @@
 
         my $b = OpenILS::Reporter::SQLBuilder->new;
-        $b->register_params( OpenSRF::Utils::JSON->JSON2perl( $r->{report}->{data} ) );
+        my $report_data = OpenSRF::Utils::JSON->JSON2perl( $r->{report}->{data} );
+        $b->register_params( $report_data );
 
         $r->{resultset} = $b->parse_report( OpenSRF::Utils::JSON->JSON2perl( $r->{report}->{template}->{data} ) );
+        $r->{resultset}->set_pivot_data($report_data->{__pivot_data}) if $report_data->{__pivot_data};
+        $r->{resultset}->set_pivot_label($report_data->{__pivot_label}) if $report_data->{__pivot_label};
+        $r->{resultset}->set_pivot_default($report_data->{__pivot_default}) if $report_data->{__pivot_default};
         $r->{resultset}->relative_time($r->{run_time});
         push @reports, $r;
@@ -161 +165 @@
                 SQL
 
+            $logger->debug('Report SQL: ' . $r->{resultset}->toSQL);
                 $sth = $dbh->prepare($r->{resultset}->toSQL);