Bug 3280 Restrict Send basket feature

[srvgit] / opac / svc / report

diff --git a/opac/svc/report b/opac/svc/report
index e60e924..0f9d5fb 100755 (executable)
--- a/opac/svc/report
+++ b/opac/svc/report
@@ -13,10 +13,10 @@
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-#
+# 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.
+
 
 use strict;
 use warnings;
@@ -25,27 +25,21 @@ use C4::Reports::Guided;
 use JSON;
 use CGI;
 
+use Koha::Cache;
+
 my $query  = CGI->new();
 my $report = $query->param('id');
 
 my $cache;
-my $usecache = C4::Context->ismemcached;
 
 my ( $sql, $type, $name, $notes, $cache_expiry, $public ) =
   get_saved_report($report);
 die "Sorry this report is not public\n" unless $public;
 
-if ($usecache) {
-    require Koha::Cache;
-    Koha::Cache->import();
+if (Koha::Cache->is_cache_active) {
     $cache = Koha::Cache->new(
-        {
-            'cache_type'    => 'memcached',
-            'cache_servers' => $ENV{'MEMCACHED_SERVERS'}
-        }
     );
-    my $namespace = $ENV{'MEMCACHED_NAMESPACE'} || 'koha';
-    my $page = $cache->get_from_cache("$namespace:opac:report:$report");
+    my $page = $cache->get_from_cache("opac:report:$report");
     if ($page) {
         print $query->header;
         print $page;
@@ -55,14 +49,12 @@ if ($usecache) {
 
 print $query->header;
 my $offset = 0;
-my $limit  = 10;
+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 ($usecache) {
-    my $namespace = $ENV{'MEMCACHED_NAMESPACE'} || 'koha';
-    $cache->set_in_cache( "$namespace:opac:report:$report",
-        $json_text, $cache_expiry );
+if (Koha::Cache->is_cache_active) {
+    $cache->set_in_cache( "opac:report:$report", $json_text, $cache_expiry );
 }