gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug Fixes : Managing null values and filling some collumns that were left empty owed to the LIMIT in SQL statements.

This commit is contained in:
hdl 2005-11-28 10:40:32 +00:00
parent 020d935a93
commit c50068d7fe
2 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
reports/bor_issues_top.pl
View File

@ -243,7 +243,7 @@ sub calculate {
while (my ($celvalue) = $sth2->fetchrow) {
my %cell;
$cell{coltitle} = $celvalue;
$cell{'coltitle'} = ($celvalue?$celvalue:"NULL");
push @loopcol, \%cell;
}
# warn "fin des titres colonnes";
@ -296,31 +296,29 @@ sub calculate {
$strcalc .= " group by borrowers.borrowernumber";
$strcalc .= ", $colfield" if ($column);
$strcalc .= " order by ";
$strcalc .= "$colfield, " if ($colfield);
$strcalc .= "RANK DESC ";
my $max;
if (@loopcol) {
$max = $line*@loopcol;
} else { $max=$line;}
$strcalc .= " LIMIT 0,$max";
$strcalc .= " order by RANK DESC";
$strcalc .= ",$colfield " if ($colfield);
# my $max;
# if (@loopcol) {
# $max = $line*@loopcol;
# } else { $max=$line;}
# $strcalc .= " LIMIT 0,$max";
warn "SQL :". $strcalc;
my $dbcalc = $dbh->prepare($strcalc);
$dbcalc->execute;
# warn "filling table";
my $previous_col;
my $i=1;
my %indice;
while (my @data = $dbcalc->fetchrow) {
my ($row, $rank, $id, $col )=@data;
$col = "zzEMPTY" if ($col eq undef);
$i=1 if (($previous_col) and not($col eq $previous_col));
$table[$i]->{$col}->{'name'}=$row;
$table[$i]->{$col}->{'count'}=$rank;
$table[$i]->{$col}->{'link'}=$id;
warn " ".$i." ".$col. " ".$row;
$i++;
$previous_col=$col;
$indice{$col}=1 if (not($indice{$col}));
$table[$indice{$col}]->{$col}->{'name'}=$row;
$table[$indice{$col}]->{$col}->{'count'}=$rank;
$table[$indice{$col}]->{$col}->{'link'}=$id;
# warn " ".$i." ".$col. " ".$row;
$indice{$col}++;
}
push @loopcol,{coltitle => "Global"} if not($column);
@ -328,7 +326,7 @@ sub calculate {
for ($i=1; $i<=$line;$i++) {
my @loopcell;
warn " $i";
#@loopcol ensures the order for columns is common with column titles
#@loborrowersopcol ensures the order for columns is common with column titles
# and the number matches the number of columns
my $colcount=0;
foreach my $col ( @loopcol ) {

33
reports/cat_issues_top.pl
View File

@ -251,10 +251,7 @@ sub calculate {
while (my ($celvalue) = $sth2->fetchrow) {
my %cell;
# my %ft;
# warn "coltitle :".$celvalue;
$cell{coltitle} = $celvalue;
# $ft{totalcol} = 0;
$cell{coltitle} = ($celvalue?$celvalue:"NULL");
push @loopcol, \%cell;
}
# warn "fin des titres colonnes";
@ -307,31 +304,29 @@ sub calculate {
$strcalc .= " group by biblio.biblionumber";
$strcalc .= ", $colfield" if ($column);
$strcalc .= " order by ";
$strcalc .= "$colfield, " if ($colfield);
$strcalc .= "RANK DESC ";
my $max;
if (@loopcol) {
$max = $line*@loopcol;
} else { $max=$line;}
$strcalc .= " LIMIT 0,$max";
$strcalc .= " order by RANK DESC";
$strcalc .= ", $colfield " if ($colfield);
# my $max;
# if (@loopcol) {
# $max = $line*@loopcol;
# } else { $max=$line;}
# $strcalc .= " LIMIT 0,$max";
warn "SQL :". $strcalc;
my $dbcalc = $dbh->prepare($strcalc);
$dbcalc->execute;
# warn "filling table";
my $previous_col;
my $i=1;
my %indice;
while (my @data = $dbcalc->fetchrow) {
my ($row, $rank, $id, $col )=@data;
$col = "zzEMPTY" if ($col eq undef);
$i=1 if (($previous_col) and not($col eq $previous_col));
$table[$i]->{$col}->{'name'}=$row;
$table[$i]->{$col}->{'count'}=$rank;
$table[$i]->{$col}->{'link'}=$id;
$indice{$col}=1 if (not($indice{$col}));
$table[$indice{$col}]->{$col}->{'name'}=$row;
$table[$indice{$col}]->{$col}->{'count'}=$rank;
$table[$indice{$col}]->{$col}->{'link'}=$id;
# warn " ".$i." ".$col. " ".$row;
$i++;
$previous_col=$col;
$indice{$col}++;
}
push @loopcol,{coltitle => "Global"} if not($column);