X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=reports%2Fguided_reports.pl;h=ce9370aaf8001ced676beb3a129764b9516ed04c;hb=08b7589b8512f2bde2bbe9fc34aaf8b12ade0a49;hp=5458fe1eaf787dde87baacbb55df33f2ebaf4c2b;hpb=5278aa0ca4bb5110741b792b527725280a3ee902;p=koha_gimpoz
diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index 5458fe1eaf..ce9370aaf8 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -21,8 +21,9 @@ use strict;
#use warnings; FIXME - Bug 2505
use CGI;
use Text::CSV;
+use URI::Escape;
use C4::Reports::Guided;
-use C4::Auth;
+use C4::Auth qw/:DEFAULT get_session/;
use C4::Output;
use C4::Dates;
use C4::Debug;
@@ -61,8 +62,21 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
debug => 1,
}
);
+my $session = $cookie ? get_session($cookie->value) : undef;
+
+my $filter;
+if ( $input->param("filter_set") ) {
+ $filter = {};
+ $filter->{$_} = $input->param("filter_$_") foreach qw/date author keyword/;
+ $session->param('report_filter', $filter) if $session;
+ $template->param( 'filter_set' => 1 );
+}
+elsif ($session) {
+ $filter = $session->param('report_filter');
+}
+
- my @errors = ();
+my @errors = ();
if ( !$phase ) {
$template->param( 'start' => 1 );
# show welcome page
@@ -75,8 +89,15 @@ elsif ( $phase eq 'Build new' ) {
elsif ( $phase eq 'Use saved' ) {
# use a saved report
# get list of reports and display them
- $template->param( 'saved1' => 1 );
- $template->param( 'savedreports' => get_saved_reports() );
+ $template->param(
+ 'saved1' => 1,
+ 'savedreports' => get_saved_reports($filter),
+ );
+ if ($filter) {
+ while ( my ($k, $v) = each %$filter ) {
+ $template->param( "filter_$k" => $v ) if $v;
+ }
+ }
}
elsif ( $phase eq 'Delete Saved') {
@@ -133,6 +154,7 @@ elsif ( $phase eq 'Update SQL'){
update_sql( $id, $sql, $reportname, $notes );
$template->param(
'save_successful' => 1,
+ 'id' => $id,
);
}
@@ -367,9 +389,10 @@ elsif ( $phase eq 'Save Report' ) {
);
}
else {
- save_report( $borrowernumber, $sql, $name, $type, $notes );
+ my $id = save_report( $borrowernumber, $sql, $name, $type, $notes );
$template->param(
'save_successful' => 1,
+ 'id' => $id,
);
}
}
@@ -397,7 +420,21 @@ elsif ($phase eq 'Run this report'){
for(my $i=0;$i<($#split/2);$i++) {
my ($text,$authorised_value) = split /\|/,$split[$i*2+1];
my $input;
- if ($authorised_value) {
+ if ($authorised_value eq "date") {
+ $input = qq(
+
+
+ );
+ }
+ elsif ($authorised_value) {
my $dbh=C4::Context->dbh;
my @authorised_values;
my %authorised_lib;
@@ -484,7 +521,7 @@ elsif ($phase eq 'Run this report'){
$sql =~ s/<<$split[$i*2+1]>>/$quoted/;
}
my ($sth, $errors) = execute_query($sql, $offset, $limit);
- my $total = select_2_select_count_value($sql) || 0;
+ my $total = nb_rows($sql) || 0;
unless ($sth) {
die "execute_query failed to return sth for report $report: $sql";
} else {
@@ -498,7 +535,10 @@ elsif ($phase eq 'Run this report'){
}
my $totpages = int($total/$limit) + (($total % $limit) > 0 ? 1 : 0);
- my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report&phase=Run%20this%20report";
+ my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report&phase=Run%20this%20report";
+ if (@sql_params) {
+ $url = join('&sql_params=', $url, map { URI::Escape::uri_escape($_) } @sql_params);
+ }
$template->param(
'results' => \@rows,
'sql' => $sql,
@@ -513,7 +553,7 @@ elsif ($phase eq 'Run this report'){
}
elsif ($phase eq 'Export'){
- binmode STDOUT, ':utf8';
+ binmode STDOUT, ':encoding(UTF-8)';
# export results to tab separated text or CSV
my $sql = $input->param('sql'); # FIXME: use sql from saved report ID#, not new user-supplied SQL!
@@ -599,7 +639,7 @@ sub header_cell_loop {
}
foreach (1..6) {
- $template->param('build' . $_) and $template->param(buildx => $_) and last;
+ $template->{VARS}->{'build' . $_} and $template->{VARS}->{'buildx' . $_} and last;
}
$template->param( 'referer' => $input->referer(),
'DHTMLcalendar_dateformat' => C4::Dates->DHTMLcalendar(),