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

(-)a/reports/guided_reports.pl (-7 / +13 lines)
Lines 683-689 elsif ($op eq 'export'){ Link Here
683
                # Output
683
                # Output
684
                binmode(STDOUT);
684
                binmode(STDOUT);
685
                open $ods_fh, '<', $ods_filepath;
685
                open $ods_fh, '<', $ods_filepath;
686
                $content .= $_ while <$ods_fh>;
686
                print $input->header(
687
                    -type       => $type,
688
                    -attachment => $reportfilename
689
                );
690
                print $_ while <$ods_fh>;
687
                unlink $ods_filepath;
691
                unlink $ods_filepath;
688
            }
692
            }
689
            elsif ( $format eq 'template' ) {
693
            elsif ( $format eq 'template' ) {
Lines 707-717 elsif ($op eq 'export'){ Link Here
707
                );
711
                );
708
            }
712
            }
709
        }
713
        }
710
        print $input->header(
714
711
            -type => $type,
715
        unless ( $format eq 'ods' ) {
712
            -attachment=> $reportfilename
716
            print $input->header(
713
        );
717
                -type       => $type,
714
        print $content;
718
                -attachment => $reportfilename
719
            );
720
            print $content;
721
        }
715
722
716
        foreach my $err (@$q_errors, @errors) {
723
        foreach my $err (@$q_errors, @errors) {
717
            print "# ERROR: " . (map {$_ . ": " . $err->{$_}} keys %$err) . "\n";
724
            print "# ERROR: " . (map {$_ . ": " . $err->{$_}} keys %$err) . "\n";
718
- 

Return to bug 23685