use C4::Auth qw/:DEFAULT get_session/;
use C4::Output;
use C4::Debug;
-use C4::Koha qw/GetFrameworksLoop/;
-use C4::Branch;
use C4::Context;
use Koha::Caches;
use C4::Log;
use Koha::DateUtils qw/dt_from_string output_pref/;
use Koha::AuthorisedValue;
use Koha::AuthorisedValues;
+use Koha::BiblioFrameworks;
+use Koha::Libraries;
use Koha::Patron::Categories;
=head1 NAME
my $phase = $input->param('phase') // '';
my $flagsrequired;
-if ( $phase eq 'Build new' or $phase eq 'Delete Saved' ) {
+if ( ( $phase eq 'Build new' ) || ( $phase eq 'Create report from SQL' ) || ( $phase eq 'Edit SQL' ) ){
$flagsrequired = 'create_reports';
}
elsif ( $phase eq 'Use saved' ) {
$flagsrequired = 'execute_reports';
-} else {
+}
+elsif ( $phase eq 'Delete Saved' ) {
+ $flagsrequired = 'delete_reports';
+}
+else {
$flagsrequired = '*';
}
$filter = $session->param('report_filter');
}
+my $op = $input->param('op') || q||;
my @errors = ();
if ( !$phase ) {
);
} elsif ( $phase eq 'Use saved' ) {
+ if ( $op eq 'convert' ) {
+ my $report_id = $input->param('report_id');
+ my $report = C4::Reports::Guided::get_saved_report($report_id);
+ if ($report) {
+ my $updated_sql = C4::Reports::Guided::convert_sql( $report->{savedsql} );
+ C4::Reports::Guided::update_sql(
+ $report_id,
+ {
+ sql => $updated_sql,
+ name => $report->{report_name},
+ group => $report->{report_group},
+ subgroup => $report->{report_subgroup},
+ notes => $report->{notes},
+ public => $report->{public},
+ cache_expiry => $report->{cache_expiry},
+ }
+ );
+ $template->param( report_converted => $report->{report_name} );
+ }
+ }
+
# use a saved report
# get list of reports and display them
my $group = $input->param('group');
my $subgroup = $input->param('subgroup');
$filter->{group} = $group;
$filter->{subgroup} = $subgroup;
+ my $reports = get_saved_reports($filter);
+ my $has_obsolete_reports;
+ for my $report ( @$reports ) {
+ $report->{results} = C4::Reports::Guided::get_results( $report->{id} );
+ if ( $report->{savedsql} =~ m|biblioitems| and $report->{savedsql} =~ m|marcxml| ) {
+ $report->{seems_obsolete} = 1;
+ $has_obsolete_reports++;
+ }
+ }
$template->param(
'saved1' => 1,
- 'savedreports' => get_saved_reports($filter),
+ 'savedreports' => $reports,
'usecache' => $usecache,
'groups_with_subgroups'=> groups_with_subgroups($group, $subgroup),
filters => $filter,
+ has_obsolete_reports => $has_obsolete_reports,
);
}
}
elsif ($phase eq 'retrieve results') {
- my $id = $input->param('id');
- my ($results,$name,$notes) = format_results($id);
- # do something
- $template->param(
- 'retresults' => 1,
- 'results' => $results,
- 'name' => $name,
- 'notes' => $notes,
+ my $id = $input->param('id');
+ my $result = format_results( $id );
+ $template->param(
+ report_name => $result->{report_name},
+ notes => $result->{notes},
+ saved_results => $result->{results},
+ date_run => $result->{date_run},
);
}
'report_id' => $report_id,
);
- my ( $sql, $type, $name, $notes );
+ my ( $sql, $original_sql, $type, $name, $notes );
if (my $report = get_saved_report($report_id)) {
- $sql = $report->{savedsql};
+ $sql = $original_sql = $report->{savedsql};
$name = $report->{report_name};
$notes = $report->{notes};
my %authorised_lib;
# builds list, depending on authorised value...
if ( $authorised_value eq "branches" ) {
- my $branches = GetBranchesLoop();
- foreach my $thisbranch (@$branches) {
- push @authorised_values, $thisbranch->{value};
- $authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname};
+ my $libraries = Koha::Libraries->search( {}, { order_by => ['branchname'] } );
+ while ( my $library = $libraries->next ) {
+ push @authorised_values, $library->branchcode;
+ $authorised_lib{$library->branchcode} = $library->branchname;
}
}
elsif ( $authorised_value eq "itemtypes" ) {
}
}
elsif ( $authorised_value eq "biblio_framework" ) {
- my $frameworks = GetFrameworksLoop();
+ my @frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
my $default_source = '';
push @authorised_values,$default_source;
$authorised_lib{$default_source} = 'Default';
- foreach my $framework (@$frameworks) {
- push @authorised_values, $framework->{value};
- $authorised_lib{$framework->{value}} = $framework->{description};
+ foreach my $framework (@frameworks) {
+ push @authorised_values, $framework->frameworkcode;
+ $authorised_lib{$framework->frameworkcode} = $framework->frameworktext;
}
}
elsif ( $authorised_value eq "cn_source" ) {
'reports' => $report_id,
);
} else {
- # OK, we have parameters, or there are none, we run the report
- # if there were parameters, replace before running
- # split on ??. Each odd (2,4,6,...) entry should be a parameter to fill
- my @split = split /<<|>>/,$sql;
- my @tmpl_parameters;
- for(my $i=0;$i<$#split/2;$i++) {
- my $quoted = $sql_params[$i];
- # if there are special regexp chars, we must \ them
- $split[$i*2+1] =~ s/(\||\?|\.|\*|\(|\)|\%)/\\$1/g;
- if ($split[$i*2+1] =~ /\|\s*date\s*$/) {
- $quoted = output_pref({ dt => dt_from_string($quoted), dateformat => 'iso', dateonly => 1 }) if $quoted;
- }
- $quoted = C4::Context->dbh->quote($quoted);
- $sql =~ s/<<$split[$i*2+1]>>/$quoted/;
- }
- my ($sth, $errors) = execute_query($sql, $offset, $limit);
+ my $sql = get_prepped_report( $sql, @sql_params );
+ my ( $sth, $errors ) = execute_query( $sql, $offset, $limit, undef, $report_id );
my $total = nb_rows($sql) || 0;
unless ($sth) {
die "execute_query failed to return sth for report $report_id: $sql";
$template->param(
'results' => \@rows,
'sql' => $sql,
+ original_sql => $original_sql,
'id' => $report_id,
'execute' => 1,
'name' => $name,
'notes' => $notes,
'errors' => defined($errors) ? [ $errors ] : undef,
- 'pagination_bar' => pagination_bar($url, $totpages, $input->param('page')),
+ 'pagination_bar' => pagination_bar($url, $totpages, scalar $input->param('page')),
'unlimited_total' => $total,
'sql_params' => \@sql_params,
);
elsif ($phase eq 'Export'){
# 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!
- my $format = $input->param('format');
- my $reportname = $input->param('reportname');
+ my $report_id = $input->param('report_id');
+ my $report = get_saved_report($report_id);
+ my $sql = $report->{savedsql};
+ my @sql_params = $input->multi_param('sql_params');
+ my $format = $input->param('format');
+ my $reportname = $input->param('reportname');
my $reportfilename = $reportname ? "$reportname-reportresults.$format" : "reportresults.$format" ;
+
+ $sql = get_prepped_report( $sql, @sql_params );
my ($sth, $q_errors) = execute_query($sql);
unless ($q_errors and @$q_errors) {
my ( $type, $content );
} else {
my $delimiter = C4::Context->preference('delimiter') || ',';
if ( $format eq 'csv' ) {
+ $delimiter = "\t" if $delimiter eq 'tabulation';
$type = 'application/csv';
my $csv = Text::CSV::Encoded->new({ encoding_out => 'UTF-8', sep_char => $delimiter});
$csv or die "Text::CSV::Encoded->new({binary => 1}) FAILED: " . Text::CSV::Encoded->error_diag();
}
}
}
+
+# pass $sth and sql_params, get back an executable query
+sub get_prepped_report {
+ my ($sql, @sql_params ) = @_;
+ my @split = split /<<|>>/,$sql;
+ for(my $i=0;$i<$#split/2;$i++) {
+ my $quoted = $sql_params[$i];
+ # if there are special regexp chars, we must \ them
+ $split[$i*2+1] =~ s/(\||\?|\.|\*|\(|\)|\%)/\\$1/g;
+ if ($split[$i*2+1] =~ /\|\s*date\s*$/) {
+ $quoted = output_pref({ dt => dt_from_string($quoted), dateformat => 'iso', dateonly => 1 }) if $quoted;
+ }
+ $quoted = C4::Context->dbh->quote($quoted);
+ $sql =~ s/<<$split[$i*2+1]>>/$quoted/;
+ }
+ return $sql;
+}
projects / koha.git / blobdiff