[Koha-cvs] CVS: koha/reports catalogue_stats.pl,1.12,1.13

[Henri-Damien LAURENT]

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

Modified Files:
        catalogue_stats.pl 
Log Message:
Bug fixing :
Using holdingbranch and not Location to locate an item.

Index: catalogue_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/catalogue_stats.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** catalogue_stats.pl  4 May 2005 09:02:39 -0000       1.12
--- catalogue_stats.pl  2 Aug 2005 15:49:25 -0000       1.13
***************
*** 217,226 ****
                                -multiple => 0 );
        
!       $req = $dbh->prepare("select distinctrow location from items order by 
location");
        $req->execute;
        undef @select;
        push @select,"";
!       my $CGIlocation=CGI::scrolling_list( -name     => 'Filter',
!                               -id => 'location',
                                -values   => address@hidden,
                                -size     => 1,
--- 217,226 ----
                                -multiple => 0 );
        
!       $req = $dbh->prepare("select distinctrow holdingbranch from items order 
by holdingbranch");
        $req->execute;
        undef @select;
        push @select,"";
!       my $CGIholdingbranch=CGI::scrolling_list( -name     => 'Filter',
!                               -id => 'holdingbranch',
                                -values   => address@hidden,
                                -size     => 1,
***************
*** 268,272 ****
  #                                     CGIPublisher => $CGIpublisher,
                                        CGIBranch => $CGIbranch,
!                                       CGILocation => $CGIlocation,
                                        CGIextChoice => $CGIextChoice,
                                        CGIsepChoice => $CGIsepChoice
--- 268,272 ----
  #                                     CGIPublisher => $CGIpublisher,
                                        CGIBranch => $CGIbranch,
!                                       CGILocation => $CGIholdingbranch,
                                        CGIextChoice => $CGIextChoice,
                                        CGIsepChoice => $CGIsepChoice
***************
*** 334,338 ****
        $linefilter[1] = @$filters[9] if ($line =~ /publicationyear/ ) ;
        @linefilter[0] = @$filters[10] if ($line =~ /items.homebranch/ ) ;
!       @linefilter[0] = @$filters[11] if ($line =~ /items.location/ ) ;
  # 
        my @colfilter ;
--- 334,338 ----
        $linefilter[1] = @$filters[9] if ($line =~ /publicationyear/ ) ;
        @linefilter[0] = @$filters[10] if ($line =~ /items.homebranch/ ) ;
!       @linefilter[0] = @$filters[11] if ($line =~ /items.holdingbranch/ ) ;
  # 
        my @colfilter ;
***************
*** 348,352 ****
        $colfilter[1] = @$filters[9] if ($column =~ /publicationyear/ ) ;
        @colfilter[0] = @$filters[10] if ($column =~ /items.homebranch/ ) ;
!       @colfilter[0] = @$filters[11] if ($column =~ /items.location/ ) ;
  
  # 1st, loop rows.
--- 348,352 ----
        $colfilter[1] = @$filters[9] if ($column =~ /publicationyear/ ) ;
        @colfilter[0] = @$filters[10] if ($column =~ /items.homebranch/ ) ;
!       @colfilter[0] = @$filters[11] if ($column =~ /items.holdingbranch/ ) ;
  
  # 1st, loop rows.
***************
*** 560,566 ****
                @$filters[11]=~ s/\*/%/g;
                if ($cond){
!                       $strcalc .= " AND items.location like '" . 
@$filters[11] ."'" if ( @$filters[11] );
                } else {
!                       $strcalc .= " WHERE items.location like '" . 
@$filters[11] ."'" if ( @$filters[11] );
                }
        }
--- 560,566 ----
                @$filters[11]=~ s/\*/%/g;
                if ($cond){
!                       $strcalc .= " AND items.holdingbranch like '" . 
@$filters[11] ."'" if ( @$filters[11] );
                } else {
!                       $strcalc .= " WHERE items.holdingbranch like '" . 
@$filters[11] ."'" if ( @$filters[11] );
                }
        }