X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=svc%2Freport;h=da1b9b3286b0eef1fefdf5837dc774088c8ba1a2;hb=8e9f89e92b48f1aac786e9b5608338a14603f52f;hp=654ef1572b76c231badabfc1e1c782510734bee6;hpb=42acfbf75b7bb4ee53c6a6f035e258a0b522ce10;p=koha.git

diff --git a/svc/report b/svc/report
index 654ef1572b..da1b9b3286 100755
--- a/svc/report
+++ b/svc/report
@@ -1,30 +1,29 @@
 #!/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 JSON;
-use CGI;
+use CGI qw ( -utf8 );
 
 use Koha::Cache;
 
@@ -32,10 +31,16 @@ 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"; }
+
+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,
@@ -43,31 +48,45 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $cache_active = Koha::Cache->is_cache_active;
-my ($cache_key, $cache, $json_text);
+my $cache = Koha::Cache->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 ? "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 );
     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} );
         }
     }
     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;