Bugzilla – Attachment 2990 Details for
Bug 4885
Only 1 ISBN shows in non-XSL detail view
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Revised for current HEAD
0001-Fix-for-Bug-4885-Only-1-ISBN-shows-in-non-XSL-detail.patch (text/plain), 6.57 KB, created by
Owen Leonard
on 2011-01-13 20:54:19 UTC
(
hide
)
Description:
Revised for current HEAD
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2011-01-13 20:54:19 UTC
Size:
6.57 KB
patch
obsolete
>From b81e72b8b451dc5eab97edeef38bad4f6acf509b Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 10 Jun 2010 15:28:12 -0400 >Subject: [PATCH] Fix for Bug 4885 - Only 1 ISBN shows in non-XSL detail view > >Fixed by doing a pretty dumb copy of GetMarcNotes. Functional, >but it could be there is a more efficient way to do it given >we want one repeating tag rather than a range of tags? >--- > C4/Biblio.pm | 41 ++++++++++++++++++++ > catalogue/detail.pl | 2 + > .../prog/en/modules/catalogue/detail.tmpl | 8 +++- > .../opac-tmpl/prog/en/modules/opac-detail.tmpl | 8 +++- > opac/opac-detail.pl | 2 + > 5 files changed, 57 insertions(+), 4 deletions(-) > >diff --git a/C4/Biblio.pm b/C4/Biblio.pm >index 879dd0a..232ffb3 100644 >--- a/C4/Biblio.pm >+++ b/C4/Biblio.pm >@@ -69,6 +69,7 @@ BEGIN { > > &GetMarcControlnumber > &GetMarcNotes >+ &GetMarcISBN > &GetMarcSubjects > &GetMarcBiblio > &GetMarcAuthors >@@ -1277,6 +1278,46 @@ sub GetMarcControlnumber { > return $controlnumber; > } > >+=head2 GetMarcISBN >+ >+ $marcisbnsarray = GetMarcISBN( $record, $marcflavour ); >+ >+Get all ISBNs from the MARC record and returns them in an array. >+ISBNs stored in differents places depending on MARC flavour >+ >+=cut >+ >+sub GetMarcISBN { >+ my ( $record, $marcflavour ) = @_; >+ my $scope; >+ if ( $marcflavour eq "MARC21" ) { >+ $scope = '020'; >+ } else { # assume unimarc if not marc21 >+ $scope = '010'; >+ } >+ my @marcisbns; >+ my $isbn = ""; >+ my $tag = ""; >+ my $marcisbn; >+ foreach my $field ( $record->field($scope) ) { >+ my $value = $field->as_string(); >+ if ( $isbn ne "" ) { >+ $marcisbn = { marcisbn => $isbn, }; >+ push @marcisbns, $marcisbn; >+ $isbn = $value; >+ } >+ if ( $isbn ne $value ) { >+ $isbn = $isbn . " " . $value; >+ } >+ } >+ >+ if ($isbn) { >+ $marcisbn = { marcisbn => $isbn }; >+ push @marcisbns, $marcisbn; #load last tag into array >+ } >+ return \@marcisbns; >+} # end GetMarcISBN >+ > =head2 GetMarcNotes > > $marcnotesarray = GetMarcNotes( $record, $marcflavour ); >diff --git a/catalogue/detail.pl b/catalogue/detail.pl >index e32170c..6ee79e6 100755 >--- a/catalogue/detail.pl >+++ b/catalogue/detail.pl >@@ -87,6 +87,7 @@ unless (defined($record)) { > } > > my $marcnotesarray = GetMarcNotes( $record, $marcflavour ); >+my $marcisbnsarray = GetMarcISBN( $record, $marcflavour ); > my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour ); > my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); > my $marcseriesarray = GetMarcSeries($record,$marcflavour); >@@ -212,6 +213,7 @@ $template->param( > MARCAUTHORS => $marcauthorsarray, > MARCSERIES => $marcseriesarray, > MARCURLS => $marcurlsarray, >+ MARCISBNS => $marcisbnsarray, > subtitle => $subtitle, > itemdata_ccode => $itemfields{ccode}, > itemdata_enumchron => $itemfields{enumchron}, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl >index d64227a..6d878b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl >@@ -148,8 +148,12 @@ function verify_images() { > > <div class="yui-u" style="margin-top: 1em;"> > <ul> >- <!-- TMPL_IF name="normalized_isbn" --> >- <li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="normalized_isbn" --></li> >+ <!-- TMPL_IF NAME="MARCISBNS" --> >+ <li><strong>ISBN:</strong><ul><!-- TMPL_LOOP NAME="MARCISBNS" --><li><!-- TMPL_VAR NAME="marcisbn" --></li><!-- /TMPL_LOOP --></ul></li> >+ <!-- TMPL_ELSE --> >+ <!-- TMPL_IF name="normalized_isbn" --> >+ <li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="normalized_isbn" --></li> >+ <!-- /TMPL_IF --> > <!-- /TMPL_IF --> > <!-- TMPL_IF name="issn" --> > <li><strong>ISSN:</strong><!-- TMPL_VAR NAME="issn" --></li> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl >index 25f3a37..e47681d 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl >@@ -132,8 +132,12 @@ YAHOO.util.Event.onContentReady("furtherm", function () { > > <!-- TMPL_IF NAME="pages" --><span class="results_summary"><span class="label">Physical details:</span> <!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></span><!-- /TMPL_IF --> > >- <!-- TMPL_IF name="normalized_isbn" --> >- <span class="results_summary"><span class="label">ISBN: </span><!-- TMPL_VAR NAME="normalized_isbn" --></span> >+ <!-- TMPL_IF NAME="MARCISBNS" --> >+ <span class="results_summary"><span class="label">IBSN:</span><!-- TMPL_LOOP NAME="MARCISBNS" --><!-- TMPL_VAR NAME="marcisbn" -->; <!-- /TMPL_LOOP -->.</span> >+ <!-- TMPL_ELSE --> >+ <!-- TMPL_IF name="normalized_isbn" --> >+ <span class="results_summary"><span class="label">ISBN: </span><!-- TMPL_VAR NAME="normalized_isbn" --></span> >+ <!-- /TMPL_IF --> > <!-- /TMPL_IF --> > <!-- TMPL_IF name="issn" --> > <span class="results_summary"><span class="label">ISSN:</span><!-- TMPL_VAR NAME="issn" --></span> >diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl >index 309f01d..9110cca 100755 >--- a/opac/opac-detail.pl >+++ b/opac/opac-detail.pl >@@ -197,6 +197,7 @@ for my $itm (@items) { > my $dbh = C4::Context->dbh; > my $marcflavour = C4::Context->preference("marcflavour"); > my $marcnotesarray = GetMarcNotes ($record,$marcflavour); >+my $marcisbnsarray = GetMarcISBN ($record,$marcflavour); > my $marcauthorsarray = GetMarcAuthors ($record,$marcflavour); > my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour); > my $marcseriesarray = GetMarcSeries ($record,$marcflavour); >@@ -209,6 +210,7 @@ my $subtitle = GetRecordValue('subtitle', $record, GetFrameworkCode($bib > MARCAUTHORS => $marcauthorsarray, > MARCSERIES => $marcseriesarray, > MARCURLS => $marcurlsarray, >+ MARCISBNS => $marcisbnsarray, > norequests => $norequests, > RequestOnOpac => C4::Context->preference("RequestOnOpac"), > itemdata_ccode => $itemfields{ccode}, >-- >1.7.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 4885
:
2236
|
2237
|
2241
| 2990 |
2992
|
2994
|
3209