X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-basket.pl;h=9562d2f077521d288e808982ecee0ebdf39d86a0;hb=206e1b53b68fa910d8c1b0d0d7620f0287a940b7;hp=340140e52b765ba7186526a166a81ce06002e6e1;hpb=aecb30229823ed82a9c91059ea39f283710e6200;p=koha_fer

diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl
index 340140e52b..9562d2f077 100755
--- a/opac/opac-basket.pl
+++ b/opac/opac-basket.pl
@@ -1,65 +1,122 @@
 #!/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
+
+
 use strict;
-require Exporter;
+use warnings;
 use CGI;
+use C4::Koha;
 use C4::Biblio;
+use C4::Items;
 use C4::Auth;
-use C4::Interface::CGI::Output;
-use HTML::Template;
-
-my $query=new CGI;
+use C4::Output;
 
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "opac-basket.tmpl",
-			     query => $query,
-			     type => "opac",
-			     authnotrequired => 1,
-			     flagsrequired => {borrow => 1},
-			 });
+my $query = new CGI;
 
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
+    {
+        template_name   => "opac-basket.tmpl",
+        query           => $query,
+        type            => "opac",
+        authnotrequired => 1,
+        flagsrequired   => { borrow => 1 },
+    }
+);
 
-my $bib_list=$query->param('bib_list');
-my $print_basket=$query->param('print');
-my $verbose = $query->param('verbose');
+my $bib_list     = $query->param('bib_list');
+my $print_basket = $query->param('print');
+my $verbose      = $query->param('verbose');
 
-if($verbose) { $template->param(verbose => 1); }
-if ($print_basket) { $template->param(print_basket => 1); }
+if ($verbose)      { $template->param( verbose      => 1 ); }
+if ($print_basket) { $template->param( print_basket => 1 ); }
 
-my @bibs = split(/\//, $bib_list);
+my @bibs = split( /\//, $bib_list );
 my @results;
 
 my $num = 1;
-foreach my $biblionumber (@bibs) {
-	$template->param(biblionumber => $biblionumber);
-
-	my $dat                                   = &bibdata($biblionumber);
-	my ($authorcount, $addauthor)             = &addauthor($biblionumber);
-	my @items                                 = &ItemInfo(undef, $biblionumber, 'opac');
-
-	$dat->{'additional'}=$addauthor->[0]->{'author'};
-	for (my $i = 1; $i < $authorcount; $i++) {
-			$dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
-	} # for
-	if($num % 2 == 1){
-		$dat->{'even'} = 1;
-	}
-	$num++;
-	$dat->{'biblionumber'} = $biblionumber;
-	$dat->{ITEM_RESULTS} = \@items;
-	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
-	     $dat->{dest} = "opac-detail.pl";
-	} elsif (C4::Context->preference("BiblioDefaultView") eq "marc") {
-	     $dat->{dest} ="opac-MARCdetail.pl";
-	} else {
-	     $dat->{dest} = "opac-ISBDdetail.pl";
+my $marcflavour = C4::Context->preference('marcflavour');
+if (C4::Context->preference('TagsEnabled')) {
+	$template->param(TagsEnabled => 1);
+	foreach (qw(TagsShowOnList TagsInputOnList)) {
+		C4::Context->preference($_) and $template->param($_ => 1);
 	}
-	push (@results, $dat);
 }
 
-my $resultsarray=\@results;
+
+foreach my $biblionumber ( @bibs ) {
+    $template->param( biblionumber => $biblionumber );
+
+    my $dat              = &GetBiblioData($biblionumber);
+    my $record           = &GetMarcBiblio($biblionumber);
+    my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
+    my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
+    my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
+    my $marcseriesarray  = GetMarcSeries  ($record,$marcflavour);
+    my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour);
+    my @items            = &GetItemsInfo( $biblionumber, 'opac' );
+    my $subtitle         = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber));
+
+    my $hasauthors = 0;
+    if($dat->{'author'} || @$marcauthorsarray) {
+      $hasauthors = 1;
+    }
+    my $collections =  GetKohaAuthorisedValues('items.ccode',$dat->{'frameworkcode'}, 'opac');
+
+	# COinS format FIXME: for books Only
+        my $coins_format;
+        my $fmt = substr $record->leader(), 6,2;
+        my $fmts;
+        $fmts->{'am'} = 'book';
+        $dat->{ocoins_format} = $fmts->{$fmt};
+
+    if ( $num % 2 == 1 ) {
+        $dat->{'even'} = 1;
+    }
+
+    $num++;
+    $dat->{biblionumber} = $biblionumber;
+    $dat->{ITEM_RESULTS}   = \@items;
+    $dat->{MARCNOTES}      = $marcnotesarray;
+    $dat->{MARCSUBJCTS}    = $marcsubjctsarray;
+    $dat->{MARCAUTHORS}    = $marcauthorsarray;
+    $dat->{MARCSERIES}  = $marcseriesarray;
+    $dat->{MARCURLS}    = $marcurlsarray;
+    $dat->{HASAUTHORS}  = $hasauthors;
+    $dat->{subtitle} = $subtitle;
+
+    if ( C4::Context->preference("BiblioDefaultView") eq "normal" ) {
+        $dat->{dest} = "opac-detail.pl";
+    }
+    elsif ( C4::Context->preference("BiblioDefaultView") eq "marc" ) {
+        $dat->{dest} = "opac-MARCdetail.pl";
+    }
+    else {
+        $dat->{dest} = "opac-ISBDdetail.pl";
+    }
+    push( @results, $dat );
+}
+
+my $resultsarray = \@results;
+
 # my $itemsarray=\@items;
 
-$template->param(BIBLIO_RESULTS => $resultsarray,
+$template->param(
+    bib_list => $bib_list,
+    BIBLIO_RESULTS => $resultsarray,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;