Nick Clemens
90d85eaeb9
This patch adds the ability to rename columns in MySQL reports using a syntax:
[[column|alias]]
To test:
1 - Write a report like:
SELECT cardnumber FROM borrowers WHERE cardnumber LIKE '%9'
2 - Run report
3 - Note you can batch modify the patrons
4 - Update report:
SELECT cardnumber AS library_barcode FROM borrowers WHERE cardnumber LIKE '%9'
5 - Run report
6 - Note batch options are no longer present
7 - Apply patch
8 - Run report, no change
9 - Update report like:
SELECT [[cardnumber|library_barcode]] FROM borrowers WHERE cardnumber LIKE '%9'
10 - Run report
11 - Batch options work!
12 - Update report like:
SELECT cardnumber FROM borrowers WHERE cardnumber LIKE '%9'
13 - Verify batch options still work
14 - Set report 'public'
15 - Verify report can be run via JSON URLs:
http://kohadev.mydnsname.org:8080/cgi-bin/koha/svc/report?id=1
http://kohadev.mydnsname.org:8081/cgi-bin/koha/svc/report?id=1
Signed-off-by: George Williams <george@nekls.org>
Signed-off-by: George Williams <george@nekls.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
92 lines
2.7 KiB
Perl
Executable file
92 lines
2.7 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Copyright (C) 2011 Chris Cormack <chris@bigballofwax.co.nz>
|
|
# Copyright (C) 2013 Mark Tompsett
|
|
# Updated 2013 by 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 3 of the License, or (at your option) any later
|
|
# version.
|
|
#
|
|
# 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 Modern::Perl;
|
|
|
|
use C4::Reports::Guided;
|
|
use Koha::Reports;
|
|
use JSON;
|
|
use CGI qw ( -utf8 );
|
|
|
|
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();
|
|
|
|
die "Sorry this report is not public\n" unless $report_rec->public;
|
|
|
|
my @sql_params = $query->multi_param('sql_params');
|
|
|
|
my $cache = Koha::Caches->get_instance();
|
|
my $cache_active = $cache->is_cache_active;
|
|
my ($cache_key, $json_text);
|
|
if ($cache_active) {
|
|
$cache_key =
|
|
"opac:report:"
|
|
. ( $report_name ? "name:$report_name:" : "id:$report_id:" )
|
|
. join( '-', @sql_params );
|
|
$json_text = $cache->get_from_cache($cache_key);
|
|
}
|
|
|
|
unless ($json_text) {
|
|
my $offset = 0;
|
|
my $limit = C4::Context->preference("SvcMaxReportRows") || 10;
|
|
my $sql = $report_rec->savedsql;
|
|
|
|
# convert SQL parameters to placeholders
|
|
$sql =~ s/(<<.*?>>)/\?/g;
|
|
$sql =~ s/\[\[(.*?)\|(.*?)\]\]/$1 AS $2/g;
|
|
|
|
my ( $sth, $errors ) =
|
|
execute_query( $sql, $offset, $limit, \@sql_params, $report_id );
|
|
if ($sth) {
|
|
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,
|
|
{ expiry => $report_rec->cache_expiry } );
|
|
}
|
|
}
|
|
else {
|
|
$json_text = encode_json($errors);
|
|
}
|
|
}
|
|
|
|
print $query->header(
|
|
-charset => 'UTF-8',
|
|
-type => 'application/json'
|
|
);
|
|
print $json_text;
|