View | Details | Raw Unified | Return to bug 23685
Collapse All | Expand All

(-)a/reports/guided_reports.pl (-7 / +13 lines)
Lines 690-696 elsif ($op eq 'export'){ Link Here
690
                # Output
690
                # Output
691
                binmode(STDOUT);
691
                binmode(STDOUT);
692
                open $ods_fh, '<', $ods_filepath;
692
                open $ods_fh, '<', $ods_filepath;
693
                $content .= $_ while <$ods_fh>;
693
                print $input->header(
694
                    -type       => $type,
695
                    -attachment => $reportfilename
696
                );
697
                print $_ while <$ods_fh>;
694
                unlink $ods_filepath;
698
                unlink $ods_filepath;
695
            }
699
            }
696
            elsif ( $format eq 'template' ) {
700
            elsif ( $format eq 'template' ) {
Lines 714-724 elsif ($op eq 'export'){ Link Here
714
                );
718
                );
715
            }
719
            }
716
        }
720
        }
717
        print $input->header(
721
718
            -type => $type,
722
        unless ( $format eq 'ods' ) {
719
            -attachment=> $reportfilename
723
            print $input->header(
720
        );
724
                -type       => $type,
721
        print $content;
725
                -attachment => $reportfilename
726
            );
727
            print $content;
728
        }
722
729
723
        foreach my $err (@$q_errors, @errors) {
730
        foreach my $err (@$q_errors, @errors) {
724
            print "# ERROR: " . (map {$_ . ": " . $err->{$_}} keys %$err) . "\n";
731
            print "# ERROR: " . (map {$_ . ": " . $err->{$_}} keys %$err) . "\n";
725
- 

Return to bug 23685