#!/usr/bin/perl
-# Copyright Tamil s.a.r.l. 2015
+# Copyright Tamil s.a.r.l. 2016
#
# This file is part of Koha.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
-
use Modern::Perl;
-use C4::Context;
-use C4::Biblio;
-use Test::More tests => 13;
+use Test::MockTime qw/set_fixed_time restore_time/;
+
+use Test::More tests => 31;
+use DateTime;
+use File::Basename;
+use File::Spec;
use Test::MockModule;
use Test::Warn;
-use DateTime;
use XML::Simple;
+use YAML::XS;
+
use t::lib::Mocks;
+use C4::Biblio;
+use C4::Context;
+
+use Koha::Biblio::Metadatas;
+use Koha::Database;
+use Koha::DateUtils;
BEGIN {
use_ok('Koha::OAI::Server::DeletedRecord');
use_ok('Koha::OAI::Server::Description');
use_ok('Koha::OAI::Server::GetRecord');
use_ok('Koha::OAI::Server::Identify');
+ use_ok('Koha::OAI::Server::ListBase');
use_ok('Koha::OAI::Server::ListIdentifiers');
use_ok('Koha::OAI::Server::ListMetadataFormats');
use_ok('Koha::OAI::Server::ListRecords');
use_ok('Koha::OAI::Server::ResumptionToken');
}
+use constant NUMBER_OF_MARC_RECORDS => 10;
# Mocked CGI module in order to be able to send CGI parameters to OAI Server
my %param;
my $module = Test::MockModule->new('CGI');
$module->mock('Vars', sub { %param; });
+my $schema = Koha::Database->schema;
+$schema->storage->txn_begin;
my $dbh = C4::Context->dbh;
-$dbh->{AutoCommit} = 0;
-$dbh->{RaiseError} = 1;
+
+$dbh->do("SET time_zone='+00:00'");
$dbh->do('DELETE FROM issues');
$dbh->do('DELETE FROM biblio');
-$dbh->do('DELETE FROM biblioitems');
-$dbh->do('DELETE FROM items');
+$dbh->do('DELETE FROM deletedbiblio');
+$dbh->do('DELETE FROM deletedbiblioitems');
+$dbh->do('DELETE FROM deleteditems');
+$dbh->do('DELETE FROM oai_sets');
+
+set_fixed_time(CORE::time());
+
+my $base_datetime = dt_from_string();
+my $date_added = $base_datetime->ymd . ' ' .$base_datetime->hms . 'Z';
+my $date_to = substr($date_added, 0, 10) . 'T23:59:59Z';
+my (@header, @marcxml, @oaidc, @marcxml_transformed);
+my $sth = $dbh->prepare('UPDATE biblioitems SET timestamp=? WHERE biblionumber=?');
+my $sth2 = $dbh->prepare('UPDATE biblio_metadata SET timestamp=? WHERE biblionumber=?');
-# Add 10 biblio records
-my @bibs = map {
+# Add biblio records
+foreach my $index ( 0 .. NUMBER_OF_MARC_RECORDS - 1 ) {
my $record = MARC::Record->new();
- $record->append_fields( MARC::Field->new('245', '', '', 'a' => "Title $_" ) );
+ if (C4::Context->preference('marcflavour') eq 'UNIMARC') {
+ $record->append_fields( MARC::Field->new('101', '', '', 'a' => "lng" ) );
+ $record->append_fields( MARC::Field->new('200', '', '', 'a' => "Title $index" ) );
+ $record->append_fields( MARC::Field->new('952', '', '', 'a' => "Code" ) );
+ } else {
+ $record->append_fields( MARC::Field->new('008', ' lng' ) );
+ $record->append_fields( MARC::Field->new('245', '', '', 'a' => "Title $index" ) );
+ $record->append_fields( MARC::Field->new('952', '', '', 'a' => "Code" ) );
+ }
my ($biblionumber) = AddBiblio($record, '');
- $biblionumber;
-} (1..10);
-
-t::lib::Mocks::mock_preference('LibraryName', 'My Library');
-t::lib::Mocks::mock_preference('OAI::PMH', 1);
-t::lib::Mocks::mock_preference('OAI-PMH:archiveID', 'TEST');
-t::lib::Mocks::mock_preference('OAI-PMH:ConfFile', '' );
-t::lib::Mocks::mock_preference('OAI-PMH:MaxCount', 3);
-t::lib::Mocks::mock_preference('OAI-PMH:DeletedRecord', 'persistent');
-
-%param = ( verb => 'ListMetadataFormats' );
-my $response;
-my $get_response = sub {
- my $stdout;
- local *STDOUT;
- open STDOUT, '>', \$stdout;
- Koha::OAI::Server::Repository->new();
- $response = XMLin($stdout);
+ my $timestamp = $base_datetime->ymd . ' ' .$base_datetime->hms;
+ $sth->execute($timestamp,$biblionumber);
+ $sth2->execute($timestamp,$biblionumber);
+ $timestamp .= 'Z';
+ $timestamp =~ s/ /T/;
+ $record = GetMarcBiblio({ biblionumber => $biblionumber });
+ my $record_transformed = $record->clone;
+ $record_transformed->delete_fields( $record_transformed->field('952'));
+ $record_transformed = XMLin($record_transformed->as_xml_record);
+ $record = XMLin($record->as_xml_record);
+ push @header, { datestamp => $timestamp, identifier => "TEST:$biblionumber" };
+ my $dc = {
+ 'dc:title' => "Title $index",
+ 'dc:language' => "lng",
+ 'dc:type' => {},
+ 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+ 'xmlns:oai_dc' => 'http://www.openarchives.org/OAI/2.0/oai_dc/',
+ 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/',
+ 'xsi:schemaLocation' => 'http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd',
+ };
+ if (C4::Context->preference('marcflavour') eq 'UNIMARC') {
+ $dc->{'dc:identifier'} = $biblionumber;
+ }
+ push @oaidc, {
+ header => $header[$index],
+ metadata => {
+ 'oai_dc:dc' => $dc,
+ },
+ };
+ push @marcxml, {
+ header => $header[$index],
+ metadata => {
+ record => $record,
+ },
+ };
+
+ push @marcxml_transformed, {
+ header => $header[$index],
+ metadata => {
+ record => $record_transformed,
+ },
+ };
+}
+
+my $syspref = {
+ 'LibraryName' => 'My Library',
+ 'OAI::PMH' => 1,
+ 'OAI-PMH:archiveID' => 'TEST',
+ 'OAI-PMH:ConfFile' => '',
+ 'OAI-PMH:MaxCount' => 3,
+ 'OAI-PMH:DeletedRecord' => 'persistent',
};
-$get_response->();
-my $now = DateTime->now . 'Z';
-my $expected = {
- request => 'http://localhost',
- responseDate => $now,
- xmlns => 'http://www.openarchives.org/OAI/2.0/',
- 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
- 'xsi:schemaLocation' => 'http://www.openarchives.org/OAI/2.0/ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd',
+while ( my ($name, $value) = each %$syspref ) {
+ t::lib::Mocks::mock_preference( $name => $value );
+}
+
+sub test_query {
+ my ($test, $param, $expected) = @_;
+
+ %param = %$param;
+ my %full_expected = (
+ %$expected,
+ (
+ request => 'http://localhost',
+ xmlns => 'http://www.openarchives.org/OAI/2.0/',
+ 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+ 'xsi:schemaLocation' => 'http://www.openarchives.org/OAI/2.0/ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd',
+ )
+ );
+
+ my $response;
+ {
+ my $stdout;
+ local *STDOUT;
+ open STDOUT, '>', \$stdout;
+ Koha::OAI::Server::Repository->new();
+ $response = XMLin($stdout);
+ }
+
+ delete $response->{responseDate};
+ unless (is_deeply($response, \%full_expected, $test)) {
+ diag
+ "PARAM:" . YAML::XS::Dump($param) .
+ "EXPECTED:" . YAML::XS::Dump(\%full_expected) .
+ "RESPONSE:" . YAML::XS::Dump($response);
+ }
+}
+
+test_query('ListMetadataFormats', {verb => 'ListMetadataFormats'}, {
ListMetadataFormats => {
metadataFormat => [
{
schema => 'http://www.openarchives.org/OAI/2.0/oai_dc.xsd',
},
{
- metadataNamespace => 'http://www.loc.gov/MARC21/slim http://www.loc.gov/ standards/marcxml/schema/MARC21slim',
+ metadataNamespace => 'http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim',
+ metadataPrefix => 'marc21',
+ schema => 'http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd',
+ },
+ {
+ metadataNamespace => 'http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim',
metadataPrefix => 'marcxml',
- schema => 'http://www.loc.gov/MARC21/slim http://www.loc.gov/ standards/marcxml/schema/MARC21slim.xsd',
+ schema => 'http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd',
},
],
},
-};
-is_deeply($response, $expected, "ListMetadataFormats");
-
-%param = ( verb => 'ListIdentifiers' );
-$get_response->();
-$now = DateTime->now . 'Z';
-$expected = {
- request => 'http://localhost',
- responseDate => $now,
- xmlns => 'http://www.openarchives.org/OAI/2.0/',
- 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
- 'xsi:schemaLocation' => 'http://www.openarchives.org/OAI/2.0/ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd',
+});
+
+test_query('ListIdentifiers without metadataPrefix', {verb => 'ListIdentifiers'}, {
error => {
code => 'badArgument',
content => "Required argument 'metadataPrefix' was undefined",
},
+});
+
+test_query('ListIdentifiers', {verb => 'ListIdentifiers', metadataPrefix => 'marcxml'}, {
+ ListIdentifiers => {
+ header => [ @header[0..2] ],
+ resumptionToken => {
+ content => "marcxml/3/1970-01-01T00:00:00Z/$date_to//0/0",
+ cursor => 3,
+ },
+ },
+});
+
+test_query('ListIdentifiers', {verb => 'ListIdentifiers', metadataPrefix => 'marcxml'}, {
+ ListIdentifiers => {
+ header => [ @header[0..2] ],
+ resumptionToken => {
+ content => "marcxml/3/1970-01-01T00:00:00Z/$date_to//0/0",
+ cursor => 3,
+ },
+ },
+});
+
+test_query(
+ 'ListIdentifiers with resumptionToken 1',
+ { verb => 'ListIdentifiers', resumptionToken => "marcxml/3/1970-01-01T00:00:00Z/$date_to//0/0" },
+ {
+ ListIdentifiers => {
+ header => [ @header[3..5] ],
+ resumptionToken => {
+ content => "marcxml/6/1970-01-01T00:00:00Z/$date_to//0/0",
+ cursor => 6,
+ },
+ },
+ },
+);
+
+test_query(
+ 'ListIdentifiers with resumptionToken 2',
+ { verb => 'ListIdentifiers', resumptionToken => "marcxml/6/1970-01-01T00:00:00Z/$date_to//0/0" },
+ {
+ ListIdentifiers => {
+ header => [ @header[6..8] ],
+ resumptionToken => {
+ content => "marcxml/9/1970-01-01T00:00:00Z/$date_to//0/0",
+ cursor => 9,
+ },
+ },
+ },
+);
+
+test_query(
+ 'ListIdentifiers with resumptionToken 3, response without resumption',
+ { verb => 'ListIdentifiers', resumptionToken => "marcxml/9/1970-01-01T00:00:00Z/$date_to//0/0" },
+ {
+ ListIdentifiers => {
+ header => $header[9],
+ },
+ },
+);
+
+test_query('ListRecords marcxml without metadataPrefix', {verb => 'ListRecords'}, {
+ error => {
+ code => 'badArgument',
+ content => "Required argument 'metadataPrefix' was undefined",
+ },
+});
+
+test_query('ListRecords marcxml', {verb => 'ListRecords', metadataPrefix => 'marcxml'}, {
+ ListRecords => {
+ record => [ @marcxml[0..2] ],
+ resumptionToken => {
+ content => "marcxml/3/1970-01-01T00:00:00Z/$date_to//0/0",
+ cursor => 3,
+ },
+ },
+});
+
+test_query(
+ 'ListRecords marcxml with resumptionToken 1',
+ { verb => 'ListRecords', resumptionToken => "marcxml/3/1970-01-01T00:00:00Z/$date_to//0/0" },
+ { ListRecords => {
+ record => [ @marcxml[3..5] ],
+ resumptionToken => {
+ content => "marcxml/6/1970-01-01T00:00:00Z/$date_to//0/0",
+ cursor => 6,
+ },
+ },
+});
+
+test_query(
+ 'ListRecords marcxml with resumptionToken 2',
+ { verb => 'ListRecords', resumptionToken => "marcxml/6/1970-01-01T00:00:00Z/$date_to//0/0" },
+ { ListRecords => {
+ record => [ @marcxml[6..8] ],
+ resumptionToken => {
+ content => "marcxml/9/1970-01-01T00:00:00Z/$date_to//0/0",
+ cursor => 9,
+ },
+ },
+});
+
+# Last record, so no resumption token
+test_query(
+ 'ListRecords marcxml with resumptionToken 3, response without resumption',
+ { verb => 'ListRecords', resumptionToken => "marcxml/9/1970-01-01T00:00:00Z/$date_to//0/0" },
+ { ListRecords => {
+ record => $marcxml[9],
+ },
+});
+
+test_query('ListRecords oai_dc', {verb => 'ListRecords', metadataPrefix => 'oai_dc'}, {
+ ListRecords => {
+ record => [ @oaidc[0..2] ],
+ resumptionToken => {
+ content => "oai_dc/3/1970-01-01T00:00:00Z/$date_to//0/0",
+ cursor => 3,
+ },
+ },
+});
+
+test_query(
+ 'ListRecords oai_dc with resumptionToken 1',
+ { verb => 'ListRecords', resumptionToken => "oai_dc/3/1970-01-01T00:00:00Z/$date_to//0/0" },
+ { ListRecords => {
+ record => [ @oaidc[3..5] ],
+ resumptionToken => {
+ content => "oai_dc/6/1970-01-01T00:00:00Z/$date_to//0/0",
+ cursor => 6,
+ },
+ },
+});
+
+test_query(
+ 'ListRecords oai_dc with resumptionToken 2',
+ { verb => 'ListRecords', resumptionToken => "oai_dc/6/1970-01-01T00:00:00Z/$date_to//0/0" },
+ { ListRecords => {
+ record => [ @oaidc[6..8] ],
+ resumptionToken => {
+ content => "oai_dc/9/1970-01-01T00:00:00Z/$date_to//0/0",
+ cursor => 9,
+ },
+ },
+});
+
+# Last record, so no resumption token
+test_query(
+ 'ListRecords oai_dc with resumptionToken 3, response without resumption',
+ { verb => 'ListRecords', resumptionToken => "oai_dc/9/1970-01-01T00:00:00Z/$date_to//0/0" },
+ { ListRecords => {
+ record => $oaidc[9],
+ },
+});
+
+# List records, but now transformed by XSLT
+t::lib::Mocks::mock_preference("OAI-PMH:ConfFile" => File::Spec->rel2abs(dirname(__FILE__)) . "/oaiconf.yaml");
+test_query('ListRecords marcxml with xsl transformation',
+ { verb => 'ListRecords', metadataPrefix => 'marcxml' },
+ { ListRecords => {
+ record => [ @marcxml_transformed[0..2] ],
+ resumptionToken => {
+ content => "marcxml/3/1970-01-01T00:00:00Z/$date_to//0/0",
+ cursor => 3,
+ }
+ },
+});
+t::lib::Mocks::mock_preference("OAI-PMH:ConfFile" => '');
+
+restore_time();
+
+subtest 'Bug 19725: OAI-PMH ListRecords and ListIdentifiers should use biblio_metadata.timestamp' => sub {
+ plan tests => 1;
+
+ # Wait 1 second to be sure no timestamp will be equal to $from defined below
+ sleep 1;
+
+ # Modify record to trigger auto update of timestamp
+ (my $biblionumber = $marcxml[0]->{header}->{identifier}) =~ s/^.*:(.*)/$1/;
+ my $record = GetMarcBiblio({biblionumber => $biblionumber});
+ $record->append_fields(MARC::Field->new(999, '', '', z => '_'));
+ ModBiblio( $record, $biblionumber );
+ my $from_dt = dt_from_string(
+ Koha::Biblio::Metadatas->find({ biblionumber => $biblionumber, format => 'marcxml', schema => 'MARC21' })->timestamp
+ );
+ my $from = $from_dt->ymd . 'T' . $from_dt->hms . 'Z';
+ $oaidc[0]->{header}->{datestamp} = $from;
+
+ test_query(
+ 'ListRecords oai_dc with parameter from',
+ { verb => 'ListRecords', metadataPrefix => 'oai_dc', from => $from },
+ { ListRecords => {
+ record => $oaidc[0],
+ },
+ });
};
-is_deeply($response, $expected, "ListIdentifiers without metadaPrefix argument");
-$dbh->rollback;
+subtest 'Bug 20665: OAI-PMH Provider should reset the MySQL connection time zone' => sub {
+ plan tests => 2;
+
+ # Set time zone to SYSTEM so that it can be checked later
+ $dbh->do("SET time_zone='SYSTEM'");
+
+
+ test_query('ListIdentifiers without metadataPrefix', {verb => 'ListIdentifiers'}, {
+ error => {
+ code => 'badArgument',
+ content => "Required argument 'metadataPrefix' was undefined",
+ },
+ });
+
+ my $sth = C4::Context->dbh->prepare('SELECT @@session.time_zone');
+ $sth->execute();
+ my ( $tz ) = $sth->fetchrow();
+
+ ok ( $tz eq 'SYSTEM', 'MySQL connection time zone is SYSTEM' );
+};
+
+
+$schema->storage->txn_rollback;
projects / koha-ffzg.git / blobdiff