#!/usr/bin/perl
-# Copyright 2011 Chris Cormack <chris@bigballofwax.co.nz>
-#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Copyright (C) 2011 Chris Cormack <chris@bigballofwax.co.nz>
+# Copyright (C) 2013 Mark Tompsett
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
-use strict;
-use warnings;
+use Modern::Perl;
use C4::Auth;
use C4::Reports::Guided;
+use Koha::Reports;
use JSON;
-use CGI;
+use CGI qw ( -utf8 );
-use Koha::Cache;
+use Koha::Caches;
my $query = CGI->new();
my $report_id = $query->param('id');
my $report_name = $query->param('name');
+my $report_annotation = $query->param('annotated');
+
+my $report_recs = Koha::Reports->search( $report_name ? { 'report_name' => $report_name } : { 'id' => $report_id } );
+if (!$report_recs || $report_recs->count == 0 ) { die "There is no such report.\n"; }
+my $report_rec = $report_recs->next();
+
+my @sql_params = $query->param('sql_params');
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "intranet-main.tmpl",
+ template_name => "intranet-main.tt",
query => $query,
type => "intranet",
authnotrequired => 0,
}
);
-my $cache_active = Koha::Cache->is_cache_active;
-my ($cache_key, $cache, $json_text);
+my $cache = Koha::Caches->get_instance();
+my $cache_active = $cache->is_cache_active;
+my ($cache_key, $json_text);
if ($cache_active) {
- $cache_key = "intranet:report:".($report_name ? "name:$report_name" : "id:$report_id");
- $cache = Koha::Cache->new();
+ $cache_key = "intranet:report:".($report_name ? "report_name:$report_name" : "id:$report_id")
+ . join( '-', @sql_params );
$json_text = $cache->get_from_cache($cache_key);
}
unless ($json_text) {
- my $report_rec = get_saved_report($report_name ? { 'name' => $report_name } : { 'id' => $report_id });
my $offset = 0;
my $limit = C4::Context->preference("SvcMaxReportRows") || 10;
- my ( $sth, $errors ) = execute_query( $report_rec->{savedsql}, $offset, $limit );
+ my $sql = $report_rec->savedsql;
+
+ # convert SQL parameters to placeholders
+ $sql =~ s/(<<.*?>>)/\?/g;
+
+ my ( $sth, $errors ) = execute_query( $sql, $offset, $limit, \@sql_params, $report_id );
if ($sth) {
- my $lines = $sth->fetchall_arrayref;
- $json_text = to_json($lines);
+ my $lines;
+ if ($report_annotation) {
+ $lines = $sth->fetchall_arrayref({});
+ }
+ else {
+ $lines = $sth->fetchall_arrayref;
+ }
+ $json_text = encode_json($lines);
if ($cache_active) {
- $cache->set_in_cache( $cache_key, $json_text, $report_rec->{cache_expiry} );
+ $cache->set_in_cache( $cache_key, $json_text, { expiry => $report_rec->cache_expiry } );
}
}
else {
- $json_text = to_json($errors);
+ $json_text = encode_json($errors);
}
}
-print $query->header;
+print $query->header(
+ -charset => 'UTF-8',
+ -type => 'application/json'
+);
print $json_text;