X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=svc%2Freport;h=d16485d4c0f4c5ace45b5c507937975e9cbf1f0d;hb=957d583d2efce66e31fe05f229fda91c58324bc2;hp=ca4fbea2b0ae0781dfffd258de0decbe4052b15f;hpb=afd2418d7387dc2a50835128e24840686600ef4b;p=srvgit

diff --git a/svc/report b/svc/report
index ca4fbea2b0..d16485d4c0 100755
--- a/svc/report
+++ b/svc/report
@@ -22,10 +22,11 @@ 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();
@@ -33,8 +34,11 @@ 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 $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->multi_param('sql_params');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -46,18 +50,25 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $cache = Koha::Cache->get_instance();
+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_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 $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;
+    $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) {
@@ -69,7 +80,7 @@ unless ($json_text) {
         $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 {