@@ -, +, @@ schema ->schema instead for all interactions. - Update the DB structure: $ updatedatabase - Update the schema files: $ dbic - Notice all the places in which biblio_metadata is used $ cd kohaclone $ git grep biblio_metadata - Notice all the places that use Koha::Biblio::Metadata: $ git grep Koha::Biblio::Metadata - Run all the modified tests and scripts - Sign off :-D --- C4/Biblio.pm | 9 ++++----- C4/Items.pm | 2 +- misc/cronjobs/delete_records_via_leader.pl | 2 +- misc/maintenance/sanitize_records.pl | 2 +- misc/migration_tools/build_oai_sets.pl | 2 +- misc/migration_tools/switch_marc21_series_info.pl | 4 ++-- t/db_dependent/Exporter/Record.t | 4 ++-- t/db_dependent/OAI/Server.t | 2 +- 8 files changed, 13 insertions(+), 14 deletions(-) --- a/C4/Biblio.pm +++ a/C4/Biblio.pm @@ -101,7 +101,6 @@ use C4::Debug; use Koha::Caches; use Koha::Authority::Types; use Koha::Acquisition::Currencies; -use Koha::Biblio::Metadata; use Koha::Biblio::Metadatas; use Koha::Holds; use Koha::ItemTypes; @@ -1220,7 +1219,7 @@ sub GetXmlBiblio { FROM biblio_metadata WHERE biblionumber=? AND format='marcxml' - AND marcflavour=? + AND `schema`=? |, undef, $biblionumber, C4::Context->preference('marcflavour') ); return $marcxml; @@ -3248,8 +3247,8 @@ sub _koha_delete_biblio_metadata { $schema->txn_do( sub { $dbh->do( q| - INSERT INTO deletedbiblio_metadata (biblionumber, format, marcflavour, metadata) - SELECT biblionumber, format, marcflavour, metadata FROM biblio_metadata WHERE biblionumber=? + INSERT INTO deletedbiblio_metadata (biblionumber, format, `schema`, metadata) + SELECT biblionumber, format, `schema`, metadata FROM biblio_metadata WHERE biblionumber=? |, undef, $biblionumber ); $dbh->do( q|DELETE FROM biblio_metadata WHERE biblionumber=?|, undef, $biblionumber ); @@ -3321,7 +3320,7 @@ sub ModBiblioMarc { my $metadata = { biblionumber => $biblionumber, format => 'marcxml', - marcflavour => C4::Context->preference('marcflavour'), + schema => C4::Context->preference('marcflavour'), }; $record->as_usmarc; # Bug 20126/10455 This triggers field length calculation --- a/C4/Items.pm +++ a/C4/Items.pm @@ -2312,7 +2312,7 @@ sub SearchItems { $query .= qq{ AND $where_str }; } - $query .= q{ AND biblio_metadata.format = 'marcxml' AND biblio_metadata.marcflavour = ? }; + $query .= q{ AND biblio_metadata.format = 'marcxml' AND biblio_metadata.schema = ? }; push @where_args, C4::Context->preference('marcflavour'); my @columns = Koha::Database->new()->schema()->resultset('Item')->result_source->columns; --- a/misc/cronjobs/delete_records_via_leader.pl +++ a/misc/cronjobs/delete_records_via_leader.pl @@ -79,7 +79,7 @@ This script has the following parameters : my @metadatas = # Should be replaced by a call to C4::Search on zebra index # Record-status when bug 15537 will be pushed - Koha::Biblio::Metadatas->search( { format => 'marcxml', marcflavour => C4::Context->preference('marcflavour'), metadata => { LIKE => '%_____d%' } } ); + Koha::Biblio::Metadatas->search( { format => 'marcxml', schema => C4::Context->preference('marcflavour'), metadata => { LIKE => '%_____d%' } } ); my $total_records_count = @metadatas; my $deleted_records_count = 0; --- a/misc/maintenance/sanitize_records.pl +++ a/misc/maintenance/sanitize_records.pl @@ -152,7 +152,7 @@ sub biblios_to_sanitize { SELECT biblionumber FROM biblio_metadata WHERE format = 'marcxml' - AND marcflavour = ? + AND `schema` = ? AND metadata LIKE "%&%" }; return @{ $dbh->selectcol_arrayref( $query, { Slice => {} }, C4::Context->preference('marcflavour') ) }; --- a/misc/migration_tools/build_oai_sets.pl +++ a/misc/migration_tools/build_oai_sets.pl @@ -73,7 +73,7 @@ my $query = qq{ SELECT biblionumber, metadata FROM biblio_metadata WHERE format='marcxml' - AND marcflavour = ? + AND `schema` = ? }; if($length) { $query .= "LIMIT $length"; --- a/misc/migration_tools/switch_marc21_series_info.pl +++ a/misc/migration_tools/switch_marc21_series_info.pl @@ -63,7 +63,7 @@ my $count_sth = $dbh->prepare( SELECT COUNT(biblionumber) FROM biblio_metadata WHERE format='marcxml' - AND marcflavour=? + AND `schema`=? AND ( ExtractValue(metadata,'//datafield[@tag="440"]/subfield[@code="a"]') OR ExtractValue(metadata,'//datafield[@tag="440"]/subfield[@code="v"]') @@ -79,7 +79,7 @@ my $bibs_sth = $dbh->prepare( SELECT biblionumber FROM biblio_metadata WHERE format='marcxml' - AND marcflavour=? + AND `schema`=? AND ( ExtractValue(metadata,'//datafield[@tag="440"]/subfield[@code="a"]') OR ExtractValue(metadata,'//datafield[@tag="440"]/subfield[@code="v"]') --- a/t/db_dependent/Exporter/Record.t +++ a/t/db_dependent/Exporter/Record.t @@ -34,7 +34,7 @@ use Koha::Database; use Koha::Biblio; use Koha::Biblioitem; use Koha::Exporter::Record; -use Koha::Biblio::Metadata; +use Koha::Biblio::Metadatas; my $schema = Koha::Database->new->schema; $schema->storage->txn_begin; @@ -59,7 +59,7 @@ $biblio_2->append_fields( my ($biblionumber_2, $biblioitemnumber_2) = AddBiblio($biblio_2, ''); my $bad_biblio = Koha::Biblio->new()->store(); -Koha::Biblio::Metadata->new( { biblionumber => $bad_biblio->id, format => 'marcxml', metadata => 'something wrong', marcflavour => C4::Context->preference('marcflavour') } )->store(); +Koha::Biblio::Metadata->new( { biblionumber => $bad_biblio->id, format => 'marcxml', metadata => 'something wrong', schema => C4::Context->preference('marcflavour') } )->store(); my $bad_biblionumber = $bad_biblio->id; my $builder = t::lib::TestBuilder->new; --- a/t/db_dependent/OAI/Server.t +++ a/t/db_dependent/OAI/Server.t @@ -362,7 +362,7 @@ subtest 'Bug 19725: OAI-PMH ListRecords and ListIdentifiers should use biblio_me $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', marcflavour => 'MARC21' })->timestamp + 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; --