Browse Source
- Fixed date handling to use UTC as specs require. - Added support for second precision in time stamps. - Added support for marc21 metadata prefix as recommended in the guidelines (synonym for marcxml). - Improved performance of database queries especially for large collections. - Unified functionality of ListRecords and ListIdentifiers to a common base class. - If items are included in the records, their timestamps are taken into account everywhere so that whichever is the most recent (timestamp of biblioitem or any of its items) is considered the record's timestamp. - Fixed OAI.xslt to show correct record range. - Incorporated extended tests from Bug 17493 and their tweaks from Bug 15108. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti@jns.fi> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>17.05.x
Ere Maijala
13 changed files with 592 additions and 223 deletions
@ -0,0 +1,182 @@ |
|||
package Koha::OAI::Server::ListBase; |
|||
|
|||
# Copyright The National Library of Finland, University of Helsinki 2016-2017 |
|||
# |
|||
# This file is part of Koha. |
|||
# |
|||
# Koha is free software; you can redistribute it and/or modify it |
|||
# under the terms of the GNU General Public License as published by |
|||
# the Free Software Foundation; either version 3 of the License, or |
|||
# (at your option) any later version. |
|||
# |
|||
# Koha is distributed in the hope that it will be useful, but |
|||
# WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
# GNU General Public License for more details. |
|||
# |
|||
# You should have received a copy of the GNU General Public License |
|||
# along with Koha; if not, see <http://www.gnu.org/licenses>. |
|||
|
|||
=head1 NAME |
|||
|
|||
Koha::OAI::Server::ListBase - OAI ListIdentifiers/ListRecords shared functionality |
|||
|
|||
=head1 DESCRIPTION |
|||
|
|||
Koha::OAI::Server::ListBase contains OAI-PMH functions shared by ListIdentifiers and ListRecords. |
|||
|
|||
=cut |
|||
|
|||
use Modern::Perl; |
|||
use C4::Biblio; |
|||
use HTTP::OAI; |
|||
use Koha::OAI::Server::ResumptionToken; |
|||
use Koha::OAI::Server::Record; |
|||
use Koha::OAI::Server::DeletedRecord; |
|||
use C4::OAI::Sets; |
|||
use MARC::File::XML; |
|||
|
|||
sub GetRecords { |
|||
my ($class, $self, $repository, $metadata, %args) = @_; |
|||
|
|||
my $token = new Koha::OAI::Server::ResumptionToken( %args ); |
|||
my $dbh = C4::Context->dbh; |
|||
my $set; |
|||
if ( defined $token->{'set'} ) { |
|||
$set = GetOAISetBySpec($token->{'set'}); |
|||
} |
|||
my $offset = $token->{offset}; |
|||
my $deleted = defined $token->{deleted} ? $token->{deleted} : 0; |
|||
my $deleted_count = defined $token->{deleted_count} ? $token->{deleted_count} : 0; |
|||
my $max = $repository->{koha_max_count}; |
|||
my $count = 0; |
|||
my $format = $args{metadataPrefix} || $token->{metadata_prefix}; |
|||
my $include_items = $repository->items_included( $format ); |
|||
|
|||
# Since creating a union of normal and deleted record tables would be a heavy |
|||
# operation in a large database, build results in two stages: |
|||
# first deleted records ($deleted == 1), then normal records ($deleted == 0) |
|||
STAGELOOP: |
|||
for ( ; $deleted >= 0; $deleted-- ) { |
|||
my $table = $deleted ? 'deletedbiblioitems' : 'biblioitems'; |
|||
my $sql = " |
|||
SELECT biblionumber |
|||
FROM $table |
|||
WHERE (timestamp >= ? AND timestamp <= ?) |
|||
"; |
|||
my @bind_params = ($token->{'from_arg'}, $token->{'until_arg'}); |
|||
|
|||
if ($include_items) { |
|||
$sql .= " |
|||
OR biblionumber IN (SELECT biblionumber from deleteditems WHERE timestamp >= ? AND timestamp <= ?) |
|||
"; |
|||
push @bind_params, ($token->{'from_arg'}, $token->{'until_arg'}); |
|||
if (!$deleted) { |
|||
$sql .= " |
|||
OR biblionumber IN (SELECT biblionumber from items WHERE timestamp >= ? AND timestamp <= ?) |
|||
"; |
|||
push @bind_params, ($token->{'from_arg'}, $token->{'until_arg'}); |
|||
} |
|||
} |
|||
|
|||
$sql .= " |
|||
ORDER BY biblionumber |
|||
"; |
|||
|
|||
# Use a subquery for sets since it allows us to use an index in |
|||
# biblioitems table and is quite a bit faster than a join. |
|||
if (defined $set) { |
|||
$sql = " |
|||
SELECT bi.* FROM ($sql) bi |
|||
WHERE bi.biblionumber in (SELECT osb.biblionumber FROM oai_sets_biblios osb WHERE osb.set_id = ?) |
|||
"; |
|||
push @bind_params, $set->{'id'}; |
|||
} |
|||
|
|||
$sql .= " |
|||
LIMIT " . ($max + 1) . " |
|||
OFFSET " . ($offset - $deleted_count); |
|||
|
|||
my $sth = $dbh->prepare( $sql ) || die( 'Could not prepare statement: ' . $dbh->errstr ); |
|||
|
|||
if ( $deleted ) { |
|||
$sql = " |
|||
SELECT MAX(timestamp) |
|||
FROM ( |
|||
SELECT timestamp FROM deletedbiblioitems WHERE biblionumber = ? |
|||
UNION |
|||
SELECT timestamp FROM deleteditems WHERE biblionumber = ? |
|||
) bis |
|||
"; |
|||
} else { |
|||
$sql = " |
|||
SELECT MAX(timestamp) |
|||
FROM ( |
|||
SELECT timestamp FROM biblioitems WHERE biblionumber = ? |
|||
UNION |
|||
SELECT timestamp FROM deleteditems WHERE biblionumber = ? |
|||
UNION |
|||
SELECT timestamp FROM items WHERE biblionumber = ? |
|||
) bi |
|||
"; |
|||
} |
|||
my $record_sth = $dbh->prepare( $sql ) || die( 'Could not prepare statement: ' . $dbh->errstr ); |
|||
|
|||
$sth->execute( @bind_params ) || die( 'Could not execute statement: ' . $sth->errstr ); |
|||
while ( my ($biblionumber) = $sth->fetchrow ) { |
|||
$count++; |
|||
if ( $count > $max ) { |
|||
$self->resumptionToken( |
|||
new Koha::OAI::Server::ResumptionToken( |
|||
metadataPrefix => $token->{metadata_prefix}, |
|||
from => $token->{from}, |
|||
until => $token->{until}, |
|||
offset => $token->{offset} + $max, |
|||
set => $token->{set}, |
|||
deleted => $deleted, |
|||
deleted_count => $deleted_count |
|||
) |
|||
); |
|||
last STAGELOOP; |
|||
} |
|||
my @params = $deleted ? ( $biblionumber, $biblionumber ) : ( $biblionumber, $biblionumber, $biblionumber ); |
|||
$record_sth->execute( @params ) || die( 'Could not execute statement: ' . $sth->errstr ); |
|||
|
|||
my ($timestamp) = $record_sth->fetchrow; |
|||
|
|||
my $oai_sets = GetOAISetsBiblio($biblionumber); |
|||
my @setSpecs; |
|||
foreach ( @$oai_sets ) { |
|||
push @setSpecs, $_->{spec}; |
|||
} |
|||
if ( $metadata ) { |
|||
my $marcxml = !$deleted ? $repository->get_biblio_marcxml($biblionumber, $format) : undef; |
|||
if ( $marcxml ) { |
|||
$self->record( Koha::OAI::Server::Record->new( |
|||
$repository, $marcxml, $timestamp, \@setSpecs, |
|||
identifier => $repository->{ koha_identifier } . ':' . $biblionumber, |
|||
metadataPrefix => $token->{metadata_prefix} |
|||
) ); |
|||
} else { |
|||
$self->record( Koha::OAI::Server::DeletedRecord->new( |
|||
$timestamp, \@setSpecs, identifier => $repository->{ koha_identifier } . ':' . $biblionumber |
|||
) ); |
|||
} |
|||
} else { |
|||
$timestamp =~ s/ /T/; |
|||
$timestamp .= 'Z'; |
|||
$self->identifier( new HTTP::OAI::Header( |
|||
identifier => $repository->{ koha_identifier} . ':' . $biblionumber, |
|||
datestamp => $timestamp, |
|||
status => $deleted ? 'deleted' : undef |
|||
) ); |
|||
} |
|||
} |
|||
# Store offset and deleted record count |
|||
$offset += $count; |
|||
$deleted_count = $offset if ($deleted); |
|||
} |
|||
return $count; |
|||
} |
|||
|
|||
1; |
|||
@ -0,0 +1,11 @@ |
|||
$DBversion = 'XXX'; # will be replaced by the RM |
|||
if( CheckVersion( $DBversion ) ) { |
|||
$dbh->do("ALTER TABLE biblioitems ADD KEY `timestamp` (`timestamp`);"); |
|||
$dbh->do("ALTER TABLE deletedbiblioitems ADD KEY `timestamp` (`timestamp`);"); |
|||
$dbh->do("ALTER TABLE items ADD KEY `timestamp` (`timestamp`);"); |
|||
$dbh->do("ALTER TABLE deleteditems ADD KEY `timestamp` (`timestamp`);"); |
|||
|
|||
# Always end with this (adjust the bug info) |
|||
SetVersion( $DBversion ); |
|||
print "Upgrade to $DBversion done (Bug 15108 - OAI-PMH provider improvements)\n"; |
|||
} |
|||
Loading…
Reference in new issue