X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=svc%2Freport;h=0cff7dc4c1ccce9743926b31356a7516498612d9;hb=aace5d436dbab1f13e2e1c06d0b4ed5f1ec13ced;hp=476475cfccb43623b0cfad9fcaabcebf1c4f82a4;hpb=e584ba169e3301182196e5aca66a32e0bcd229a9;p=koha-ffzg.git

diff --git a/svc/report b/svc/report
index 476475cfcc..0cff7dc4c1 100755
--- a/svc/report
+++ b/svc/report
@@ -1,36 +1,40 @@
 #!/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 Koha::Cache;
+
+
 my $query  = CGI->new();
-my $report = $query->param('id');
+my $report_id = $query->param('id');
+my $report_name = $query->param('name');
+my $report_annotation = $query->param('annotated');
 
-my $cache;
-my $usecache = C4::Context->ismemcached;
+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 ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -42,38 +46,39 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-if ($usecache) {
-    require Koha::Cache;
-    Koha::Cache->import();
-    $cache = Koha::Cache->new(
-        {
-            'cache_type'    => 'memcached',
-            'cache_servers' => $ENV{'MEMCACHED_SERVERS'}
+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();
+    $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 );
+    if ($sth) {
+        my $lines;
+        if ($report_annotation) {
+            $lines = $sth->fetchall_arrayref({});
+        }
+        else {
+            $lines = $sth->fetchall_arrayref;
         }
-    );
-    my $namespace = $ENV{'MEMCACHED_NAMESPACE'} || 'koha';
-    my $page = $cache->get_from_cache("$namespace:intranet:report:$report");
-    if ($page) {
-        print $query->header;
-        print $page;
-        exit;
+        $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 $query->header(
+    -charset    => 'UTF-8',
+    -type       => 'application/json'
+);
 print $json_text;
-
-if ($usecache) {
-    my $namespace = $ENV{'MEMCACHED_NAMESPACE'} || 'koha';
-    $cache->set_in_cache( "$namespace:intranet:report:$report",
-        $json_text, $cache_expiry );
-}