[Koha-cvs] koha C4/Circulation/Circ2.pm reports/issues_avg... [rel_3_0]
Henri-Damien LAURENT
laurenthdl at alinto.com
Thu Dec 7 17:00:41 CET 2006
CVSROOT: /cvsroot/koha
Module name: koha
Branch: rel_3_0
Changes by: Henri-Damien LAURENT <hdl> 06/12/07 16:00:41
Modified files:
C4/Circulation : Circ2.pm
reports : issues_avg_stats.pl
updater : updatedatabase
Log message:
Adding issuedate to table issues.
Modifying issuedate on issue (Circ2.pm)
Modifying report issue_avg_stats to take this change into account. (Need TESTING)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.114.2.23&r2=1.114.2.24
http://cvs.savannah.gnu.org/viewcvs/koha/reports/issues_avg_stats.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.2&r2=1.5.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&only_with_tag=rel_3_0&r1=1.157.2.33&r2=1.157.2.34
Patches:
Index: C4/Circulation/Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.114.2.23
retrieving revision 1.114.2.24
diff -u -b -r1.114.2.23 -r1.114.2.24
--- C4/Circulation/Circ2.pm 5 Dec 2006 11:35:30 -0000 1.114.2.23
+++ C4/Circulation/Circ2.pm 7 Dec 2006 16:00:41 -0000 1.114.2.24
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Circ2.pm,v 1.114.2.23 2006/12/05 11:35:30 toins Exp $
+# $Id: Circ2.pm,v 1.114.2.24 2006/12/07 16:00:41 hdl Exp $
use strict;
require Exporter;
@@ -34,11 +34,12 @@
Add_Delta_DHMS
Date_to_Days
);
+use POSIX qw(strftime);
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.114.2.23 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.114.2.24 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -1306,7 +1307,7 @@
# Record in the database the fact that the book was issued.
my $sth =
$dbh->prepare(
-"insert into issues (borrowernumber, itemnumber, date_due, branchcode) values (?,?,?,?)"
+"insert into issues (borrowernumber, itemnumber,issuedate, date_due, branchcode) values (?,?,?,?,?)"
);
my $loanlength = getLoanLength(
$borrower->{'categorycode'},
@@ -1332,7 +1333,7 @@
$sth->execute(
$borrower->{'borrowernumber'},
$iteminformation->{'itemnumber'},
- $dateduef, $env->{'branchcode'}
+ strftime( "%Y-%m-%d", localtime ),$dateduef, $env->{'branchcode'}
);
$sth->finish;
$iteminformation->{'issues'}++;
Index: reports/issues_avg_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/issues_avg_stats.pl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -b -r1.5.2.2 -r1.5.2.3
--- reports/issues_avg_stats.pl 30 Nov 2006 18:23:51 -0000 1.5.2.2
+++ reports/issues_avg_stats.pl 7 Dec 2006 16:00:41 -0000 1.5.2.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: issues_avg_stats.pl,v 1.5.2.2 2006/11/30 18:23:51 toins Exp $
+# $Id: issues_avg_stats.pl,v 1.5.2.3 2006/12/07 16:00:41 hdl Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -28,7 +28,7 @@
use C4::Koha;
use C4::Interface::CGI::Output;
use C4::Circulation::Circ2;
-use Date::Manip;
+use Date::Calc qw(Delta_Days);
=head1 NAME
@@ -478,7 +478,7 @@
# Processing average loanperiods
$strcalc .= "SELECT $linefield, $colfield, ";
- $strcalc .= " DATE_SUB(date_due, INTERVAL CAST(issuingrules.issuelength AS SIGNED INTEGER) * (CAST(issues.renewals AS SIGNED INTEGER)+1) DAY) AS issuedate, returndate, COUNT(*), date_due, issues.renewals, issuelength FROM `issues`,borrowers,biblioitems LEFT JOIN items ON (biblioitems.biblioitemnumber=items.biblioitemnumber) LEFT JOIN issuingrules ON (issuingrules.branchcode=issues.branchcode AND issuingrules.itemtype=biblioitems.itemtype AND issuingrules.categorycode=borrowers.categorycode) WHERE issues.itemnumber=items.itemnumber AND issues.borrowernumber=borrowers.borrowernumber and returndate is not null";
+ $strcalc .= " issuedate, returndate, COUNT(*), date_due, issues.renewals, issuelength FROM `issues`,borrowers,biblioitems LEFT JOIN items ON (biblioitems.biblioitemnumber=items.biblioitemnumber) LEFT JOIN issuingrules ON (issuingrules.branchcode=issues.branchcode AND issuingrules.itemtype=biblioitems.itemtype AND issuingrules.categorycode=borrowers.categorycode) WHERE issues.itemnumber=items.itemnumber AND issues.borrowernumber=borrowers.borrowernumber and returndate is not null";
@$filters[0]=~ s/\*/%/g if (@$filters[0]);
$strcalc .= " AND issues.timestamp > '" . @$filters[0] ."'" if ( @$filters[0] );
@@ -524,10 +524,10 @@
$col = "zzEMPTY" if ($col eq undef);
$row = "zzEMPTY" if ($row eq undef);
# warn "506 row :".$row." column :".$col;
- my @result =split /:/,DateCalc($returndate,$issuedate) ;
+ my $result =Delta_Days(split (/-/,$returndate),split(/-/,$issuedate)) ;
# DateCalc returns => 0:0:WK:DD:HH:MM:SS the weeks, days, hours, minutes,
# and seconds between the two
- $loanlength = $result[2]*7+$result[3];
+ $loanlength = $result;
# warn "512 Same row and col DateCalc returns :$loanlength with return ". $returndate ."issue ". $issuedate ."weight : ". $weight;
# warn "513 row :".$row." column :".$col;
$table{$row}->{$col}+=$weight*$loanlength;
Index: updater/updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.157.2.33
retrieving revision 1.157.2.34
diff -u -b -r1.157.2.33 -r1.157.2.34
--- updater/updatedatabase 6 Dec 2006 14:12:18 -0000 1.157.2.33
+++ updater/updatedatabase 7 Dec 2006 16:00:41 -0000 1.157.2.34
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: updatedatabase,v 1.157.2.33 2006/12/06 14:12:18 btoumi Exp $
+# $Id: updatedatabase,v 1.157.2.34 2006/12/07 16:00:41 hdl Exp $
# Database Updater
# This script checks for required updates to the database.
@@ -745,6 +745,14 @@
default => '',
extra => '',
},
+ {
+ field => 'issuedate',
+ type => 'date',
+ null => '',
+ key => '',
+ default => '0000-00-00',
+ extra => '',
+ },
],
items => [
@@ -2019,6 +2027,11 @@
exit;
# $Log: updatedatabase,v $
+# Revision 1.157.2.34 2006/12/07 16:00:41 hdl
+# Adding issuedate to table issues.
+# Modifying issuedate on issue (Circ2.pm)
+# Modifying report issue_avg_stats to take this change into account. (Need TESTING)
+#
# Revision 1.157.2.33 2006/12/06 14:12:18 btoumi
# add BorrowersTitles systempreferences to setup borrowers title
#
More information about the Koha-cvs
mailing list