From c6b01caeb3e8208c954e14193422431e2b12294a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 11 Nov 2011 11:43:27 -0500 Subject: [PATCH] Fix for Bug 7121 - remove comma on items info Because I can't just take out one comma, I reworked the way moredetail.pl fetches and outputs biblio data based on the way it does in detail.pl. This allows for simpler output in the template. In the process I've added subtitle information to the template. Revision adds line break for readability Signed-off-by: Paul Poulain Backported to 3.4.x Signed-off-by: Chris Nighswonger --- catalogue/moredetail.pl | 28 +++++++++------- .../prog/en/modules/catalogue/moredetail.tt | 33 ++++++++++--------- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl index 58a395fc6f..2ae6b0abc0 100755 --- a/catalogue/moredetail.pl +++ b/catalogue/moredetail.pl @@ -68,7 +68,7 @@ my $title=$query->param('title'); my $bi=$query->param('bi'); $bi = $biblionumber unless $bi; my $itemnumber = $query->param('itemnumber'); -my $data=GetBiblioData($biblionumber); +my $data = &GetBiblioData($biblionumber); my $dewey = $data->{'dewey'}; my $showallitems = $query->param('showallitems'); @@ -86,7 +86,6 @@ my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber); # $dewey=~ s/\.$//; # $data->{'dewey'}=$dewey; -my @results; my $fw = GetFrameworkCode($biblionumber); my @all_items= GetItemsInfo($biblionumber); my @items; @@ -108,7 +107,11 @@ my $ccodes= GetKohaAuthorisedValues('items.ccode',$fw); my $itemtypes = GetItemTypes; $data->{'itemtypename'} = $itemtypes->{$data->{'itemtype'}}->{'description'}; -$results[0]=$data; + +foreach ( keys %{$data} ) { + $template->param( "$_" => defined $data->{$_} ? $data->{$_} : '' ); +} + ($itemnumber) and @items = (grep {$_->{'itemnumber'} == $itemnumber} @items); foreach my $item (@items){ $item->{itemlostloop}= GetAuthorisedValues(GetAuthValCode('items.itemlost',$fw),$item->{itemlost}) if GetAuthValCode('items.itemlost',$fw); @@ -157,15 +160,18 @@ $template->param( borrowerlink => $borrower_link, C4::Search::enabled_staff_search_views, ); -$template->param(BIBITEM_DATA => \@results); -$template->param(ITEM_DATA => \@items); -$template->param(moredetailview => 1); -$template->param(loggedinuser => $loggedinuser); -$template->param(biblionumber => $biblionumber); -$template->param(biblioitemnumber => $bi); -$template->param(itemnumber => $itemnumber); + +$template->param( + ITEM_DATA => \@items, + moredetailview => 1, + loggedinuser => $loggedinuser, + biblionumber => $biblionumber, + biblioitemnumber => $bi, + itemnumber => $itemnumber, + z3950_search_params => C4::Search::z3950_search_args(GetBiblioData($biblionumber)), + subtitle => $subtitle, +); $template->param(ONLY_ONE => 1) if ( $itemnumber && $showncount != @items ); -$template->param(z3950_search_params => C4::Search::z3950_search_args(GetBiblioData($biblionumber))); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index ae7333027d..363ee88a7e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Catalog › Item details for [% FOREACH BIBITEM_DAT IN BIBITEM_DATA %][% BIBITEM_DAT.title %][% END %] +Koha › Catalog › Item details for [% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -8,7 +8,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
@@ -18,24 +18,25 @@ [% INCLUDE 'cat-toolbar.inc' %]
- [% FOREACH BIBITEM_DAT IN BIBITEM_DATA %] -

[% BIBITEM_DAT.title |html %] [% IF ( BIBITEM_DAT.author ) %], by [% BIBITEM_DAT.author %][% END %]

+ +

[% title |html %]

+ [% IF ( subtitle ) %]

[% FOREACH subtitl IN subtitle %] [% subtitl.subfield|html %][% END %]

[% END %] + [% IF ( author ) %]

by [% author %]

[% END %]
    -
  1. Biblionumber: [% BIBITEM_DAT.biblionumber %] 
    2. +
  2. Biblionumber: [% biblionumber %] 
    3. [% UNLESS ( item_level_itypes ) %] -
  3. Item type: [% BIBITEM_DAT.itemtypename %] 
    4. +
  4. Item type: [% itemtypename %] 
    5. [% END %] - -
  5. Rental charge:[% BIBITEM_DAT.rentalcharge %] 
    6. -
  6. ISBN: [% BIBITEM_DAT.isbn %] 
    7. -
  7. Publisher:[% BIBITEM_DAT.place %] [% BIBITEM_DAT.publishercode |html %] [% BIBITEM_DAT.publicationyear %] 
    8. - [% IF ( BIBITEM_DAT.volumeddesc ) %]
  8. Volume: [% BIBITEM_DAT.volumeddesc %]
    9. [% END %] -
  9. Physical Details: [% BIBITEM_DAT.pages %] [% BIBITEM_DAT.illus %] [% BIBITEM_DAT.size %] 
    10. - [% IF ( BIBITEM_DAT.bnotes ) %]
  10. Notes: [% BIBITEM_DAT.bnotes %]
    11. [% END %] -
  11. No. of Items: [% BIBITEM_DAT.count %] [% IF ( BIBITEM_DAT.hiddencount ) %]total ([% BIBITEM_DAT.showncount %] shown / [% BIBITEM_DAT.hiddencount %] hidden) -Show all items[% END %]
    12. + [% IF ( rentalcharge ) %]
  12. Rental charge:[% rentalcharge %] 
    13. [% END %] +
  13. ISBN: [% isbn %] 
    14. +
  14. Publisher:[% place %] [% publishercode |html %] [% publicationyear %] 
    15. + [% IF ( volumeddesc ) %]
  15. Volume: [% volumeddesc %]
    16. [% END %] +
  16. Physical Details: [% pages %] [% illus %] [% size %] 
    17. + [% IF ( bnotes ) %]
  17. Notes: [% bnotes %]
    18. [% END %] +
  18. No. of Items: [% count %] [% IF ( hiddencount ) %]total ([% showncount %] shown / [% hiddencount %] hidden) +Show all items[% END %]
- [% END %] +
[% IF ( ONLY_ONE ) %]
You are only viewing one item. View All
-- 2.39.5