X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FReportGenerator.pm;h=688f165bce2b356b32acdac537c551646e8fe23e;hb=38902b24ceed494a2936edfe4d72e8c48e15bce0;hp=afae8633302b43e72d4495d14a8288a167bcd78e;hpb=4eb7c2eb2fa9fd720af65e7f149a1794efad352f;p=kivitendo-erp.git diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm index afae86333..688f165bc 100644 --- a/SL/ReportGenerator.pm +++ b/SL/ReportGenerator.pm @@ -1,7 +1,6 @@ package SL::ReportGenerator; use Data::Dumper; -use IO::Wrap; use List::Util qw(max); use Text::CSV_XS; #use PDF::API2; # these two eat up to .75s on startup. only load them if we actually need them @@ -24,6 +23,7 @@ sub new { $self->{options} = { 'std_column_visibility' => 0, 'output_format' => 'HTML', + 'controller_class ' => '', 'allow_pdf_export' => 1, 'allow_csv_export' => 1, 'html_template' => 'report_generator/html_report', @@ -72,6 +72,12 @@ sub set_columns { foreach my $column (values %{ $self->{columns} }) { $column->{visible} = $self->{options}->{std_column_visibility} unless defined $column->{visible}; } + + if( $::form->{report_generator_csv_options_for_import} ) { + foreach my $key (keys %{ $self->{columns} }) { + $self->{columns}{$key}{text} = $key; + } + } $self->set_column_order(sort keys %{ $self->{columns} }); } @@ -204,8 +210,11 @@ sub set_custom_headers { sub get_attachment_basename { my $self = shift; my $filename = $self->{options}->{attachment_basename} || 'report'; + + # FIXME: this is bonkers. add a real sluggify method somewhere or import one. $filename =~ s|.*\\||; $filename =~ s|.*/||; + $filename =~ s| |_|g; return $filename; } @@ -228,6 +237,7 @@ sub generate_with_headers { print $self->generate_html_content(); } elsif ($format eq 'csv') { + # FIXME: don't do mini http in here my $filename = $self->get_attachment_basename(); print qq|content-type: text/csv\n|; print qq|content-disposition: attachment; filename=${filename}.csv\n\n|; @@ -390,6 +400,7 @@ sub prepare_html_content { 'EXPORT_VARIABLE_LIST' => join(' ', @{ $self->{export}->{variable_list} }), 'EXPORT_NEXTSUB' => $self->{export}->{nextsub}, 'DATA_PRESENT' => $self->{data_present}, + 'CONTROLLER_DISPATCH' => $opts->{controller_class}, }; return $variables; @@ -425,11 +436,11 @@ sub generate_pdf_content { my (@data, @column_props, @cell_props); my ($data_row, $cell_props_row); - my @visible_columns = $self->get_visible_columns('HTML'); + my @visible_columns = $self->get_visible_columns('PDF'); my $num_columns = scalar @visible_columns; my $num_header_rows = 1; - my $font_encoding = $main::dbcharset || 'ISO-8859-15'; + my $font_encoding = $::lx_office_conf{system}->{dbcharset} || 'ISO-8859-15'; foreach my $name (@visible_columns) { push @column_props, { 'justify' => $self->{columns}->{$name}->{align} eq 'right' ? 'right' : 'left' }; @@ -565,8 +576,8 @@ sub generate_pdf_content { my $font_height = $font_size + 2 * $padding; my $title_font_height = $font_size + 2 * $padding; - my $header_height = 2 * $title_font_height if ($opts->{title}); - my $footer_height = 2 * $font_height if ($pdfopts->{number}); + my $header_height = $opts->{title} ? 2 * $title_font_height : undef; + my $footer_height = $pdfopts->{number} ? 2 * $font_height : undef; my $top_text_height = 0; @@ -687,18 +698,26 @@ sub _print_content { } } -sub unescape_string { - my $self = shift; - my $text = shift; +sub _handle_quoting_and_encoding { + my ($self, $text, $do_unquote) = @_; - $text = $main::locale->unquote_special_chars('HTML', $text); - $text = $::locale->{iconv}->convert($text); + $text = $main::locale->unquote_special_chars('HTML', $text) if $do_unquote; + $text = Encode::encode('UTF-8', $text) if $::locale->is_utf8; return $text; } sub generate_csv_content { - my $self = shift; + my $self = shift; + my $stdout = ($::dispatcher->get_standard_filehandles)[1]; + + # Text::CSV_XS seems to downgrade to bytes already (see + # SL/FCGIFixes.pm). Therefore don't let FCGI do that again. + $::locale->with_raw_io($stdout, sub { $self->_generate_csv_content($stdout) }); +} + +sub _generate_csv_content { + my ($self, $stdout) = @_; my %valid_sep_chars = (';' => ';', ',' => ',', ':' => ':', 'TAB' => "\t"); my %valid_escape_chars = ('"' => 1, "'" => 1); @@ -718,12 +737,11 @@ sub generate_csv_content { 'quote_char' => $quote_char, 'eol' => $eol, }); - my $stdout = wraphandle(\*STDOUT); my @visible_columns = $self->get_visible_columns('CSV'); if ($opts->{headers}) { if (!$self->{custom_headers}) { - $csv->print($stdout, [ map { $self->unescape_string($self->{columns}->{$_}->{text}) } @visible_columns ]); + $csv->print($stdout, [ map { $self->_handle_quoting_and_encoding($self->{columns}->{$_}->{text}, 1) } @visible_columns ]); } else { foreach my $row (@{ $self->{custom_headers} }) { @@ -731,7 +749,7 @@ sub generate_csv_content { foreach my $col (@{ $row }) { my $num_output = ($col->{colspan} && ($col->{colspan} > 1)) ? $col->{colspan} : 1; - push @{ $fields }, ($self->unescape_string($col->{text})) x $num_output; + push @{ $fields }, ($self->_handle_quoting_and_encoding($col->{text}, 1)) x $num_output; } $csv->print($stdout, $fields); @@ -753,7 +771,7 @@ sub generate_csv_content { my $num_output = ($row->{$col}{colspan} && ($row->{$col}->{colspan} > 1)) ? $row->{$col}->{colspan} : 1; $skip_next = $num_output - 1; - push @data, join($eol, map { s/\r?\n/$eol/g; $_ } @{ $row->{$col}->{data} }); + push @data, join($eol, map { s/\r?\n/$eol/g; $self->_handle_quoting_and_encoding($_, 0) } @{ $row->{$col}->{data} }); push @data, ('') x $skip_next if ($skip_next); } @@ -762,6 +780,10 @@ sub generate_csv_content { } } +sub check_for_pdf_api { + return eval { require PDF::API2; 1; } ? 1 : 0; +} + 1; __END__ @@ -915,6 +937,12 @@ Used to determine if a button for CSV export should be displayed. Default is yes The template to be used for HTML reports. Default is 'report_generator/html_report'. +=item controller_class + +If this is used from a C based controller class, pass the +class name here and make sure C is +used in the controller. That way the exports stay functional. + =back =head2 PDF Options