my $query = CGI->new();
-my $report = $query->param('id');
+my $report_id = $query->param('id');
+my $report_name = $query->param('name');
my $cache;
+my $sql;
+my $type;
+my $notes;
+my $cache_expiry;
+my $public;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
);
if (Koha::Cache->is_cache_active) {
+ if ($report_name) { # When retrieving by name, we have to hit the
+ # database to get the ID before we can check
+ # the cache. Yuck.
+ ( $sql, $type, $report_name, $notes, $cache_expiry, $public, $report_id ) =
+ get_saved_report( { 'name' => $report_name } );
+ }
+
$cache = Koha::Cache->new();
- my $page = $cache->get_from_cache("intranet:report:$report");
+ my $page = $cache->get_from_cache("intranet:report:$report_id");
if ($page) {
print $query->header;
print $page;
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;
+unless ($sql) {
+ ( $sql, $type, $report_name, $notes, $cache_expiry, $public, $report_id ) =
+ get_saved_report($report_name ? { 'name' => $report_name } : { 'id' => $report_id } );
+}
+if ($sql) {
+ 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 );
+ if (Koha::Cache->is_cache_active) {
+ $cache->set_in_cache( "intranet:report:$report_id", $json_text, $cache_expiry );
+ }
}