Merge remote-tracking branch 'origin/new/bug_7146'

This commit is contained in:
Paul Poulain 2011-11-06 12:04:43 +01:00
commit 1e5347fb34
2 changed files with 13 additions and 6 deletions

View File

@ -3522,9 +3522,12 @@ sub _koha_delete_biblio {
$bkup_sth->finish;
# delete the biblio
my $del_sth = $dbh->prepare("DELETE FROM biblio WHERE biblionumber=?");
$del_sth->execute($biblionumber);
$del_sth->finish;
my $sth2 = $dbh->prepare("DELETE FROM biblio WHERE biblionumber=?");
$sth2->execute($biblionumber);
# update the timestamp (Bugzilla 7146)
$sth2= $dbh->prepare("UPDATE deletedbiblio SET timestamp=NOW() WHERE biblionumber=?");
$sth2->execute($biblionumber);
$sth2->finish;
}
$sth->finish;
return undef;
@ -3568,9 +3571,12 @@ sub _koha_delete_biblioitems {
$bkup_sth->finish;
# delete the biblioitem
my $del_sth = $dbh->prepare("DELETE FROM biblioitems WHERE biblioitemnumber=?");
$del_sth->execute($biblioitemnumber);
$del_sth->finish;
my $sth2 = $dbh->prepare("DELETE FROM biblioitems WHERE biblioitemnumber=?");
$sth2->execute($biblioitemnumber);
# update the timestamp (Bugzilla 7146)
$sth2= $dbh->prepare("UPDATE deletedbiblioitems SET timestamp=NOW() WHERE biblioitemnumber=?");
$sth2->execute($biblioitemnumber);
$sth2->finish;
}
$sth->finish;
return undef;

View File

@ -587,6 +587,7 @@ sub DelItem {
# backup the record
my $copy2deleted = $dbh->prepare("UPDATE deleteditems SET marc=? WHERE itemnumber=?");
$copy2deleted->execute( $record->as_usmarc(), $itemnumber );
# This last update statement makes that the timestamp column in deleteditems is updated too. If you remove these lines, please add a line to update the timestamp separately. See Bugzilla report 7146 and Biblio.pm (DelBiblio).
#search item field code
logaction("CATALOGUING", "DELETE", $itemnumber, "item") if C4::Context->preference("CataloguingLog");