[Koha-patches] [PATCH] Bug 11912: (refactoring followup) GetMarcISBN should implement its advertised API
Tomas Cohen Arazi
tomascohen at gmail.com
Mon Mar 10 16:16:37 CET 2014
The current implementation of GetMarcISBN contradicts the documented API.
It currently returns an array of hashes with only one key (marcisbn) which
doesn't add any value to it.
I chose to fix GetMarcISBN to honour the API instead of changing the docs,
because it seems a really silly change.
To test:
- Run:
prove t/db_dependent/Biblio.t
=> SUCCESS
- catalogue/detail.pl should correctly show ISBNs.
- opac/opac-detail.pl should correctly show ISBNs in both prog and bootstrap.
- opac-opac-sendshelf.pl should correctly show ISBNs in the email.
- Sign off :-D
Edit: forgot to git add some templates.
Regards
To+
Sponsored-by: Universidad Nacional de Cordoba
---
C4/Biblio.pm | 5 ++---
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 +-
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +-
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt | 2 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 2 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt | 2 +-
t/db_dependent/Biblio.t | 1 -
7 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index a34e5b6..61e4c3b 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -1689,13 +1689,12 @@ sub GetMarcISBN {
} else { # assume marc21 if not unimarc
$scope = '020';
}
+
my @marcisbns;
- my $marcisbn;
foreach my $field ( $record->field($scope) ) {
my $isbn = $field->as_string();
if ( $isbn ne "" ) {
- $marcisbn = { marcisbn => $isbn, };
- push @marcisbns, $marcisbn;
+ push @marcisbns, $isbn;
}
}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 1e1fcd2..03e322d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -416,7 +416,7 @@ function verify_images() {
<div class="yui-u" style="margin-top: 1em;">
<ul>
[% IF ( MARCISBNS ) %]
- <li><strong>ISBN:</strong><ul>[% FOREACH MARCISBN IN MARCISBNS %]<li>[% MARCISBN.marcisbn %]</li>[% END %]</ul></li>
+ <li><strong>ISBN:</strong><ul>[% FOREACH MARCISBN IN MARCISBNS %]<li>[% MARCISBN %]</li>[% END %]</ul></li>
[% ELSE %]
[% IF ( normalized_isbn ) %]
<li><strong>ISBN:</strong> [% normalized_isbn %]</li>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index 64821b9..5a79d70 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -197,7 +197,7 @@
[% END %]
[% IF ( MARCISBNS ) %]
- <span class="results_summary isbn"><span class="label">ISBN:</span>[% FOREACH MARCISBN IN MARCISBNS %][% MARCISBN.marcisbn %][% IF ( loop.last ) %].[% ELSE %]; [% END %][% END %]</span>
+ <span class="results_summary isbn"><span class="label">ISBN:</span>[% FOREACH MARCISBN IN MARCISBNS %][% MARCISBN %][% IF ( loop.last ) %].[% ELSE %]; [% END %][% END %]</span>
[% ELSE %]
[% IF ( normalized_isbn ) %]
<span class="results_summary isbn"><span class="label">ISBN: </span>[% normalized_isbn %]</span>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt
index c13a659..f3c7ed7 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt
@@ -59,7 +59,7 @@ Your list : [% shelfname %]
[% IF ( BIBLIO_RESULT.ISBN && BIBLIO_RESULT.size > 0 ) %]
<span>
ISBN: [% FOREACH isbn IN BIBLIO_RESULT.ISBN %]
- [% isbn.marcisbn %]
+ [% isbn %]
[% UNLESS ( loop.last ) %]; [% END %]
[% END %]
</span><br/>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 26bbbc4..2587718 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -646,7 +646,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
[% IF ( pages ) %]<span class="results_summary physical"><span class="label">Physical details:</span> [% pages %] [% illus %] [% size %]</span>[% END %]
[% IF ( MARCISBNS ) %]
- <span class="results_summary isbn"><span class="label">ISBN:</span>[% FOREACH MARCISBN IN MARCISBNS %][% MARCISBN.marcisbn %][% IF ( loop.last ) %].[% ELSE %]; [% END %][% END %]</span>
+ <span class="results_summary isbn"><span class="label">ISBN:</span>[% FOREACH MARCISBN IN MARCISBNS %][% MARCISBN %][% IF ( loop.last ) %].[% ELSE %]; [% END %][% END %]</span>
[% ELSE %]
[% IF ( normalized_isbn ) %]
<span class="results_summary isbn"><span class="label">ISBN: </span>[% normalized_isbn %]</span>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt
index c13a659..f3c7ed7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tt
@@ -59,7 +59,7 @@ Your list : [% shelfname %]
[% IF ( BIBLIO_RESULT.ISBN && BIBLIO_RESULT.size > 0 ) %]
<span>
ISBN: [% FOREACH isbn IN BIBLIO_RESULT.ISBN %]
- [% isbn.marcisbn %]
+ [% isbn %]
[% UNLESS ( loop.last ) %]; [% END %]
[% END %]
</span><br/>
diff --git a/t/db_dependent/Biblio.t b/t/db_dependent/Biblio.t
index 2dd8034..69c3cf7 100755
--- a/t/db_dependent/Biblio.t
+++ b/t/db_dependent/Biblio.t
@@ -19,7 +19,6 @@ use Modern::Perl;
use Test::More tests => 3;
use Test::MockModule;
-use Data::Dumper;
use MARC::Record;
--
1.8.3.2
More information about the Koha-patches
mailing list