functions that were in C4::Interface::CGI::Output are now in C4::Output.

[koha_gimpoz] / catalogue / detail.pl

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 6779128..855746b 100755 (executable)
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -1,74 +1,100 @@
 #!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+# $Id$
+
 use strict;
 require Exporter;
 use CGI;
 use C4::Auth;
-use C4::Bull; #uses getsubscriptionfrom biblionumber
-use C4::Interface::CGI::Output;
-use HTML::Template;
+use C4::Serials;    #uses getsubscriptionfrom biblionumber
+use C4::Output;
 use C4::Biblio;
-use C4::SearchMarc;
+use C4::Serials;
 
-my $query=new CGI;
-my ($template, $borrowernumber, $cookie) 
-    = get_template_and_user({template_name => "catalogue/detail.tmpl",
-                            query => $query,
-                            type => "intranet",
-                            authnotrequired => 1,
-                            flagsrequired => {borrow => 1},
-                            });
-
-my $biblionumber=$query->param('biblionumber');
-$template->param(biblionumber => $biblionumber);
+my $query = new CGI;
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "catalogue/detail.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { catalogue => 1 },
+    }
+);
 
+my $biblionumber = $query->param('biblionumber');
 
 # change back when ive fixed request.pl
-my @items                                 = &ItemInfo(undef, $biblionumber, 'intra');
-my $dat                                   = &bibdata($biblionumber);
-my ($authorcount, $addauthor)             = &getaddauthor($biblionumber);
-my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
-my ($websitecount, @websites)             = &getwebsites($biblionumber);
-my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
+my @items = &GetItemsInfo( $biblionumber, 'intra' );
+my $dat = &GetBiblioData($biblionumber);
+#coping with subscriptions
+my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
+my @subscriptions       = GetSubscriptions( $dat->{title}, $dat->{issn}, $biblionumber );
 
-$dat->{'count'}=@items;
+my @subs;
+foreach my $subscription (@subscriptions) {
+    my %cell;
+    $cell{subscriptionid}    = $subscription->{subscriptionid};
+    $cell{subscriptionnotes} = $subscription->{notes};
 
-$dat->{'additional'}=$addauthor->[0]->{'author'};
-for (my $i = 1; $i < $authorcount; $i++) {
-        $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
-} # for
+    #get the three latest serials.
+    $cell{latestserials} =
+      GetLatestSerials( $subscription->{subscriptionid}, 3 );
+    push @subs, \%cell;
+}
+
+$dat->{'count'} = @items;
 
 my $norequests = 1;
 foreach my $itm (@items) {
-    $norequests = 0 unless $itm->{'notforloan'};
-    $itm->{$itm->{'publictype'}} = 1;
+    $norequests = 0
+      unless ( ( $itm->{'notforloan'} > 0 )
+        || ( $itm->{'itemnotforloan'} > 0 ) );
+    $itm->{ $itm->{'publictype'} } = 1;
 }
 
-$template->param(norequests => $norequests);
+$template->param( norequests => $norequests );
 
-  ## get notes and subjects from MARC record
-my $marc = C4::Context->preference("marc");
-if ($marc eq "yes") {
-       my $dbh = C4::Context->dbh;
-       my $marcflavour = C4::Context->preference("marcflavour");
-       my $marcnotesarray = &getMARCnotes($dbh,$biblionumber,$marcflavour);
-       my $marcsubjctsarray = &getMARCsubjects($dbh,$biblionumber,$marcflavour);
+## get notes and subjects from MARC record
+    my $dbh              = C4::Context->dbh;
+    my $marcflavour      = C4::Context->preference("marcflavour");
+    my $record           = GetMarcBiblio($biblionumber);
+    my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
+    my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
+    my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
 
-       $template->param(MARCNOTES => $marcnotesarray);
-       $template->param(MARCSUBJCTS => $marcsubjctsarray);
-}
+    $template->param(
+        MARCNOTES   => $marcnotesarray,
+        MARCSUBJCTS => $marcsubjctsarray,
+        MARCAUTHORS => $marcauthorsarray
+    );
 
-my @results = ($dat,);
-
-my $resultsarray=\@results;
-my $itemsarray=\@items;
-my $webarray=\@webbiblioitems;
-my $sitearray=\@websites;
+my @results = ( $dat, );
+foreach ( keys %{$dat} ) {
+    $template->param( "$_" => $dat->{$_} . "" );
+}
 
-$template->param(BIBLIO_RESULTS => $resultsarray,
-                               ITEM_RESULTS => $itemsarray,
-                               WEB_RESULTS => $webarray,
-                               SITE_RESULTS => $sitearray,
-                               subscriptionsnumber => $subscriptionsnumber,
+$template->param(
+    ITEM_RESULTS        => \@items,
+    biblionumber        => $biblionumber,
+    subscriptions       => \@subs,
+    subscriptionsnumber => $subscriptionsnumber,
+    subscriptiontitle   => $dat->{title},
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;