From edf7b852923f8ed7194c538e64a955c4ba373946 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 5 Mar 2020 10:59:22 +0000 Subject: [PATCH] Bug 24809: Get only timestamp of deleted items attached to existing bibs when check if bib deleted To test: 1 - Edit/create a file in the koha home dir '/var/lib/koha/{instance}/OAI.yaml' with content like below: format: marcxml: metadataPrefix: marcxml metadataNamespace: http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim schema: http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd include_items: 1 2 - Set the systempreferences below to indicated values: OAI-PMH => Enable OAI-PMH:ConfFile => /var/lib/koha/{instace}/OAI.yaml 3 - View a record with items and confirm the items show: http://localhost:8080/cgi-bin/koha/oai.pl?verb=GetRecord&metadataPrefix=marcxml&identifier=KOHA-OAI-TEST:4 4 - Delete the items, then delete the record 5 - Reload the URL from step 3 6 - Internal Server Error: Empty String at /kohadevbox/koha/Koha/OAI/Server/Record.pm line 58. at /usr/share/perl/5.24/Carp.pm line 167 7 - Apply patch 8 - restart_all 9 - Repeat 10 - Reload URL from step 3 11 - Success Signed-off-by: Michal Denar Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson (cherry picked from commit 68488f40558d66b7e4e444c1ed57a260b33ee034) Signed-off-by: Lucas Gass (cherry picked from commit d474a4edb165d7116b5bfc459d33e04cc88ca456) Signed-off-by: Hayley Mapley --- Koha/OAI/Server/GetRecord.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Koha/OAI/Server/GetRecord.pm b/Koha/OAI/Server/GetRecord.pm index d4870e3887..a6fa42814b 100644 --- a/Koha/OAI/Server/GetRecord.pm +++ b/Koha/OAI/Server/GetRecord.pm @@ -44,9 +44,10 @@ sub new { my @bind_params = ($biblionumber); if ( $items_included ) { # Take latest timestamp of biblio and any items + # Or timestamp of deleted items where bib not deleted $sql .= " UNION - SELECT timestamp from deleteditems + SELECT deleteditems.timestamp FROM deleteditems JOIN biblio USING (biblionumber) WHERE biblionumber=? UNION SELECT timestamp from items -- 2.39.5