Merge remote-tracking branch 'origin/new/bug_7412'

[koha.git] / svc / report

diff --git a/svc/report b/svc/report
index 18e1986..654ef15 100755 (executable)
--- a/svc/report
+++ b/svc/report
@@ -30,9 +30,8 @@ use Koha::Cache;
 
 
 my $query  = CGI->new();
-my $report = $query->param('id');
-
-my $cache;
+my $report_id = $query->param('id');
+my $report_name = $query->param('name');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -44,28 +43,31 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-if (Koha::Cache->is_cache_active) {
+my $cache_active = Koha::Cache->is_cache_active;
+my ($cache_key, $cache, $json_text);
+if ($cache_active) {
+    $cache_key = "intranet:report:".($report_name ? "name:$report_name" : "id:$report_id");
     $cache = Koha::Cache->new();
-    my $page = $cache->get_from_cache("intranet:report:$report");
-    if ($page) {
-        print $query->header;
-        print $page;
-        exit;
+    $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 );
+    if ($sth) {
+        my $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;
-
-# $public isnt used for intranet
-my ( $sql, $type, $name, $notes, $cache_expiry, $public ) =
-  get_saved_report($report);
-my $offset = 0;
-my $limit  = C4::Context->preference("SvcMaxReportRows") || 10;
-my ( $sth, $errors ) = execute_query( $sql, $offset, $limit );
-my $lines     = $sth->fetchall_arrayref;
-my $json_text = to_json($lines);
 print $json_text;
-
-if (Koha::Cache->is_cache_active) {
-    $cache->set_in_cache( "intranet:report:$report", $json_text, $cache_expiry );
-}