Bug 28784: Remove code related to num_paragraph cookie

[koha-ffzg.git] / opac / opac-shelves.pl

diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl
index 0ec193c..611baec 100755 (executable)
--- a/opac/opac-shelves.pl
+++ b/opac/opac-shelves.pl
@@ -20,15 +20,19 @@
 use Modern::Perl;
 
 use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Biblio;
+use C4::Auth qw( get_template_and_user );
+use C4::Biblio qw( GetBiblioData GetFrameworkCode GetMarcBiblio );
 use C4::External::BakerTaylor qw( image_url link_url );
-use C4::Koha;
-use C4::Items;
+use C4::Koha qw(
+    GetNormalizedEAN
+    GetNormalizedISBN
+    GetNormalizedOCLCNumber
+    GetNormalizedUPC
+);
 use C4::Members;
-use C4::Output;
+use C4::Output qw( pagination_bar output_with_http_headers );
 use C4::Tags qw( get_tags );
-use C4::XSLT;
+use C4::XSLT qw( XSLTParse4Display );
 
 use Koha::Biblios;
 use Koha::Biblioitems;
@@ -256,15 +260,19 @@ if ( $op eq 'view' ) {
     if ( $shelf ) {
         if ( $shelf->can_be_viewed( $loggedinuser ) ) {
             $category = $shelf->category;
+
+            # Sortfield param may still include sort order with :asc or :desc, but direction overrides it
             my( $sortfield, $direction );
-            if( defined( $query->param('sortfield') ) ){ # Passed in sorting overrides default sorting
+            if( $query->param('sortfield') ){
                 ( $sortfield, $direction ) = split /:/, $query->param('sortfield');
             } else {
                 $sortfield = $shelf->sortfield;
                 $direction = 'asc';
             }
-            $sortfield = 'title' unless grep $_ eq $sortfield, qw( title author copyrightdate itemcallnumber dateadded );
-            $direction = 'asc' if $direction ne 'asc' and $direction ne 'desc';
+            $direction = $query->param('direction') if $query->param('direction');
+            $direction = 'asc' if !$direction or ( $direction ne 'asc' and $direction ne 'desc' );
+            $sortfield = 'title' if !$sortfield or !grep { $_ eq $sortfield } qw( title author copyrightdate itemcallnumber dateadded );
+
             my ( $page, $rows );
             unless ( $query->param('print') or $query->param('rss') ) {
                 $rows = C4::Context->preference('OPACnumSearchResults') || 20;
@@ -274,7 +282,8 @@ if ( $op eq 'view' ) {
             my $contents = $shelf->get_contents->search(
                 {},
                 {
-                    prefetch => [ { 'biblionumber' => { 'biblioitems' => 'items' } } ],
+                    distinct => 'biblionumber',
+                    join     => [ { 'biblionumber' => { 'biblioitems' => 'items' } } ],
                     page     => $page,
                     rows     => $rows,
                     order_by => { "-$direction" => $order_by },
@@ -294,11 +303,6 @@ if ( $op eq 'view' ) {
                 $categorycode = $patron ? $patron->categorycode : undef;
             }
 
-            # Lists display falls back to search results configuration
-            my $xslfile = C4::Context->preference('OPACXSLTListsDisplay');
-            my $lang   = $xslfile ? C4::Languages::getlanguage()  : undef;
-            my $sysxml = $xslfile ? C4::XSLT::get_xslt_sysprefs() : undef;
-
             my $record_processor = Koha::RecordProcessor->new({ filters => 'ViewPolicy' });
 
             my $art_req_itypes;
@@ -306,7 +310,7 @@ if ( $op eq 'view' ) {
                 $art_req_itypes = Koha::CirculationRules->guess_article_requestable_itemtypes({ $patron ? ( categorycode => $patron->categorycode ) : () });
             }
 
-            my @items;
+            my @items_info;
             while ( my $content = $contents->next ) {
                 my $biblionumber = $content->biblionumber;
                 my $this_item    = GetBiblioData($biblionumber);
@@ -319,19 +323,6 @@ if ( $op eq 'view' ) {
                 });
                 $record_processor->process($record);
 
-                if ($xslfile) {
-                    my $variables = {
-                        anonymous_session => ($loggedinuser) ? 0 : 1
-                    };
-                    $this_item->{XSLTBloc} = XSLTParse4Display(
-                        $biblionumber,          $record,
-                        "OPACXSLTListsDisplay", 1,
-                        undef,                  $sysxml,
-                        $xslfile,               $lang,
-                        $variables
-                    );
-                }
-
                 my $marcflavour = C4::Context->preference("marcflavour");
                 my $itemtype = Koha::Biblioitems->search({ biblionumber => $content->biblionumber })->next->itemtype;
                 $itemtype = Koha::ItemTypes->find( $itemtype );
@@ -354,10 +345,6 @@ if ( $op eq 'view' ) {
                     $this_item->{size} = q||;
                 }
 
-                # Getting items infos for location display
-                my @items_infos = &GetItemsLocationInfo( $biblionumber );
-                $this_item->{'ITEM_RESULTS'} = \@items_infos;
-
                 if (C4::Context->preference('TagsEnabled') and C4::Context->preference('TagsShowOnList')) {
                     $this_item->{TagLoop} = get_tags({
                         biblionumber => $biblionumber, approved=>1, 'sort'=>'-weight',
@@ -365,19 +352,41 @@ if ( $op eq 'view' ) {
                     });
                 }
 
-                my $items = $biblio->items;
+                my $items = $biblio->items->filter_by_visible_in_opac({ patron => $patron });
+                my $allow_onshelf_holds;
                 while ( my $item = $items->next ) {
-                    $this_item->{allow_onshelf_holds} = Koha::CirculationRules->get_onshelfholds_policy( { item => $item, patron => $patron } );
-                    last if $this_item->{allow_onshelf_holds};
+
+                    # This method must take a Koha::Items rs
+                    $allow_onshelf_holds ||= Koha::CirculationRules->get_onshelfholds_policy(
+                        { item => $item, patron => $patron } );
+
                 }
 
+                $this_item->{allow_onshelf_holds} = $allow_onshelf_holds;
+                $this_item->{'ITEM_RESULTS'} = $items;
+
+                my $variables = {
+                    anonymous_session => ($loggedinuser) ? 0 : 1
+                };
+                $this_item->{XSLTBloc} = XSLTParse4Display(
+                    {
+                        biblionumber   => $biblionumber,
+                        record         => $record,
+                        xsl_syspref    => "OPACXSLTListsDisplay",
+                        fix_amps       => 1,
+                        xslt_variables => $variables,
+                        items_rs       => $items->reset,
+                    }
+                );
+
+
                 if ( grep {$_ eq $biblionumber} @cart_list) {
                     $this_item->{incart} = 1;
                 }
 
                 $this_item->{biblio_object} = $biblio;
                 $this_item->{biblionumber}  = $biblionumber;
-                push @items, $this_item;
+                push @items_info, $this_item;
             }
 
             $template->param(
@@ -385,7 +394,7 @@ if ( $op eq 'view' ) {
                 can_delete_shelf   => $shelf->can_be_deleted($loggedinuser),
                 can_remove_biblios => $shelf->can_biblios_be_removed($loggedinuser),
                 can_add_biblios    => $shelf->can_biblios_be_added($loggedinuser),
-                itemsloop          => \@items,
+                itemsloop          => \@items_info,
                 sortfield          => $sortfield,
                 direction          => $direction,
                 csv_profiles => [