X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=circ%2Fbookcount.pl;h=dcc1611723ce7adde064339d2bf4cb2c5e5ef38e;hb=207756c00107360c207b893a6ae13e940195b6b3;hp=65e5f5cb09caf4cc3e35d23730a25871811a380e;hpb=c596d553740ebb6299b133fc6b71ca47ed0ff2e7;p=koha.git diff --git a/circ/bookcount.pl b/circ/bookcount.pl index 65e5f5cb09..dcc1611723 100755 --- a/circ/bookcount.pl +++ b/circ/bookcount.pl @@ -1,7 +1,5 @@ #!/usr/bin/perl -# $Id$ - #written 7/3/2002 by Finlay #script to display reports @@ -18,12 +16,14 @@ # 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; FIXME - Bug 2505 use CGI; +use C4::Debug; use C4::Context; use C4::Circulation; use C4::Output; @@ -31,29 +31,27 @@ use C4::Koha; use C4::Auth; use C4::Branch; # GetBranches use C4::Biblio; # GetBiblioItemData -use C4::Date; +use C4::Dates qw/format_date/; my $input = new CGI; my $itm = $input->param('itm'); my $bi = $input->param('bi'); -my $biblionumber = $input->param('biblioitemnumber'); +my $biblionumber = $input->param('biblionumber'); my $branches = GetBranches; my $idata = itemdatanum($itm); my $data = GetBiblioItemData($bi); -my $homebranch = $branches->{ $idata->{'homebranch'} }->{'branchname'}; +my $homebranch = $branches->{ $idata->{'homebranch'} }->{'branchname'}; my $holdingbranch = $branches->{ $idata->{'holdingbranch'} }->{'branchname'}; -my ( $lastmove, $message ) = lastmove($itm); +my $lastmove = lastmove($itm); my $lastdate; my $count; if ( not $lastmove ) { - $lastdate = $message; $count = issuessince( $itm, 0 ); -} -else { +} else { $lastdate = $lastmove->{'datearrived'}; $count = issuessince( $itm, $lastdate ); } @@ -62,24 +60,22 @@ else { my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => "circ/bookcount.tmpl", + template_name => "circ/bookcount.tt", query => $input, type => "intranet", authnotrequired => 0, - flagsrequired => { circulate => 1 }, + flagsrequired => { circulate => "circulate_remaining_permissions" }, debug => 1, } ); -my @branchloop; - -foreach my $branchcode ( keys %$branches ) { - my %linebranch; - $linebranch{issues} = issuesat( $itm, $branchcode ); - my $date = lastseenat( $itm, $branchcode ); - $linebranch{seen} = slashdate($date); - $linebranch{branchname} = $branches->{$branchcode}->{'branchname'}; - push( @branchloop, \%linebranch ); +my $branchloop = GetBranchesLoop(C4::Context->userenv->{branch}); +foreach (@$branchloop) { + my $date = lastseenat( $itm, $_->{value} ); + my ($datechunk, $timechunk) = slashdate($date); + $_->{issues} = issuesat($itm, $_->{value}); + $_->{seen} = $datechunk; + $_->{seentime} = $timechunk; } $template->param( @@ -90,119 +86,98 @@ $template->param( biblioitemnumber => $bi, homebranch => $homebranch, holdingbranch => $holdingbranch, - lastdate => format_date($lastdate), + lastdate => $lastdate ? format_date($lastdate) : 0, count => $count, - branchloop => \@branchloop, - intranetcolorstylesheet => - C4::Context->preference("intranetcolorstylesheet"), - intranetstylesheet => C4::Context->preference("intranetstylesheet"), - IntranetNav => C4::Context->preference("IntranetNav"), + branchloop => $branchloop, ); output_html_with_http_headers $input, $cookie, $template->output; - +exit; sub itemdatanum { my ($itemnumber) = @_; - my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare("select * from items where itemnumber=?"); + my $sth = C4::Context->dbh->prepare("SELECT * FROM items WHERE itemnumber=?"); $sth->execute($itemnumber); - my $data = $sth->fetchrow_hashref; - $sth->finish; - return ($data); + return $sth->fetchrow_hashref; } sub lastmove { my ($itemnumber) = @_; - my $dbh = C4::Context->dbh; - my $sth = - $dbh->prepare( -"select max(branchtransfers.datearrived) from branchtransfers where branchtransfers.itemnumber=?" - ); + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare( +"SELECT max(branchtransfers.datearrived) FROM branchtransfers WHERE branchtransfers.itemnumber=?" + ); $sth->execute($itemnumber); my ($date) = $sth->fetchrow_array; - return ( 0, "Item has no branch transfers record" ) if not $date; - $sth = - $dbh->prepare( -"Select * from branchtransfers where branchtransfers.itemnumber=? and branchtransfers.datearrived=?" - ); + return 0 unless $date; + $sth = $dbh->prepare( +"SELECT * FROM branchtransfers WHERE branchtransfers.itemnumber=? and branchtransfers.datearrived=?" + ); $sth->execute( $itemnumber, $date ); my ($data) = $sth->fetchrow_hashref; - return ( 0, "Item has no branch transfers record" ) if not $data; - $sth->finish; - return ( $data, "" ); + return 0 unless $data; + return $data; } sub issuessince { my ( $itemnumber, $date ) = @_; my $dbh = C4::Context->dbh; my $sth = - $dbh->prepare( -"Select count(*) from issues where issues.itemnumber=? and issues.timestamp > ?" - ); - $sth->execute( $itemnumber, $date ); - my $count = $sth->fetchrow_hashref; - $sth->finish; - return ( $count->{'count(*)'} ); + $dbh->prepare("SELECT SUM(count) FROM ( + SELECT COUNT(*) AS count FROM issues WHERE itemnumber = ? and timestamp > ? + UNION ALL + SELECT COUNT(*) AS count FROM old_issues WHERE itemnumber = ? and timestamp > ? + ) tmp"); + $sth->execute( $itemnumber, $date, $itemnumber, $date ); + return $sth->fetchrow_arrayref->[0]; } sub issuesat { my ( $itemnumber, $brcd ) = @_; my $dbh = C4::Context->dbh; - my $sth = - $dbh->prepare( - "Select count(*) from issues where itemnumber=? and branchcode = ?"); - $sth->execute( $itemnumber, $brcd ); - my ($count) = $sth->fetchrow_array; - $sth->finish; - return ($count); + my $sth = $dbh->prepare( + "SELECT SUM(count) FROM ( + SELECT COUNT(*) AS count FROM issues WHERE itemnumber = ? AND branchcode = ? + UNION ALL + SELECT COUNT(*) AS count FROM old_issues WHERE itemnumber = ? AND branchcode = ? + ) tmp" + ); + $sth->execute( $itemnumber, $brcd, $itemnumber, $brcd ); + return $sth->fetchrow_array; } sub lastseenat { my ( $itm, $brc ) = @_; my $dbh = C4::Context->dbh; - my $sth = - $dbh->prepare( -"Select max(timestamp) from issues where itemnumber=? and branchcode = ?" - ); - $sth->execute( $itm, $brc ); + my $sth = $dbh->prepare( + "SELECT MAX(tstamp) FROM ( + SELECT MAX(timestamp) AS tstamp FROM issues WHERE itemnumber = ? AND branchcode = ? + UNION ALL + SELECT MAX(timestamp) AS tstamp FROM old_issues WHERE itemnumber = ? AND branchcode = ? + ) tmp" + ); + $sth->execute( $itm, $brc, $itm, $brc ); my ($date1) = $sth->fetchrow_array; - $sth->finish; - $sth = - $dbh->prepare( -"Select max(datearrived) from branchtransfers where itemnumber=? and tobranch = ?" - ); - $sth->execute( $itm, $brc ); + $sth = $dbh->prepare( + "SELECT MAX(transfer) FROM (SELECT max(datearrived) AS transfer FROM branchtransfers WHERE itemnumber=? AND tobranch = ? + UNION ALL + SELECT max(datesent) AS transfer FROM branchtransfers WHERE itemnumber=? AND frombranch = ? + ) tmp" + ); + $sth->execute( $itm, $brc, $itm, $brc ); my ($date2) = $sth->fetchrow_array; - $sth->finish; - - #FIXME: MJR thinks unsafe - $date2 =~ s/-//g; - $date2 =~ s/://g; - $date2 =~ s/ //g; - my $date; - if ( $date1 < $date2 ) { - $date = $date2; - } - else { - $date = $date1; - } + + my $date = ( $date1 lt $date2 ) ? $date2 : $date1 ; return ($date); } ##################################################### -# write date.... +# return date and time from timestamp sub slashdate { my ($date) = @_; - if ( not $date ) { - return "never"; - } - my ( $yr, $mo, $da, $hr, $mi ) = ( - substr( $date, 0, 4 ), - substr( $date, 4, 2 ), - substr( $date, 6, 2 ), - substr( $date, 8, 2 ), - substr( $date, 10, 2 ) + $date or return; + return ( + format_date($date), + substr($date,11,5) ); - return "$hr:$mi " . format_date("$yr-$mo-$da"); }