Bug 6739: (follow-up) update DBIC schema classes

[koha_fer] / opac / svc / report

diff --git a/opac/svc/report b/opac/svc/report
index f6cd6b9..326e276 100755 (executable)
--- a/opac/svc/report
+++ b/opac/svc/report
@@ -1,25 +1,27 @@
 #!/usr/bin/perl
 
-# Copyright 2011 Chris Cormack <chris@bigballofwax.co.nz>
+# 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 2 of the License, or (at your option) any later
+# 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.
+# 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, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
+# 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::Reports::Guided;
 use JSON;
@@ -27,8 +29,8 @@ use CGI;
 
 use Koha::Cache;
 
-my $query  = CGI->new();
-my $report_id = $query->param('id');
+my $query       = CGI->new();
+my $report_id   = $query->param('id');
 my $report_name = $query->param('name');
 my $report_annotation = $query->param('annotated');
 
@@ -37,18 +39,29 @@ 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);
+my ( $cache_key, $cache, $json_text );
 if ($cache_active) {
-    $cache_key = "opac:report:".($report_name ? "name:$report_name" : "id:$report_id");
-    $cache = Koha::Cache->new();
+    $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 ( $sth, $errors ) = execute_query( $report_rec->{savedsql}, $offset, $limit );
+    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) {
@@ -57,16 +70,20 @@ unless ($json_text) {
         else {
             $lines = $sth->fetchall_arrayref;
         }
-        $json_text = to_json($lines);
+        $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,
+                $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;