use Encode qw( decode );
use URI::Escape;
use File::Temp;
-use File::Basename qw( dirname );
-use C4::Reports::Guided;
+use C4::Reports::Guided qw( delete_report get_report_areas convert_sql update_sql get_saved_reports get_results ValidateSQLParameters format_results get_report_types get_columns get_from_dictionary get_criteria build_query save_report execute_query nb_rows get_report_groups );
use Koha::Reports;
-use C4::Auth qw/:DEFAULT get_session/;
-use C4::Output;
-use C4::Debug;
+use C4::Auth qw( get_template_and_user get_session );
+use C4::Output qw( pagination_bar output_html_with_http_headers );
use C4::Context;
use Koha::Caches;
-use C4::Log;
-use Koha::DateUtils qw/dt_from_string output_pref/;
+use C4::Log qw( logaction );
+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;
use Koha::SharedContent;
+use Koha::Util::OpenDocument qw( generate_ods );
=head1 NAME
=cut
-my $input = new CGI;
+my $input = CGI->new;
my $usecache = Koha::Caches->get_instance->memcached_cache;
my $phase = $input->param('phase') // '';
my $flagsrequired;
-if ( ( $phase eq 'Build new' ) || ( $phase eq 'Create report from SQL' ) || ( $phase eq 'Edit SQL' ) ){
+if ( ( $phase eq 'Build new' ) || ( $phase eq 'Create report from SQL' ) || ( $phase eq 'Edit SQL' )
+ || ( $phase eq 'Build new from existing' ) ) {
$flagsrequired = 'create_reports';
}
elsif ( $phase eq 'Use saved' ) {
template_name => "reports/guided_reports_start.tt",
query => $input,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { reports => $flagsrequired },
- debug => 1,
}
);
my $session = $cookie ? get_session($cookie->value) : undef;
my $cache_expiry_units = $input->param('cache_expiry_units');
my $public = $input->param('public');
my $save_anyway = $input->param('save_anyway');
-
my @errors;
# if we have the units, then we came from creating a report from SQL and thus need to handle converting units
create_non_existing_group_and_subgroup($input, $group, $subgroup);
- if ($sql =~ /;?\W?(UPDATE|DELETE|DROP|INSERT|SHOW|CREATE)\W/i) {
- push @errors, {sqlerr => $1};
- }
- elsif ($sql !~ /^(SELECT)/i) {
- push @errors, {queryerr => "No SELECT"};
- }
+ my ( $is_sql_valid, $validation_errors ) = Koha::Report->new({ savedsql => $sql })->is_sql_valid;
+ push(@errors, @$validation_errors) unless $is_sql_valid;
if (@errors) {
$template->param(
create_non_existing_group_and_subgroup($input, $group, $subgroup);
## FIXME this is AFTER entering a name to save the report under
- if ($sql =~ /;?\W?(UPDATE|DELETE|DROP|INSERT|SHOW|CREATE)\W/i) {
- push @errors, {sqlerr => $1};
- }
- elsif ($sql !~ /^(SELECT)/i) {
- push @errors, {queryerr => "No SELECT"};
- }
+ my ( $is_sql_valid, $validation_errors ) = Koha::Report->new({ savedsql => $sql })->is_sql_valid;
+ push(@errors, @$validation_errors) unless $is_sql_valid;
if (@errors) {
$template->param(
my $report_id = $input->param('reports');
my @sql_params = $input->multi_param('sql_params');
my @param_names = $input->multi_param('param_name');
+ my $want_full_chart = $input->param('want_full_chart') || 0;
# offset algorithm
if ($input->param('page')) {
my @authval_errors;
my %uniq_params;
for(my $i=0;$i<($#split/2);$i++) {
- my ($text,$authorised_value) = split /\|/,$split[$i*2+1];
- my $sep = $authorised_value ? "|" : "";
- if( defined $uniq_params{$text.$sep.$authorised_value} ){
+ my ($text,$authorised_value_all) = split /\|/,$split[$i*2+1];
+ my $sep = $authorised_value_all ? "|" : "";
+ if( defined $uniq_params{$text.$sep.$authorised_value_all} ){
next;
- } else { $uniq_params{$text.$sep.$authorised_value} = "$i"; }
+ } else { $uniq_params{$text.$sep.$authorised_value_all} = "$i"; }
+ my ($authorised_value, $all) = split /:/, $authorised_value_all;
my $input;
my $labelid;
if ( not defined $authorised_value ) {
} elsif ( $authorised_value eq "date" ) {
# require a date, provide a date picker
$input = 'date';
+ } elsif ( $authorised_value eq "list" ) {
+ # require a list, provide a textarea
+ $input = 'textarea';
} else {
# defined $authorised_value, and not 'date'
my $dbh=C4::Context->dbh;
};
}
- push @tmpl_parameters, {'entry' => $text, 'input' => $input, 'labelid' => $labelid, 'name' => $text.$sep.$authorised_value };
+ push @tmpl_parameters, {'entry' => $text, 'input' => $input, 'labelid' => $labelid, 'name' => $text.$sep.$authorised_value_all, 'include_all' => $all };
}
$template->param('sql' => $sql,
'name' => $name,
'reports' => $report_id,
);
} else {
- my $sql = get_prepped_report( $sql, \@param_names, \@sql_params);
+ my ($sql,$header_types) = $report->prep_report( \@param_names, \@sql_params );
+ $template->param(header_types => $header_types);
my ( $sth, $errors ) = execute_query( $sql, $offset, $limit, undef, $report_id );
- my ($sth2, $errors2) = execute_query($sql);
my $total = nb_rows($sql) || 0;
unless ($sth) {
die "execute_query failed to return sth for report $report_id: $sql";
my @cells = map { +{ cell => $_ } } @$row;
push @rows, { cells => \@cells };
}
- while (my $row = $sth2->fetchrow_arrayref()) {
- my @cells = map { +{ cell => $_ } } @$row;
- push @allrows, { cells => \@cells };
+ if( $want_full_chart ){
+ my ($sth2, $errors2) = execute_query($sql);
+ while (my $row = $sth2->fetchrow_arrayref()) {
+ my @cells = map { +{ cell => $_ } } @$row;
+ push @allrows, { cells => \@cells };
+ }
}
}
my $totpages = int($total/$limit) + (($total % $limit) > 0 ? 1 : 0);
- my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report_id&phase=Run%20this%20report&limit=$limit";
+ my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report_id&phase=Run%20this%20report&limit=$limit&want_full_chart=$want_full_chart";
if (@param_names) {
$url = join('&param_name=', $url, map { URI::Escape::uri_escape_utf8($_) } @param_names);
}
my $reportname = $input->param('reportname');
my $reportfilename = $reportname ? "$reportname-reportresults.$format" : "reportresults.$format" ;
- $sql = get_prepped_report( $sql, \@param_names, \@sql_params );
+ ($sql, undef) = $report->prep_report( \@param_names, \@sql_params );
my ($sth, $q_errors) = execute_query($sql);
unless ($q_errors and @$q_errors) {
my ( $type, $content );
$content .= join("\t", header_cell_values($sth)) . "\n";
$content = Encode::decode('UTF-8', $content);
while (my $row = $sth->fetchrow_arrayref()) {
- $content .= join("\t", @$row) . "\n";
+ $content .= join("\t", map { $_ // '' } @$row) . "\n";
}
} else {
- my $delimiter = C4::Context->preference('delimiter') || ',';
+ my $delimiter = C4::Context->preference('CSVDelimiter') || ',';
if ( $format eq 'csv' ) {
$delimiter = "\t" if $delimiter eq 'tabulation';
$type = 'application/csv';
$type = 'application/vnd.oasis.opendocument.spreadsheet';
my $ods_fh = File::Temp->new( UNLINK => 0 );
my $ods_filepath = $ods_fh->filename;
-
- use OpenOffice::OODoc;
- my $tmpdir = dirname $ods_filepath;
- odfWorkingDirectory( $tmpdir );
- my $container = odfContainer( $ods_filepath, create => 'spreadsheet' );
- my $doc = odfDocument (
- container => $container,
- part => 'content'
- );
- my $table = $doc->getTable(0);
- my @headers = header_cell_values( $sth );
- my $rows = $sth->fetchall_arrayref();
- my ( $nb_rows, $nb_cols ) = ( 0, 0 );
- $nb_rows = @$rows;
- $nb_cols = @headers;
- $doc->expandTable( $table, $nb_rows + 1, $nb_cols );
-
- my $row = $doc->getRow( $table, 0 );
- my $j = 0;
- for my $header ( @headers ) {
- $doc->cellValue( $row, $j, $header );
- $j++;
- }
- my $i = 1;
- for ( @$rows ) {
- $row = $doc->getRow( $table, $i );
- for ( my $j = 0 ; $j < $nb_cols ; $j++ ) {
- my $value = Encode::encode( 'UTF8', $rows->[$i - 1][$j] );
- $doc->cellValue( $row, $j, $value );
+ my $ods_content;
+
+ # First line is headers
+ my @headers = header_cell_values($sth);
+ push @$ods_content, \@headers;
+
+ # Other line in Unicode
+ my $sql_rows = $sth->fetchall_arrayref();
+ foreach my $sql_row ( @$sql_rows ) {
+ my @content_row;
+ foreach my $sql_cell ( @$sql_row ) {
+ push @content_row, Encode::encode( 'UTF8', $sql_cell );
}
- $i++;
+ push @$ods_content, \@content_row;
}
- $doc->save();
+
+ # Process
+ generate_ods($ods_filepath, $ods_content);
+
+ # Output
binmode(STDOUT);
open $ods_fh, '<', $ods_filepath;
$content .= $_ while <$ods_fh>;
);
}
-elsif ( $phase eq 'Create report from SQL' ) {
+elsif ( $phase eq 'Create report from SQL' || $phase eq 'Create report from existing' ) {
- my ($group, $subgroup);
- # allow the user to paste in sql
+ my ($group, $subgroup, $sql, $reportname, $notes);
if ( $input->param('sql') ) {
- $group = $input->param('report_group');
- $subgroup = $input->param('report_subgroup');
- $template->param(
- 'sql' => scalar $input->param('sql') // '',
- 'reportname' => scalar $input->param('reportname') // '',
- 'notes' => scalar $input->param('notes') // '',
- );
+ $group = $input->param('report_group');
+ $subgroup = $input->param('report_subgroup');
+ $sql = $input->param('sql') // '';
+ $reportname = $input->param('reportname') // '';
+ $notes = $input->param('notes') // '';
+ }
+ elsif ( my $report_id = $input->param('report_id') ) {
+ my $report = Koha::Reports->find($report_id);
+ $group = $report->report_group;
+ $subgroup = $report->report_subgroup;
+ $sql = $report->savedsql // '';
+ $reportname = $report->report_name // '';
+ $notes = $report->notes // '';
}
+
$template->param(
+ sql => $sql,
+ reportname => $reportname,
+ notes => $notes,
'create' => 1,
'groups_with_subgroups' => groups_with_subgroups($group, $subgroup),
'public' => '0',
'cache_expiry' => 300,
'usecache' => $usecache,
+
);
}
}
}
-# pass $sth and sql_params, get back an executable query
-sub get_prepped_report {
- my ($sql, $param_names, $sql_params ) = @_;
- my %lookup;
- @lookup{@$param_names} = @$sql_params;
- my @split = split /<<|>>/,$sql;
- my @tmpl_parameters;
- for(my $i=0;$i<$#split/2;$i++) {
- my $quoted = @$param_names ? $lookup{ $split[$i*2+1] } : @$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 / srvgit / blobdiff