'quote_char' => '"',
'sep_char' => ';',
'escape_char' => '"',
- 'eol_style' => 'DOS',
+ 'eol_style' => 'Unix',
'headers' => 1,
},
};
my $last_row_set;
while (my $arg = shift) {
+ my $row_set;
+
if ('ARRAY' eq ref $arg) {
- push @{ $self->{data} }, $arg;
- $last_row_set = $arg;
+ $row_set = $arg;
} elsif ('HASH' eq ref $arg) {
- my $row_set = [ $arg ];
- push @{ $self->{data} }, $row_set;
- $last_row_set = $row_set;
+ $row_set = [ $arg ];
} else {
$self->{form}->error('Incorrect usage -- expecting hash or array ref');
}
+
+ foreach my $row (@{ $row_set }) {
+ foreach my $field (qw(data link)) {
+ map { $row->{$_}->{$field} = [ $row->{$_}->{$field} ] if (ref $row->{$_}->{$field} ne 'ARRAY') } keys %{ $row };
+ }
+ }
+
+ push @{ $self->{data} }, $row_set;
+ $last_row_set = $row_set;
}
return $last_row_set;
push @{ $self->{data} }, { 'type' => 'separator' };
}
+sub add_control {
+ my $self = shift;
+ my $data = shift;
+
+ push @{ $self->{data} }, $data;
+}
+
sub clear_data {
my $self = shift;
};
}
+sub get_attachment_basename {
+ my $self = shift;
+ my $filename = $self->{options}->{attachment_basename} || 'report';
+ $filename =~ s|.*\\||;
+ $filename =~ s|.*/||;
+
+ return $filename;
+}
+
sub generate_with_headers {
my $self = shift;
my $format = lc $self->{options}->{output_format};
+ my $form = $self->{form};
if (!$self->{columns}) {
- $self->{form}->error('Incorrect usage -- no columns specified');
+ $form->error('Incorrect usage -- no columns specified');
}
- my $filename = $self->{options}->{attachment_basename} || 'report';
- $filename =~ s|.*\\||;
- $filename =~ s|.*/||;
-
if ($format eq 'html') {
- $self->{form}->{title} = $self->{title};
- $self->{form}->header();
+ my $title = $form->{title};
+ $form->{title} = $self->{title} if ($self->{title});
+ $form->header();
+ $form->{title} = $title;
+
print $self->generate_html_content();
} elsif ($format eq 'csv') {
+ my $filename = $self->get_attachment_basename();
print qq|content-type: text/csv\n|;
print qq|content-disposition: attachment; filename=${filename}.csv\n\n|;
$self->generate_csv_content();
$self->generate_pdf_content();
} else {
- $self->{form}->error('Incorrect usage -- unknown format (supported are HTML, CSV, PDF)');
+ $form->error('Incorrect usage -- unknown format (supported are HTML, CSV, PDF)');
}
}
foreach my $row_set (@{ $self->{data} }) {
if ('HASH' eq ref $row_set) {
my $row_data = {
- 'IS_CONTROL' => 1,
- 'IS_SEPARATOR' => $row_set->{type} eq 'separator',
- 'NUM_COLUMNS' => scalar @visible_columns,
+ 'IS_CONTROL' => 1,
+ 'IS_SEPARATOR' => $row_set->{type} eq 'separator',
+ 'IS_COLSPAN_DATA' => $row_set->{type} eq 'colspan_data',
+ 'NUM_COLUMNS' => scalar @visible_columns,
+ 'data' => $row_set->{data},
};
push @rows, $row_data;
foreach my $row (@{ $row_set }) {
$inner_idx++;
- map { $row->{$_}->{data} = $self->html_format($row->{$_}->{data}) } @visible_columns;
+ foreach my $col_name (@visible_columns) {
+ my $col = $row->{$col_name};
+ $col->{CELL_ROWS} = [ ];
+ foreach my $i (0 .. scalar(@{ $col->{data} })) {
+ push @{ $col->{CELL_ROWS} }, {
+ 'data' => $self->html_format($col->{data}->[$i]),
+ 'link' => $col->{link}->[$i],
+ };
+ };
+ }
my $row_data = {
'COLUMNS' => [ map { $row->{$_} } @visible_columns ],
my $content;
if (!$printer_command) {
+ my $filename = $self->get_attachment_basename();
print qq|content-type: application/pdf\n|;
print qq|content-disposition: attachment; filename=${filename}.pdf\n\n|;
foreach my $row_set (@{ $self->{data} }) {
next if ('ARRAY' ne ref $row_set);
foreach my $row (@{ $row_set }) {
- $csv->print($stdout, [ map { $row->{$_}->{data} } @visible_columns ]);
+ my @data;
+ foreach my $col (@visible_columns) {
+ push @data, join($eol, map { s/\r?\n/$eol/g; $_ } @{ $row->{$col}->{data} });
+ }
+ $csv->print($stdout, \@data);
}
}
}