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

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

Return to bug 23685