X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=catalogue%2Fdetailprint.pl;h=fe92fe5252f3209b1ee2c7bd449c29cbfe8cfc19;hb=8e485c6112756f3fe8404d9d4d700535f0e87306;hp=55cbed7461c638fe4230261216072ab88bba5df7;hpb=20df12958de1e9ac09383f7fd89272404a64a0b5;p=koha_fer

diff --git a/catalogue/detailprint.pl b/catalogue/detailprint.pl
index 55cbed7461..fe92fe5252 100755
--- a/catalogue/detailprint.pl
+++ b/catalogue/detailprint.pl
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -14,92 +13,84 @@
 # 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
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-use HTML::Template;
 use strict;
-require Exporter;
+#use warnings; FIXME - Bug 2505
+
 use C4::Context;
-use C4::Output;  # contains gettemplate
 use CGI;
 use C4::Auth;
 use C4::Biblio;
-use C4::Interface::CGI::Output;
-use C4::Date;
+use C4::Items;
+use C4::Output;
+use C4::Dates;
 
-my $query=new CGI;
-my $type=$query->param('type');
-($type) || ($type='intra');
+my $query = new CGI;
+my $type  = $query->param('type');
+($type) || ( $type = 'intra' );
 
-my $biblionumber=$query->param('bib');
+my $biblionumber = $query->param('biblionumber');
 
 # change back when ive fixed request.pl
-my @items = ItemInfo(undef, $biblionumber, $type);
+my @items = GetItemsInfo( $biblionumber );
 my $norequests = 1;
 foreach my $itm (@items) {
-     $norequests = 0 unless $itm->{'notforloan'};
+    $norequests = 0 unless $itm->{'notforloan'};
 }
 
+my $dat         = GetBiblioData($biblionumber);
+my $record      = GetMarcBiblio($biblionumber);
+my $addauthor   = GetMarcAuthors($record,C4::Context->preference("marcflavour"));
+my $authorcount = scalar @$addauthor;
 
+$dat->{'additional'} = "";
+foreach (@$addauthor) {
+    $dat->{'additional'} .= "|" . $_->{'a'};
+}    # for
 
-my $dat=bibdata($biblionumber);
-my ($authorcount, $addauthor)= &getaddauthor($biblionumber);
-my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
-my ($websitecount, @websites)             = &getwebsites($biblionumber);
-
-$dat->{'count'}=@items;
+$dat->{'count'}      = @items;
 $dat->{'norequests'} = $norequests;
 
-$dat->{'additional'}=$addauthor->[0]->{'author'};
-for (my $i = 1; $i < $authorcount; $i++) {
-        $dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
-} # for
-
 my @results;
 
-$results[0]=$dat;
+$results[0] = $dat;
 
-my $resultsarray=\@results;
-my $itemsarray=\@items;
-my $webarray=\@webbiblioitems;
-my $sitearray=\@websites;
+my $resultsarray = \@results;
+my $itemsarray   = \@items;
 
-my $startfrom=$query->param('startfrom');
-($startfrom) || ($startfrom=0);
+my $startfrom = $query->param('startfrom');
+($startfrom) || ( $startfrom = 0 );
 
-my ($template, $loggedinuser, $cookie) = get_template_and_user({
-	template_name   => ('catalogue/detailprint.tmpl'),
-	query           => $query,
-	type            => "intranet",
-	authnotrequired => ($type eq 'opac'),
-	flagsrequired   => {catalogue => 1},
-    });
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => ('catalogue/detailprint.tmpl'),
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => ( $type eq 'opac' ),
+        flagsrequired   => { catalogue => 1 },
+    }
+);
 
-my $count=1;
+my $count = 1;
 
 # now to get the items into a hash we can use and whack that thru
 
-
-my $nextstartfrom=($startfrom+20<$count-20) ? ($startfrom+20) : ($count-20);
-my $prevstartfrom=($startfrom-20>0) ? ($startfrom-20) : (0);
-$template->param(startfrom => $startfrom+1,
-						endat => $startfrom+20,
-						numrecords => $count,
-						nextstartfrom => $nextstartfrom,
-						prevstartfrom => $prevstartfrom,
-						BIBLIO_RESULTS => $resultsarray,
-						ITEM_RESULTS => $itemsarray,
-						WEB_RESULTS => $webarray,
-						SITE_RESULTS => $sitearray,
-						loggedinuser => $loggedinuser,
-						biblionumber => $biblionumber,
-						);
+my $nextstartfrom = ( $startfrom + 20 < $count - 20 ) ? ( $startfrom + 20 ) : ( $count - 20 );
+my $prevstartfrom = ( $startfrom - 20 > 0 ) ? ( $startfrom - 20 ) : (0);
+
+$template->param(
+    startfrom      => $startfrom + 1,
+    endat          => $startfrom + 20,
+    numrecords     => $count,
+    nextstartfrom  => $nextstartfrom,
+    prevstartfrom  => $prevstartfrom,
+    BIBLIO_RESULTS => $resultsarray,
+    ITEM_RESULTS   => $itemsarray,
+    loggedinuser   => $loggedinuser,
+    biblionumber   => $biblionumber,
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;
-
-
-# Local Variables:
-# tab-width: 8
-# End: