X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=basket%2Fbasket.pl;h=76edc3444993943e13d6d1a4a9af97c201d7111f;hb=f37ebd0f76e3bfcdcde6c27bbc2671910449fc59;hp=8d085a919ba337682af4727cdcf6151631fe90cc;hpb=ba0f84b46c5c565600575ef61d413067c768fa14;p=srvgit

diff --git a/basket/basket.pl b/basket/basket.pl
index 8d085a919b..76edc34449 100755
--- a/basket/basket.pl
+++ b/basket/basket.pl
@@ -16,15 +16,16 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 
-use strict;
-use warnings;
+use Modern::Perl;
 use CGI qw ( -utf8 );
 use C4::Koha;
 use C4::Biblio;
 use C4::Items;
 use C4::Auth;
 use C4::Output;
-use C4::Csv;
+
+use Koha::AuthorisedValues;
+use Koha::CsvProfiles;
 
 my $query = new CGI;
 
@@ -33,7 +34,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
         template_name   => "basket/basket.tt",
         query           => $query,
         type            => "intranet",
-        flagsrequired   => { borrow => 1 },
+        flagsrequired   => { catalogue => 1 },
     }
 );
 
@@ -60,9 +61,12 @@ if (C4::Context->preference('TagsEnabled')) {
 foreach my $biblionumber ( @bibs ) {
     $template->param( biblionumber => $biblionumber );
 
+    my $fw = GetFrameworkCode($biblionumber);
+
     my $dat              = &GetBiblioData($biblionumber);
     next unless $dat;
-    my $record           = &GetMarcBiblio($biblionumber);
+    my $record           = &GetMarcBiblio({ biblionumber => $biblionumber });
+    $dat->{subtitle}     = GetRecordValue('subtitle', $record, $fw);
     my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
     my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
     my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
@@ -75,8 +79,8 @@ foreach my $biblionumber ( @bibs ) {
       $hasauthors = 1;
     }
 	
-    my $shelflocations =GetKohaAuthorisedValues('items.location',$dat->{'frameworkcode'});
-    my $collections =  GetKohaAuthorisedValues('items.ccode',$dat->{'frameworkcode'});
+    my $shelflocations =
+      { map { $_->{authorised_value} => $_->{lib} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => $dat->{frameworkcode}, kohafield => 'items.location' } ) };
 
 	for my $itm (@items) {
 	    if ($itm->{'location'}){
@@ -84,7 +88,6 @@ foreach my $biblionumber ( @bibs ) {
 		}
 	}
 	# COinS format FIXME: for books Only
-        my $coins_format;
         my $fmt = substr $record->leader(), 6,2;
         my $fmts;
         $fmts->{'am'} = 'book';
@@ -122,7 +125,7 @@ my $resultsarray = \@results;
 
 $template->param(
     BIBLIO_RESULTS => $resultsarray,
-    csv_profiles => GetCsvProfilesLoop('marc'),
+    csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc', used_for => 'export_records' }) ],
     bib_list => $bib_list,
 );