X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FStats.pm;h=11710f82a775d184c4de45f74d433cd76dbbff9d;hb=e7971380e8ff699b57d0c02b2406eca254dfd04a;hp=7bf5e913605f20c7a68a8da34534341db239b553;hpb=dbca39823f826d5e8d1cd7c0fc8d768be1f57b64;p=koha.git diff --git a/C4/Stats.pm b/C4/Stats.pm index 7bf5e91360..11710f82a7 100644 --- a/C4/Stats.pm +++ b/C4/Stats.pm @@ -1,4 +1,4 @@ -package C4::Stats; #assumes C4/Stats +package C4::Stats; # Copyright 2000-2002 Katipo Communications @@ -14,18 +14,29 @@ package C4::Stats; #assumes C4/Stats # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use strict; +use warnings; require Exporter; -use DBI; use C4::Context; -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); +use C4::Debug; +use vars qw($VERSION @ISA @EXPORT); + +our $debug; + +BEGIN { + # set the version for version checking + $VERSION = 3.01; + @ISA = qw(Exporter); + @EXPORT = qw( + &UpdateStats + &TotalPaid + ); +} -# set the version for version checking -$VERSION = 0.01; =head1 NAME @@ -44,15 +55,9 @@ the Koha database, which acts as an activity log. =over 2 -=cut - -@ISA = qw(Exporter); -@EXPORT = qw(&UpdateStats &statsreport &Count &Overdues &TotalOwing -&TotalPaid &getcharges &Getpaidbranch &unfilledreserves); - =item UpdateStats - &UpdateStats($env, $branch, $type, $value, $other, $itemnumber, + &UpdateStats($branch, $type, $value, $other, $itemnumber, $itemtype, $borrowernumber); Adds a line to the statistics table of the Koha database. In effect, @@ -62,232 +67,65 @@ C<$branch>, C<$type>, C<$value>, C<$other>, C<$itemnumber>, C<$itemtype>, and C<$borrowernumber> correspond to the fields of the statistics table in the Koha database. -If C<$branch> is the empty string, the branch code will be taken from -C<$env-E{branchcode}>. - -C<$env-E{usercode} specifies the value of the C field. - =cut + #' sub UpdateStats { - #module to insert stats data into stats table - my ($env,$branch,$type,$amount,$other,$itemnum,$itemtype,$borrowernumber)=@_; - my $dbh = C4::Context->dbh; - if ($branch eq ''){ - $branch=$env->{'branchcode'}; - } - my $user = $env->{'usercode'}; - print $borrowernumber; - # FIXME - Use $dbh->do() instead - my $sth=$dbh->prepare("Insert into statistics - (datetime,branch,type,usercode,value, - other,itemnumber,itemtype,borrowernumber) - values (now(),'$branch','$type','$user','$amount', - '$other','$itemnum','$itemtype','$borrowernumber')"); - $sth->execute; - $sth->finish; -} - -# XXX - POD -# FIXME - Why does this function exist? Why not just rename &circrep -# to &statsreport? -# Then again, it only appears to be used in reports.pl which, in turn, -# doesn't appear to be used. So presumably this function is obsolete. -sub statsreport { - #module to return a list of stats for a given day,time,branch type - #or to return search stats - my ($type,$time)=@_; - my @data; -# print "here"; -# if ($type eq 'issue'){ - @data=circrep($time,$type); -# } - return(@data); -} -# XXX - Doc. Only used internally. Probably useless: see comment for -# &statsreport. -sub circrep { - my ($time,$type)=@_; - my $dbh = C4::Context->dbh; - my $query="Select * from statistics"; - if ($time eq 'today'){ - # FIXME - What is this supposed to do? MySQL 3.23.42 barfs on it. - $query=$query." where type='$type' and datetime - >=datetime('yesterday'::date)"; - } - my $sth=$dbh->prepare($query); - $sth->execute; - my $i=0; - my @results; - while (my $data=$sth->fetchrow_hashref){ - $results[$i]="$data->{'datetime'}\t$data->{'branch'}"; - $i++; - } - $sth->finish; -# print $query; - return(@results); + #module to insert stats data into stats table + my ( + $branch, $type, + $amount, $other, $itemnum, + $itemtype, $borrowernumber, $accountno + ) + = @_; + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare( + "INSERT INTO statistics + (datetime, branch, type, value, + other, itemnumber, itemtype, borrowernumber, proccode) + VALUES (now(),?,?,?,?,?,?,?,?)" + ); + $sth->execute( + $branch, $type, $amount, + $other, $itemnum, $itemtype, $borrowernumber, + $accountno + ); } -# XXX - POD -# FIXME - This is only used in stats.pl, which in turn is never used. -sub Count { - my ($type,$branch,$time,$time2)=@_; - my $dbh = C4::Context->dbh; - my $query="Select count(*) from statistics where type='$type'"; - $query.=" and datetime >= '$time' and datetime< '$time2' and branch='$branch'"; - my $sth=$dbh->prepare($query); - $sth->execute; - my $data=$sth->fetchrow_hashref; - $sth->finish; -# print $query; - return($data->{'count(*)'}); -} - -# XXX - POD. Doesn't appear to be used -sub Overdues{ - my $dbh = C4::Context->dbh; - my $query="Select count(*) from issues where date_due >= now()"; - my $sth=$dbh->prepare($query); - $sth->execute; - my $count=$sth->fetchrow_hashref; - $sth->finish; - return($count->{'count(*)'}); -} - -# XXX - POD. Never used -sub TotalOwing{ - my ($type)=@_; - my $dbh = C4::Context->dbh; - my $query="Select sum(amountoutstanding) from accountlines"; - if ($type eq 'fine'){ - $query=$query." where accounttype='F' or accounttype='FN'"; - } - my $sth=$dbh->prepare($query); -# print $query; - $sth->execute; - my $total=$sth->fetchrow_hashref; - $sth->finish; - return($total->{'sum(amountoutstanding)'}); -} - -# XXX - POD. Never used +# Otherwise, it'd need a POD. sub TotalPaid { - my ($time)=@_; - my $dbh = C4::Context->dbh; - my $query="Select * from accountlines,borrowers where (accounttype = 'Pay' -or accounttype ='W') - and accountlines.borrowernumber = borrowers.borrowernumber"; - if ($time eq 'today'){ - $query=$query." and date = now()"; - } else { - $query.=" and date='$time'"; - } -# my $query="Select * from statistics,borrowers -# where statistics.borrowernumber= borrowers.borrowernumber -# and (statistics.type='payment' or statistics.type='writeoff') "; -# if ($time eq 'today'){ -# $query=$query." and datetime = now()"; -# } else { -# $query.=" and datetime > '$time'"; -# } - $query.=" order by timestamp"; -# print $query; - my $sth=$dbh->prepare($query); - $sth->execute; - my @results; - my $i=0; - while (my $data=$sth->fetchrow_hashref){ - $results[$i]=$data; - $i++; - } - $sth->finish; -# print $query; - return(@results); -} - -# XXX - POD. Only used in stats.pl, which in turn is never used. -sub getcharges{ - my($borrowerno,$timestamp)=@_; - my $dbh = C4::Context->dbh; - my $timestamp2=$timestamp-1; - my $query="Select * from accountlines where borrowernumber=$borrowerno - and timestamp = '$timestamp' and accounttype <> 'Pay' and - accounttype <> 'W'"; - my $sth=$dbh->prepare($query); -# print $query,"
"; - $sth->execute; - my $i=0; - my @results; - while (my $data=$sth->fetchrow_hashref){ -# if ($data->{'timestamp'} == $timestamp){ - $results[$i]=$data; - $i++; -# } - } - return(@results); -} - -# XXX - POD. This is only used in stats.pl and stats2.pl, neither of -# which is used. -sub Getpaidbranch{ - my($date,$borrno)=@_; - my $dbh = C4::Context->dbh; - my $query="select * from statistics where type='payment' and datetime - >'$date' and borrowernumber='$borrno'"; - my $sth=$dbh->prepare($query); - $sth->execute; -# print $query; - my $data=$sth->fetchrow_hashref; - $sth->finish; - return($data->{'branch'}); -} - -# XXX - POD. This is only used in reservereport.pl and -# reservereport.xls, neither of which is used. -sub unfilledreserves { - my $dbh = C4::Context->dbh; - my $query="select *,biblio.title from reserves,reserveconstraints,biblio,borrowers,biblioitems where found <> 'F' and cancellationdate -is NULL and biblio.biblionumber=reserves.biblionumber and -reserves.constrainttype='o' -and (reserves.biblionumber=reserveconstraints.biblionumber -and reserves.borrowernumber=reserveconstraints.borrowernumber) -and -reserves.borrowernumber=borrowers.borrowernumber and -biblioitems.biblioitemnumber=reserveconstraints.biblioitemnumber order by -biblio.title,reserves.reservedate"; - my $sth=$dbh->prepare($query); - $sth->execute; - my $i=0; - my @results; - while (my $data=$sth->fetchrow_hashref){ - $results[$i]=$data; - $i++; - } - $sth->finish; - $query="select *,biblio.title from reserves,biblio,borrowers where found <> 'F' and cancellationdate -is NULL and biblio.biblionumber=reserves.biblionumber and reserves.constrainttype='a' and -reserves.borrowernumber=borrowers.borrowernumber -order by -biblio.title,reserves.reservedate"; - $sth=$dbh->prepare($query); - $sth->execute; - while (my $data=$sth->fetchrow_hashref){ - $results[$i]=$data; - $i++; - } - $sth->finish; - return($i,\@results); + my ( $time, $time2, $spreadsheet ) = @_; + $time2 = $time unless $time2; + my $dbh = C4::Context->dbh; + my $query = "SELECT * FROM statistics + LEFT JOIN borrowers ON statistics.borrowernumber= borrowers.borrowernumber + WHERE (statistics.type='payment' OR statistics.type='writeoff') "; + if ( $time eq 'today' ) { + $query .= " AND datetime = now()"; + } else { + $query .= " AND datetime > '$time'"; # FIXME: use placeholders + } + if ( $time2 ne '' ) { + $query .= " AND datetime < '$time2'"; # FIXME: use placeholders + } + if ($spreadsheet) { + $query .= " ORDER BY branch, type"; + } + $debug and warn "TotalPaid query: $query"; + my $sth = $dbh->prepare($query); + $sth->execute(); + return @{$sth->fetchall_arrayref({})}; } -END { } # module clean-up code here (global destructor) - 1; __END__ + =back =head1 AUTHOR -Koha Developement team +Koha Development Team =cut +