Bugzilla – Attachment 66330 Details for
Bug 10306
Koha to MARC mappings (Part 1): Allow multiple mappings per kohafield (for say 260/RDA 264)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 10306: Restructure TransformMarcToKoha and update some POD lines
SIGNED-OFF-Bug-10306-Restructure-TransformMarcToKo.patch (text/plain), 9.58 KB, created by
Josef Moravec
on 2017-08-22 12:52:07 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 10306: Restructure TransformMarcToKoha and update some POD lines
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2017-08-22 12:52:07 UTC
Size:
9.58 KB
patch
obsolete
>From b59b6ade1247106f182f82b0135b4e10c6377071 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 3 Aug 2017 12:56:08 +0200 >Subject: [PATCH] [SIGNED-OFF] Bug 10306: Restructure TransformMarcToKoha and > update some POD lines > >This patch makes the following changes: > >[1] Added POD for CountItemsIssued, GetBiblioItemData >[2] Moved TransformMarcToKohaOneField closer to TransformMarcToKoha (before > sub CountItemsIssued) >[3] Restructured TransformMarcToKoha by extracting individual kohafields via > TransformMarcToKohaOneField. The latter does no longer call the former. > This small optimization avoids traversing the whole MARC record again > and again. >[4] Moved adjusting copyrightdate/publicationyear to separate helper routine > _adjust_pubyear >[5] Removed obsolete sub _get_inverted_marc_field_map. > >Test plan: >Run t/db_dependent/Biblio/TransformMarcToKoha.t > >Signed-off-by: Josef Moravec <josef.moravec@gmail.com> >--- > C4/Biblio.pm | 186 ++++++++++++++++++++++++----------------------------------- > 1 file changed, 74 insertions(+), 112 deletions(-) > >diff --git a/C4/Biblio.pm b/C4/Biblio.pm >index e12246f..91ff581 100644 >--- a/C4/Biblio.pm >+++ b/C4/Biblio.pm >@@ -23,6 +23,7 @@ use Modern::Perl; > use Carp; > > use Encode qw( decode is_utf8 ); >+use List::MoreUtils qw( uniq ); > use MARC::Record; > use MARC::File::USMARC; > use MARC::File::XML; >@@ -717,7 +718,7 @@ sub GetBiblioData { > return ($data); > } # sub GetBiblioData > >-=head2 &GetBiblioItemData >+=head2 GetBiblioItemData > > $itemdata = &GetBiblioItemData($biblioitemnumber); > >@@ -728,7 +729,6 @@ that C<biblioitems.notes> is given as C<$itemdata-E<gt>{bnotes}>. > > =cut > >-#' > sub GetBiblioItemData { > my ($biblioitemnumber) = @_; > my $dbh = C4::Context->dbh; >@@ -2542,7 +2542,7 @@ sub TransformHtmlToMarc { > > =head2 TransformMarcToKoha > >- $result = TransformMarcToKoha( $record, $frameworkcode ) >+ $result = TransformMarcToKoha( $record, $frameworkcode, $limit ) > > Extract data from a MARC bib record into a hashref representing > Koha biblio, biblioitems, and items fields. >@@ -2554,111 +2554,32 @@ hash_ref > > sub TransformMarcToKoha { > my ( $record, $frameworkcode, $limit_table ) = @_; >+ $frameworkcode //= q{}; >+ $limit_table //= q{}; > > my $result = {}; > if (!defined $record) { > carp('TransformMarcToKoha called with undefined record'); > return $result; > } >- $limit_table = $limit_table || 0; >- $frameworkcode //= ''; >- >- my $inverted_field_map = _get_inverted_marc_field_map($frameworkcode); >- >- my %tables = (); >- if ( defined $limit_table && $limit_table eq 'items' ) { >- $tables{'items'} = 1; >- } else { >- $tables{'items'} = 1; >- $tables{'biblio'} = 1; >- $tables{'biblioitems'} = 1; >- } >- >- # traverse through record >- MARCFIELD: foreach my $field ( $record->fields() ) { >- my $tag = $field->tag(); >- next MARCFIELD unless exists $inverted_field_map->{$tag}; >- if ( $field->is_control_field() ) { >- my $kohafields = $inverted_field_map->{$tag}->{list}; >- ENTRY: foreach my $entry ( @{$kohafields} ) { >- my ( $subfield, $table, $column ) = @{$entry}; >- my $value = $field->data; >- next ENTRY unless exists $tables{$table}; >- next ENTRY if !$value; >- my $key = _disambiguate( $table, $column ); >- if ( $result->{$key} ) { >- $result->{$key} .= " | " . $value >- unless $result->{$key} eq $value; >- } else { >- $result->{$key} = $value; >- } >- } >- } else { >- >- # deal with subfields >- MARCSUBFIELD: foreach my $sf ( $field->subfields() ) { >- my $code = $sf->[0]; >- next MARCSUBFIELD unless exists $inverted_field_map->{$tag}->{sfs}->{$code}; >- my $value = $sf->[1]; >- SFENTRY: foreach my $entry ( @{ $inverted_field_map->{$tag}->{sfs}->{$code} } ) { >- my ( $table, $column ) = @{$entry}; >- next SFENTRY unless exists $tables{$table}; >- next SFENTRY if !$value; >- my $key = _disambiguate( $table, $column ); >- if ( $result->{$key} ) { >- $result->{$key} .= " | " . $value >- unless $result->{$key} eq $value; >- } else { >- $result->{$key} = $value; >- } >- } >- } >- } >- } > >- # modify copyrightdate to keep only the 1st year found >- if ( exists $result->{'copyrightdate'} ) { >- my $temp = $result->{'copyrightdate'}; >- $temp =~ m/c(\d\d\d\d)/; >- if ( $temp =~ m/c(\d\d\d\d)/ and $1 > 0 ) { # search cYYYY first >- $result->{'copyrightdate'} = $1; >- } else { # if no cYYYY, get the 1st date. >- $temp =~ m/(\d\d\d\d)/; >- $result->{'copyrightdate'} = $1; >- } >- } >- >- # modify publicationyear to keep only the 1st year found >- if ( exists $result->{'publicationyear'} ) { >- my $temp = $result->{'publicationyear'}; >- if ( $temp =~ m/c(\d\d\d\d)/ and $1 > 0 ) { # search cYYYY first >- $result->{'publicationyear'} = $1; >- } else { # if no cYYYY, get the 1st date. >- $temp =~ m/(\d\d\d\d)/; >- $result->{'publicationyear'} = $1; >- } >+ my %tables = ( biblio => 1, biblioitems => 1, items => 1 ); >+ if( $limit_table eq 'items' ) { >+ %tables = ( items => 1 ); > } > >- return $result; >-} >- >-sub _get_inverted_marc_field_map { >- my ( $frameworkcode ) = @_; >- my $field_map = {}; > my $mss = GetMarcSubfieldStructure( $frameworkcode ); >- > foreach my $kohafield ( keys %{ $mss } ) { >- foreach my $fld ( @{ $mss->{$kohafield} } ) { >- my $tag = $fld->{tagfield}; >- my $subfield = $fld->{tagsubfield}; >- my ( $table, $column ) = split /[.]/, $kohafield, 2; >- push @{ $field_map->{$tag}->{list} }, >- [ $subfield, $table, $column ]; >- push @{ $field_map->{$tag}->{sfs}->{$subfield} }, >- [ $table, $column ]; >- } >+ my ( $table, $column ) = split /[.]/, $kohafield, 2; >+ next unless $tables{$table}; >+ my $val = TransformMarcToKohaOneField( >+ $kohafield, $record, $frameworkcode, >+ ); >+ next if !defined $val; >+ my $key = _disambiguate( $table, $column ); >+ $result->{$key} = $val; > } >- return $field_map; >+ return $result; > } > > =head2 _disambiguate >@@ -2690,15 +2611,6 @@ more. > > =cut > >-sub CountItemsIssued { >- my ($biblionumber) = @_; >- my $dbh = C4::Context->dbh; >- my $sth = $dbh->prepare('SELECT COUNT(*) as issuedCount FROM items, issues WHERE items.itemnumber = issues.itemnumber AND items.biblionumber = ?'); >- $sth->execute($biblionumber); >- my $row = $sth->fetchrow_hashref(); >- return $row->{'issuedCount'}; >-} >- > sub _disambiguate { > my ( $table, $column ) = @_; > if ( $column eq "cn_sort" or $column eq "cn_source" ) { >@@ -2711,19 +2623,69 @@ sub _disambiguate { > > =head2 TransformMarcToKohaOneField > >- $value = TransformMarcToKohaOneField( 'biblio.title', $record, $frameworkcode ); >+ $val = TransformMarcToKohaOneField( 'biblio.title', $marc, $frameworkcode ); > > =cut > > sub TransformMarcToKohaOneField { > my ( $kohafield, $marc, $frameworkcode ) = @_; > >- # It is not really useful to repeat all code from TransformMarcToKoha here. >- # Since it is fast enough (by caching), we just extract the field. >- my $koharec = TransformMarcToKoha( $marc, $frameworkcode ); >- my @temp = split /\./, $kohafield, 2; >- $kohafield = _disambiguate( @temp ) if @temp > 1; >- return $koharec ? $koharec->{$kohafield} : undef; >+ my ( @rv, $retval ); >+ my @mss = GetMarcSubfieldStructureFromKohaField($kohafield, $frameworkcode); >+ foreach my $fldhash ( @mss ) { >+ my $tag = $fldhash->{tagfield}; >+ my $sub = $fldhash->{tagsubfield}; >+ foreach my $fld ( $marc->field($tag) ) { >+ if( $sub eq '@' || $fld->is_control_field ) { >+ push @rv, $fld->data if $fld->data; >+ } else { >+ push @rv, grep { $_ } $fld->subfield($sub); >+ } >+ } >+ } >+ return unless @rv; >+ $retval = join ' | ', uniq(@rv); >+ >+ # Additional polishing for individual kohafields >+ if( $kohafield =~ /copyrightdate|publicationyear/ ) { >+ $retval = _adjust_pubyear( $retval ); >+ } >+ >+ return $retval; >+} >+ >+=head2 _adjust_pubyear >+ >+ Helper routine for TransformMarcToKohaOneField >+ >+=cut >+ >+sub _adjust_pubyear { >+ my $retval = shift; >+ # modify return value to keep only the 1st year found >+ if( $retval =~ m/c(\d\d\d\d)/ and $1 > 0 ) { # search cYYYY first >+ $retval = $1; >+ } else { >+ # if no cYYYY, get the 1st date. >+ $retval =~ m/(\d\d\d\d)/; >+ $retval = $1; >+ } >+ return $retval; >+} >+ >+=head2 CountItemsIssued >+ >+ my $count = CountItemsIssued( $biblionumber ); >+ >+=cut >+ >+sub CountItemsIssued { >+ my ($biblionumber) = @_; >+ my $dbh = C4::Context->dbh; >+ my $sth = $dbh->prepare('SELECT COUNT(*) as issuedCount FROM items, issues WHERE items.itemnumber = issues.itemnumber AND items.biblionumber = ?'); >+ $sth->execute($biblionumber); >+ my $row = $sth->fetchrow_hashref(); >+ return $row->{'issuedCount'}; > } > > =head2 ModZebra >-- >2.1.4
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=66330">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10306
:
65539
|
65540
|
65541
|
65542
|
65543
|
65544
|
65545
|
65948
|
65949
|
65950
|
65951
|
65952
|
65953
|
66134
|
66135
|
66137
|
66138
|
66139
|
66140
|
66141
|
66142
|
66327
|
66328
|
66329
|
66330
|
66331
|
66332
|
66405
|
66547
|
66548
|
67501
|
67502
|
67503
|
67504
|
67505
|
67506
|
67507
|
68382
|
68766
|
68767
|
68768
|
68769
|
68770
|
68771
|
68772
|
68773