1931d2d22f
This patch teaches C4::Reports::Guided::execute_query()
how to accept a list of query parameter values. It then
follows-up on the main patch by simplifying how it converts
report parameters to a complete SQL query, and removes the
use of DBI->quote() and complicated regexes.
To test:
[1] Verify that using the OPAC svc/report service with
sql_params continues to work.
[2] Verify that there are no regressions with running
reports from the staff interface, both via the web
service and the reports interface.
[3] Verify that prove -v /db_dependent/Reports_Guided.t passes.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
No regressions found.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
89 lines
2.5 KiB
Perl
Executable file
89 lines
2.5 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 JSON;
|
|
use CGI;
|
|
|
|
use Koha::Cache;
|
|
|
|
my $query = CGI->new();
|
|
my $report_id = $query->param('id');
|
|
my $report_name = $query->param('name');
|
|
my $report_annotation = $query->param('annotated');
|
|
|
|
my $report_rec = get_saved_report( $report_name ? { 'name' => $report_name } : { 'id' => $report_id } );
|
|
if (!$report_rec) { die "There is no such report.\n"; }
|
|
|
|
die "Sorry this report is not public\n" unless $report_rec->{public};
|
|
|
|
my @sql_params = $query->param('sql_params');
|
|
|
|
my $cache_active = Koha::Cache->is_cache_active;
|
|
my ( $cache_key, $cache, $json_text );
|
|
if ($cache_active) {
|
|
$cache_key =
|
|
"opac:report:"
|
|
. ( $report_name ? "name:$report_name" : "id:$report_id" )
|
|
. @sql_params;
|
|
$cache = Koha::Cache->new();
|
|
$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;
|
|
|
|
my ( $sth, $errors ) =
|
|
execute_query( $sql, $offset, $limit, \@sql_params );
|
|
if ($sth) {
|
|
my $lines;
|
|
if ($report_annotation) {
|
|
$lines = $sth->fetchall_arrayref({});
|
|
}
|
|
else {
|
|
$lines = $sth->fetchall_arrayref;
|
|
}
|
|
$json_text = to_json($lines);
|
|
|
|
if ($cache_active) {
|
|
$cache->set_in_cache( $cache_key, $json_text,
|
|
$report_rec->{cache_expiry} );
|
|
}
|
|
}
|
|
else {
|
|
$json_text = to_json($errors);
|
|
}
|
|
}
|
|
|
|
print $query->header(
|
|
-charset => 'UTF-8',
|
|
-type => 'application/json'
|
|
);
|
|
print $json_text;
|