[Koha-cvs] CVS: koha/reports issues_stats.pl,1.1,1.2 catalogue_stats.pl,1.4,1.5 borrowers_stats.pl,1.5,1.6 acquisitions_stats.pl,1.2,1.3

[Henri-Damien LAURENT]

Update of /cvsroot/koha/koha/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9915/reports

Modified Files:
        issues_stats.pl catalogue_stats.pl borrowers_stats.pl 
        acquisitions_stats.pl 
Log Message:
Fixing Bug : Not Opening the spreadsheet manager software on file exports.

Index: issues_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/issues_stats.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** issues_stats.pl     3 Mar 2005 16:37:28 -0000       1.1
--- issues_stats.pl     4 Mar 2005 13:48:16 -0000       1.2
***************
*** 77,85 ****
        } else {
  # Printing to a csv file
!               print $input->header(-type => 'application/vnd.ms-excel',
!               -disposition=>'inline',
! #             -title=>"$basename.csv",
! #             -file=>"$basename.csv",
!               -filename=>"$basename.csv" );
                my $cols = @$results[0]->{loopcol};
                my $lines = @$results[0]->{looprow};
--- 77,83 ----
        } else {
  # Printing to a csv file
!               print $input->header(-type => 'application/vnd.sun.xml.calc',
!                       -attachment=>"$basename.csv",
!                       -filename=>"$basename.csv" );
                my $cols = @$results[0]->{loopcol};
                my $lines = @$results[0]->{looprow};
***************
*** 92,96 ****
                        print $col->{coltitle}.$sep;
                }
!               print "\n";
  # Table
                foreach my $line ( @$lines ) {
--- 90,94 ----
                        print $col->{coltitle}.$sep;
                }
!               print "Total\n";
  # Table
                foreach my $line ( @$lines ) {
***************
*** 271,278 ****
                }
        }
!       push @loopfilter,{crit=>"Issue|Return : ",filter=>$type};
!       push @loopfilter,{crit=>"Display by :",filter=>$dsp} if ($dsp);
!       push @loopfilter,{crit=>"Select Day :",filter=>$daysel} if ($daysel);
!       push @loopfilter,{crit=>"Select Month :",filter=>$daysel} if 
($monthsel);
        
        
--- 269,276 ----
                }
        }
!       push @loopfilter,{crit=>"Issue|Return ",filter=>$type};
!       push @loopfilter,{crit=>"Display by ",filter=>$dsp} if ($dsp);
!       push @loopfilter,{crit=>"Select Day ",filter=>$daysel} if ($daysel);
!       push @loopfilter,{crit=>"Select Month ",filter=>$daysel} if ($monthsel);
        
        

Index: catalogue_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/catalogue_stats.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** catalogue_stats.pl  24 Feb 2005 23:43:28 -0000      1.4
--- catalogue_stats.pl  4 Mar 2005 13:48:16 -0000       1.5
***************
*** 72,76 ****
                exit(1);
        } else {
!               print $input->header(-type => 'application/vnd.sun.xml.calc', 
-name=>"$basename.csv" );
                my $cols = @$results[0]->{loopcol};
                my $lines = @$results[0]->{looprow};
--- 72,78 ----
                exit(1);
        } else {
!               print $input->header(-type => 'application/vnd.sun.xml.calc',
!                                                        
-attachment=>"$basename.csv",
!                                                        -name=>"$basename.csv" 
);
                my $cols = @$results[0]->{loopcol};
                my $lines = @$results[0]->{looprow};
***************
*** 81,85 ****
                        print $col->{coltitle}.$sep;
                }
!               print "\n";
                foreach my $line ( @$lines ) {
                        my $x = $line->{loopcell};
--- 83,87 ----
                        print $col->{coltitle}.$sep;
                }
!               print "Total\n";
                foreach my $line ( @$lines ) {
                        my $x = $line->{loopcell};

Index: borrowers_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/borrowers_stats.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** borrowers_stats.pl  24 Feb 2005 14:13:16 -0000      1.5
--- borrowers_stats.pl  4 Mar 2005 13:48:16 -0000       1.6
***************
*** 71,75 ****
                exit(1);
        } else {
!               print $input->header(-type => 'application/vnd.sun.xml.calc', 
-name=>"$basename.csv" );
                my $cols = @$results[0]->{loopcol};
                my $lines = @$results[0]->{looprow};
--- 71,77 ----
                exit(1);
        } else {
!               print $input->header(-type => 'application/vnd.sun.xml.calc',
!                                                        -name=>"$basename.csv",
!                                                        
-attachment=>"$basename.csv");
                my $cols = @$results[0]->{loopcol};
                my $lines = @$results[0]->{looprow};
***************
*** 80,84 ****
                        print $col->{coltitle}.$sep;
                }
!               print "\n";
                foreach my $line ( @$lines ) {
                        my $x = $line->{loopcell};
--- 82,86 ----
                        print $col->{coltitle}.$sep;
                }
!               print "Total\n";
                foreach my $line ( @$lines ) {
                        my $x = $line->{loopcell};

Index: acquisitions_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/acquisitions_stats.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** acquisitions_stats.pl       28 Feb 2005 21:38:34 -0000      1.2
--- acquisitions_stats.pl       4 Mar 2005 13:48:16 -0000       1.3
***************
*** 72,76 ****
                exit(1);
        } else {
!               print $input->header(-type => 'application/vnd.sun.xml.calc', 
-name=>"$basename.csv" );
                my $cols = @$results[0]->{loopcol};
                my $lines = @$results[0]->{looprow};
--- 72,78 ----
                exit(1);
        } else {
!               print $input->header(-type => 'application/vnd.sun.xml.calc', 
!                                                        
-attachment=>"$basename.csv",
!                                                        -name=>"$basename.csv" 
);
                my $cols = @$results[0]->{loopcol};
                my $lines = @$results[0]->{looprow};
***************
*** 81,85 ****
                        print $col->{coltitle}.$sep;
                }
!               print "\n";
                foreach my $line ( @$lines ) {
                        my $x = $line->{loopcell};
--- 83,87 ----
                        print $col->{coltitle}.$sep;
                }
!               print "Total\n";
                foreach my $line ( @$lines ) {
                        my $x = $line->{loopcell};