Changeset 9436 for branches/acq-experiment/Open-ILS/src/reporter/clark-kent.pl

Timestamp:

04/22/08 22:06:38 (2 months ago)

Author:

erickson

Message:

Merged revisions 9425,9428,9430-9435 via svnmerge from
svn://svn.open-ils.org/ILS/trunk

........

r9425 | erickson | 2008-04-22 10:36:27 -0400 (Tue, 22 Apr 2008) | 1 line

default estimated hit count to 0 to protect against null counts in the case of a search timeout/failure

........

r9428 | erickson | 2008-04-22 14:01:05 -0400 (Tue, 22 Apr 2008) | 1 line

added support for defining pivot data and label columns

........

r9430 | erickson | 2008-04-22 14:32:12 -0400 (Tue, 22 Apr 2008) | 1 line

added support for taking pivot info from the report def

........

r9431 | miker | 2008-04-22 21:41:36 -0400 (Tue, 22 Apr 2008) | 1 line

move the translation widget out to openils.widget

........

r9432 | miker | 2008-04-22 21:42:25 -0400 (Tue, 22 Apr 2008) | 1 line

move the translation widget out to openils.widget

........

r9433 | miker | 2008-04-22 21:42:49 -0400 (Tue, 22 Apr 2008) | 1 line

OO-ify openils.User

........

r9434 | miker | 2008-04-22 21:45:21 -0400 (Tue, 22 Apr 2008) | 1 line

typo in name

........

r9435 | miker | 2008-04-22 22:03:48 -0400 (Tue, 22 Apr 2008) | 1 line

back-compat global population

........

Location:

branches/acq-experiment

Files:

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

branches/acq-experiment/Open-ILS/src/reporter/clark-kent.pl

@@ -15 +15 @@
 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;
@@ -134 +134 @@
 
         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;
@@ -162 +166 @@
                 SQL
 
+            $logger->debug('Report SQL: ' . $r->{resultset}->toSQL);
                 $sth = $dbh->prepare($r->{resultset}->toSQL);