[Koha-patches] [PATCH] BUG6271 renewals in both items and issues tables
Fridolyn SOMERS
fridolyn.somers at progilone.fr
Tue Aug 30 17:52:13 CEST 2011
---
C4/Accounts.pm | 2 +-
C4/Circulation.pm | 8 +++++---
C4/Overdues.pm | 3 ++-
misc/cronjobs/advance_notices.pl | 4 ++--
misc/cronjobs/overdue_notices.pl | 3 ++-
tools/inventory.pl | 6 +++++-
6 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/C4/Accounts.pm b/C4/Accounts.pm
index eea142c..1481bfc 100644
--- a/C4/Accounts.pm
+++ b/C4/Accounts.pm
@@ -295,7 +295,7 @@ sub chargelostitem{
my $dbh = C4::Context->dbh();
my ($itemnumber) = @_;
- my $sth=$dbh->prepare("SELECT issues.*,items.*,biblio.title
+ my $sth=$dbh->prepare("SELECT issues.*,items.*,biblio.title,issues.renewals AS renewals,items.renewals AS totalrenewals
FROM issues
JOIN items USING (itemnumber)
JOIN biblio USING (biblionumber)
diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 47068f9..02aa9c9 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1960,7 +1960,7 @@ sub GetItemIssue {
my ($itemnumber) = @_;
return unless $itemnumber;
my $sth = C4::Context->dbh->prepare(
- "SELECT *
+ "SELECT *,issues.renewals AS renewals,items.renewals AS totalrenewals
FROM issues
LEFT JOIN items ON issues.itemnumber=items.itemnumber
WHERE issues.itemnumber=?");
@@ -2011,13 +2011,15 @@ sub GetItemIssues {
my ( $itemnumber, $history ) = @_;
my $today = C4::Dates->today('iso'); # get today date
- my $sql = "SELECT * FROM issues
+ my $sql = "SELECT *,issues.renewals AS renewals,items.renewals AS totalrenewals
+ FROM issues
JOIN borrowers USING (borrowernumber)
JOIN items USING (itemnumber)
WHERE issues.itemnumber = ? ";
if ($history) {
$sql .= "UNION ALL
- SELECT * FROM old_issues
+ SELECT *,old_issues.renewals AS renewals,items.renewals AS totalrenewals
+ FROM old_issues
LEFT JOIN borrowers USING (borrowernumber)
JOIN items USING (itemnumber)
WHERE old_issues.itemnumber = ? ";
diff --git a/C4/Overdues.pm b/C4/Overdues.pm
index 28b135c..6ba733d 100644
--- a/C4/Overdues.pm
+++ b/C4/Overdues.pm
@@ -166,7 +166,8 @@ Returns a count and a list of overdueitems for a given borrowernumber
sub checkoverdues {
my $borrowernumber = shift or return;
my $sth = C4::Context->dbh->prepare(
- "SELECT * FROM issues
+ "SELECT *,issues.renewals AS renewals,items.renewals AS totalrenewals
+ FROM issues
LEFT JOIN items ON issues.itemnumber = items.itemnumber
LEFT JOIN biblio ON items.biblionumber = biblio.biblionumber
LEFT JOIN biblioitems ON items.biblioitemnumber = biblioitems.biblioitemnumber
diff --git a/misc/cronjobs/advance_notices.pl b/misc/cronjobs/advance_notices.pl
index 3ca4835..f1e912c 100755
--- a/misc/cronjobs/advance_notices.pl
+++ b/misc/cronjobs/advance_notices.pl
@@ -123,7 +123,7 @@ my $due_digest;
my $dbh = C4::Context->dbh();
my $sth = $dbh->prepare(<<'END_SQL');
-SELECT biblio.*, items.*, issues.*
+SELECT biblio.*, items.*, issues.*,issues.renewals AS renewals, items.renewals AS totalrenewals
FROM issues,items,biblio
WHERE items.itemnumber=issues.itemnumber
AND biblio.biblionumber=items.biblionumber
@@ -231,7 +231,7 @@ UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) {
# Now, run through all the people that want digests and send them
$sth = $dbh->prepare(<<'END_SQL');
-SELECT biblio.*, items.*, issues.*
+SELECT biblio.*, items.*, issues.*, ,issues.renewals AS renewals, items.renewals AS totalrenewals
FROM issues,items,biblio
WHERE items.itemnumber=issues.itemnumber
AND biblio.biblionumber=items.biblionumber
diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl
index 37774b5..8d7866c 100755
--- a/misc/cronjobs/overdue_notices.pl
+++ b/misc/cronjobs/overdue_notices.pl
@@ -375,7 +375,8 @@ foreach my $branchcode (@branches) {
$verbose and warn sprintf "branchcode : '%s' using %s\n", $branchcode, $admin_email_address;
my $sth2 = $dbh->prepare( <<'END_SQL' );
-SELECT biblio.*, items.*, issues.*, biblioitems.itemtype, TO_DAYS(NOW())-TO_DAYS(date_due) AS days_overdue
+SELECT biblio.*, items.*, issues.*, biblioitems.itemtype, TO_DAYS(NOW())-TO_DAYS(date_due) AS days_overdue,
+ issues.renewals AS renewals, items.renewals AS totalrenewals
FROM issues,items,biblio, biblioitems
WHERE items.itemnumber=issues.itemnumber
AND biblio.biblionumber = items.biblionumber
diff --git a/tools/inventory.pl b/tools/inventory.pl
index 5e7b198..5030f1d 100755
--- a/tools/inventory.pl
+++ b/tools/inventory.pl
@@ -142,7 +142,11 @@ if ($uploadbarcodes && length($uploadbarcodes)>0){
my $dbh=C4::Context->dbh;
my $date = format_date_in_iso($input->param('setdate')) || C4::Dates->today('iso');
# warn "$date";
- my $strsth="select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =?";
+ my $strsth="SELECT *,issues.renewals AS renewals,items.renewals AS totalrenewals
+ FROM issues, items
+ WHERE items.itemnumber=issues.itemnumber
+ AND items.barcode =?
+ ";
my $qonloan = $dbh->prepare($strsth);
$strsth="select * from items where items.barcode =? and items.wthdrawn = 1";
my $qwthdrawn = $dbh->prepare($strsth);
--
1.7.4.1
More information about the Koha-patches
mailing list