From 68cd4ae67627d22ed898c8a8711ff9068c381cea Mon Sep 17 00:00:00 2001 From: Benjamin Rokseth Date: Tue, 3 Apr 2018 00:17:46 +0200 Subject: [PATCH] Bug 20271: remove comments regarding deleteditems and -biblio* Signed-off-by: Brendan A Gallagher Signed-off-by: Martin Renvoize Signed-off-by: Josef Moravec --- C4/Biblio.pm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/C4/Biblio.pm b/C4/Biblio.pm index 4f0bd03..e392850 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -414,7 +414,7 @@ sub DelBiblio { # and we would have no way to remove it (except manually in zebra, but I bet it would be very hard to handle the problem) ModZebra( $biblionumber, "recordDelete", "biblioserver" ); - # delete biblioitems and items from Koha tables and save in deletedbiblioitems,deleteditems + # mark biblioitems and items as deleted $sth = $dbh->prepare("SELECT biblioitemnumber FROM biblioitems WHERE biblionumber=? AND deleted_at IS NULL"); $sth->execute($biblionumber); while ( my $biblioitemnumber = $sth->fetchrow ) { @@ -424,11 +424,6 @@ sub DelBiblio { return $error if $error; } - - # delete biblio from Koha tables and save in deletedbiblio - # must do this *after* _koha_delete_biblioitems, otherwise - # delete cascade will prevent deletedbiblioitems rows - # from being generated by _koha_delete_biblioitems $error = _koha_delete_biblio( $dbh, $biblionumber ); logaction( "CATALOGUING", "DELETE", $biblionumber, "biblio" ) if C4::Context->preference("CataloguingLog"); @@ -3114,11 +3109,11 @@ sub _koha_add_biblioitem { $error = _koha_delete_biblio($dbh,$biblionumber); -Internal sub for deleting from biblio table -- also saves to deletedbiblio +Internal sub for deleting from biblio table C<$dbh> - the database handle -C<$biblionumber> - the biblionumber of the biblio to be deleted +C<$biblionumber> - the biblionumber of the biblio (and metadata) to be marked as deleted =cut @@ -3135,10 +3130,10 @@ sub _koha_delete_biblio { $error = _koha_delete_biblioitems($dbh,$biblioitemnumber); -Internal sub for deleting from biblioitems table -- also saves to deletedbiblioitems +Internal sub for deleting from biblioitems table C<$dbh> - the database handle -C<$biblionumber> - the biblioitemnumber of the biblioitem to be deleted +C<$biblionumber> - the biblioitemnumber of the biblioitem to be marked as deleted =cut @@ -3154,7 +3149,7 @@ sub _koha_delete_biblioitems { $error = _koha_delete_biblio_metadata($biblionumber); -C<$biblionumber> - the biblionumber of the biblio metadata to be deleted +C<$biblionumber> - the biblionumber of the biblio metadata to be marked as deleted =cut -- 2.1.4