[Koha-cvs] CVS: koha/reports issues_stats.pl,1.6,1.7

[Paul POULAIN]

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

Modified Files:
        issues_stats.pl 
Log Message:
minor fixes (in query building & html typos), no new features

Index: issues_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/issues_stats.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** issues_stats.pl     14 Mar 2005 08:34:58 -0000      1.6
--- issues_stats.pl     17 Mar 2005 14:53:04 -0000      1.7
***************
*** 308,312 ****
        if (($line =~/datetime/) and ($dsp == 1)) {
                #Display by day
!               $linefield .="dayname($line)";  
        } elsif (($line=~/datetime/) and ($dsp == 2)) {
                #Display by Month
--- 308,312 ----
        if (($line =~/datetime/) and ($dsp == 1)) {
                #Display by day
!               $linefield .="concat(weekday($line),' ',dayname($line))";  
        } elsif (($line=~/datetime/) and ($dsp == 2)) {
                #Display by Month
***************
*** 320,324 ****
                $linefield .= $line;
        }  
!       
        my $strsth;
        $strsth .= "select distinctrow $linefield from statistics, borrowers 
where (statistics.borrowernumber=borrowers.borrowernumber) and $line is not 
null ";
--- 320,326 ----
                $linefield .= $line;
        }  
!       my $lineorder = $linefield;
!       $lineorder = "weekday($line)" if $lineorder =~ "^dayname";
! 
        my $strsth;
        $strsth .= "select distinctrow $linefield from statistics, borrowers 
where (statistics.borrowernumber=borrowers.borrowernumber) and $line is not 
null ";
***************
*** 340,345 ****
        }
        $strsth .=" group by $linefield";
!       $strsth .=" order by $linefield";
! #     warn "". $strsth;
        
        my $sth = $dbh->prepare( $strsth );
--- 342,347 ----
        }
        $strsth .=" group by $linefield";
!       $strsth .=" order by $lineorder";
!       warn "". $strsth;
        
        my $sth = $dbh->prepare( $strsth );
***************
*** 468,473 ****
        $strcalc .= " AND statistics.type like '" . $type ."'" if ( $type );
        
!       $strcalc .= " group by $linefield, $colfield order by 
$linefield,$colfield";
! #     warn "". $strcalc;
        my $dbcalc = $dbh->prepare($strcalc);
        $dbcalc->execute;
--- 470,475 ----
        $strcalc .= " AND statistics.type like '" . $type ."'" if ( $type );
        
!       $strcalc .= " group by $linefield, $colfield order by 
$lineorder,$colfield";
!       warn "". $strcalc;
        my $dbcalc = $dbh->prepare($strcalc);
        $dbcalc->execute;