View | Details | Raw Unified | Return to bug 14715
Collapse All | Expand All

(-)a/C4/Search.pm (-2 / +2 lines)
Lines 446-452 sub getRecords { Link Here
446
                # loop through the results
446
                # loop through the results
447
                $results_hash->{'hits'} = $size;
447
                $results_hash->{'hits'} = $size;
448
                my $times;
448
                my $times;
449
                if ( $offset + $results_per_page <= $size ) {
449
                if ( $results_per_page != 'all' && ($offset + $results_per_page <= $size) ) {
450
                    $times = $offset + $results_per_page;
450
                    $times = $offset + $results_per_page;
451
                }
451
                }
452
                else {
452
                else {
Lines 1895-1901 sub searchResults { Link Here
1895
1895
1896
    # handle which records to actually retrieve
1896
    # handle which records to actually retrieve
1897
    my $times;
1897
    my $times;
1898
    if ( $hits && $offset + $results_per_page <= $hits ) {
1898
    if ( $hits && $results_per_page != 'all' && ($offset + $results_per_page <= $hits) ) {
1899
        $times = $offset + $results_per_page;
1899
        $times = $offset + $results_per_page;
1900
    }
1900
    }
1901
    else {
1901
    else {
(-)a/catalogue/search.pl (-6 / +14 lines)
Lines 148-154 use C4::Koha; Link Here
148
use URI::Escape;
148
use URI::Escape;
149
use POSIX qw(ceil floor);
149
use POSIX qw(ceil floor);
150
use C4::Search::History;
150
use C4::Search::History;
151
151
use String::Random;
152
use Koha::ItemTypes;
152
use Koha::ItemTypes;
153
use Koha::Library::Groups;
153
use Koha::Library::Groups;
154
use Koha::Patrons;
154
use Koha::Patrons;
Lines 445-455 for (my $ii = 0; $ii < @operands; ++$ii) Link Here
445
# Params that can only have one value
445
# Params that can only have one value
446
my $scan = $params->{'scan'};
446
my $scan = $params->{'scan'};
447
my $count = C4::Context->preference('numSearchResults') || 20;
447
my $count = C4::Context->preference('numSearchResults') || 20;
448
my $results_per_page = $params->{'count'} || $count;
448
my @results_per_page_options = grep /^\d+$/,
449
                               map {s/\s+//g;$_;}
450
                               split /,/, C4::Context->preference('numSearchResultsPerPage');
451
push(@results_per_page_options, $count);
452
@results_per_page_options = do { my %seen; grep { !$seen{$_}++ } @results_per_page_options };
453
@results_per_page_options = sort {$a <=> $b} @results_per_page_options;
454
455
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
456
my $page = $cgi->param('page') || 1;
449
my $offset = $params->{'offset'} || 0;
457
my $offset = $params->{'offset'} || 0;
450
$offset = 0 if $offset < 0;
458
$offset = 0 if $offset < 0;
451
my $page = $cgi->param('page') || 1;
459
my $hits;
452
#my $offset = ($page-1)*$results_per_page;
453
my $expanded_facet = $params->{'expand'};
460
my $expanded_facet = $params->{'expand'};
454
461
455
# Define some global variables
462
# Define some global variables
Lines 539-545 my @sup_results_array; Link Here
539
for (my $i=0;$i<@servers;$i++) {
546
for (my $i=0;$i<@servers;$i++) {
540
    my $server = $servers[$i];
547
    my $server = $servers[$i];
541
    if ($server =~/biblioserver/) { # this is the local bibliographic server
548
    if ($server =~/biblioserver/) { # this is the local bibliographic server
542
        my $hits = $results_hashref->{$server}->{"hits"} // 0;
549
        $hits = $results_hashref->{$server}->{"hits"} // 0;
550
        $results_per_page = $hits if $results_per_page == 'all';
543
        my $page = $cgi->param('page') || 0;
551
        my $page = $cgi->param('page') || 0;
544
        my @newresults = searchResults('intranet', $query_desc, $hits, $results_per_page, $offset, $scan,
552
        my @newresults = searchResults('intranet', $query_desc, $hits, $results_per_page, $offset, $scan,
545
                                       $results_hashref->{$server}->{"RECORDS"});
553
                                       $results_hashref->{$server}->{"RECORDS"});
Lines 605-611 for (my $i=0;$i<@servers;$i++) { Link Here
605
            if ($query_desc || $limit_desc) {
613
            if ($query_desc || $limit_desc) {
606
                $template->param(searchdesc => 1);
614
                $template->param(searchdesc => 1);
607
            }
615
            }
608
            $template->param(results_per_page =>  $results_per_page);
616
            $template->param(results_per_page =>  $results_per_page == $hits ? 'all' : $results_per_page);
609
            # must define a value for size if not present in DB
617
            # must define a value for size if not present in DB
610
            # in order to avoid problems generated by the default size value in TT
618
            # in order to avoid problems generated by the default size value in TT
611
            foreach my $line (@newresults) {
619
            foreach my $line (@newresults) {
(-)a/installer/data/mysql/atomicupdate/bug_14715-searchresults_syspref.sql (+2 lines)
Line 0 Link Here
1
INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES ('OPACnumSearchResultsPerPage', '10,20,40,60,80,100', NULL, 'Option list of number of results per page to show in OPAC search results','YesNo');
2
INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES ('numSearchResultsPerPage', '10,20,40,60,80,100', NULL, 'Option list of number of results per page to show in staff client search results','YesNo');
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-1 / +41 lines)
Lines 17-22 Link Here
17
[% INCLUDE 'doc-head-open.inc' %]
17
[% INCLUDE 'doc-head-open.inc' %]
18
<title>Koha &rsaquo; Catalog &rsaquo; [% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title>
18
<title>Koha &rsaquo; Catalog &rsaquo; [% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title>
19
[% INCLUDE 'doc-head-close.inc' %]
19
[% INCLUDE 'doc-head-close.inc' %]
20
});
20
</head>
21
</head>
21
22
22
<body id="catalog_results" class="catalog">
23
<body id="catalog_results" class="catalog">
Lines 58-65 Link Here
58
        </h3>
59
        </h3>
59
60
60
        <div id="searchheader">
61
        <div id="searchheader">
61
62
            <div id="selection_ops">
62
            <div id="selection_ops">
63
            <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="resultoptionsform">
64
                [% IF ( searchdesc ) %]
65
                    [% FOREACH QUERY_INPUT IN QUERY_INPUTS %]
66
                    <input type="hidden" name="[% QUERY_INPUT.input_name |html %]" value="[% QUERY_INPUT.input_value |html %]"/>
67
                    [% END %]
68
                    [% FOREACH LIMIT_INPUT IN LIMIT_INPUTS %]
69
                    <input type="hidden" name="[% LIMIT_INPUT.input_name |html %]" value="[% LIMIT_INPUT.input_value |html %]"/>
70
                    [% END %]
71
                [% END %]
72
                <!-- RE-SORT START -->
73
                    <label for="sort_by">Sort By: </label>
74
                    <select id="sort_by" name="sort_by">
75
                    [% INCLUDE 'resort_form.inc' %]
76
                    </select>
77
                <!-- RESORT END -->
78
                <!-- RESULTS_PER_PAGE START -->
79
                    <label for="results_per_page">Results per page: </label>
80
                    <select id="results_per_page" name="results_per_page">
81
                        <option value="20" [% 'SELECTED' IF results_per_page == '20' %]>20</option>
82
                        <option value="40" [% 'SELECTED' IF results_per_page == '40' %]>40</option>
83
                        <option value="60" [% 'SELECTED' IF results_per_page == '60' %]>60</option>
84
                        <option value="80" [% 'SELECTED' IF results_per_page == '80' %]>80</option>
85
                        <option value="100" [% 'SELECTED' IF results_per_page == '100' %]>100</option>
86
                        <option value="all" [% 'SELECTED' IF results_per_page == 'all' %]>all</option>
87
                    </select>
88
                <!-- RESULTS_PER_PAGE END -->
89
                    <input type="submit" value="Go" />
90
            </form>
91
            <h3>
92
                [% total %] result(s) found [% IF ( query_desc ) %]for <span style="font-weight: bold;">'[% query_desc |html %]'</span>[% END %][% IF limit_desc  %]&nbsp;with limit(s): <span style="font-weight: bold;">'[% limit_desc | html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName %] Catalog[% END %].<br />&nbsp;
93
            </h3>
63
                <a href="#" id="select_all"><i class="fa fa-check"></i> Select all</a>
94
                <a href="#" id="select_all"><i class="fa fa-check"></i> Select all</a>
64
                |
95
                |
65
                <a href="#" id="clear_all"><i class="fa fa-remove"></i> Clear all</a>
96
                <a href="#" id="clear_all"><i class="fa fa-remove"></i> Clear all</a>
Lines 655-660 Link Here
655
686
656
        $(document).ready(function() {
687
        $(document).ready(function() {
657
688
689
            $('#resultoptionsform').find("input:submit").hide();
690
            $('#sort_by').change(function() {
691
                $('#resultoptionsform').submit();
692
            });
693
            $('#results_per_page').change(function() {
694
                $.cookie('results_per_page', $(this).val());
695
                $('#resultoptionsform').submit();
696
            });
697
658
            $("#searchheader").fixFloat();
698
            $("#searchheader").fixFloat();
659
699
660
            $("#cartsubmit").click(function(e){
700
            $("#cartsubmit").click(function(e){
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (+14 lines)
Lines 147-152 Link Here
147
                                    [% UNLESS tag %]
147
                                    [% UNLESS tag %]
148
                                        <div class="sort_by pull-right">
148
                                        <div class="sort_by pull-right">
149
                                            <select id="sort_by" class="resort" name="sort_by"> [% INCLUDE 'resort_form.inc' %] </select>
149
                                            <select id="sort_by" class="resort" name="sort_by"> [% INCLUDE 'resort_form.inc' %] </select>
150
151
                                            <label for="results_per_page">Results per page: </label>
152
                                            <select id="results_per_page" name="results_per_page">
153
                                                <option value="20" [% 'SELECTED' IF results_per_page == '20' %]>20</option>
154
                                                <option value="40" [% 'SELECTED' IF results_per_page == '40' %]>40</option>
155
                                                <option value="60" [% 'SELECTED' IF results_per_page == '60' %]>60</option>
156
                                                <option value="80" [% 'SELECTED' IF results_per_page == '80' %]>80</option>
157
                                                <option value="100" [% 'SELECTED' IF results_per_page == '100' %]>100</option>
158
                                            </select>
159
150
                                            <input type="submit" class="btn btn-small clearfix" id="sortsubmit" value="Go" />
160
                                            <input type="submit" class="btn btn-small clearfix" id="sortsubmit" value="Go" />
151
                                        </div>
161
                                        </div>
152
                                    [% END %]
162
                                    [% END %]
Lines 793-798 $(document).ready(function(){ Link Here
793
    $('.resort').change(function() {
803
    $('.resort').change(function() {
794
        $('#bookbag_form').submit();
804
        $('#bookbag_form').submit();
795
    });
805
    });
806
    $('#results_per_page').change(function() {
807
        $.cookie('results_per_page', $(this).val());
808
        $('#bookbag_form').submit();
809
    });
796
    $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_("Clear all")+"<\/a>");
810
    $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_("Clear all")+"<\/a>");
797
    $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_("Select all")+"<\/a>");
811
    $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_("Select all")+"<\/a>");
798
812
(-)a/opac/opac-search.pl (-6 / +4 lines)
Lines 519-529 if ($params->{'limit-yr'}) { Link Here
519
my $scan = $params->{'scan'};
519
my $scan = $params->{'scan'};
520
my $count = C4::Context->preference('OPACnumSearchResults') || 20;
520
my $count = C4::Context->preference('OPACnumSearchResults') || 20;
521
my $countRSS         = C4::Context->preference('numSearchRSSResults') || 50;
521
my $countRSS         = C4::Context->preference('numSearchRSSResults') || 50;
522
my $results_per_page = $params->{'count'} || $count;
522
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
523
my $page = $cgi->param('page') || 1;
523
my $offset = $params->{'offset'} || 0;
524
my $offset = $params->{'offset'} || 0;
524
$offset = 0 if $offset < 0;
525
$offset = 0 if $offset < 0;
525
my $page = $cgi->param('page') || 1;
526
$offset = ($page-1)*$results_per_page if $page>1;
527
my $hits;
526
my $hits;
528
my $expanded_facet = $params->{'expand'};
527
my $expanded_facet = $params->{'expand'};
529
528
Lines 597-603 if ($tag) { Link Here
597
    # FIXME: No facets for tags search.
596
    # FIXME: No facets for tags search.
598
} elsif ($build_grouped_results) {
597
} elsif ($build_grouped_results) {
599
    eval {
598
    eval {
600
        ($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,undef,$query_type,$scan);
599
        ($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$query_type,$scan);
601
    };
600
    };
602
} else {
601
} else {
603
    $pasarParams .= '&amp;query=' . uri_escape_utf8($query);
602
    $pasarParams .= '&amp;query=' . uri_escape_utf8($query);
Lines 780-786 for (my $i=0;$i<@servers;$i++) { Link Here
780
            if ($query_desc || $limit_desc) {
779
            if ($query_desc || $limit_desc) {
781
                $template->param(searchdesc => 1);
780
                $template->param(searchdesc => 1);
782
            }
781
            }
783
            $template->param(results_per_page =>  $results_per_page);
782
            $template->param(results_per_page => $results_per_page);
784
            my $hide = C4::Context->preference('OpacHiddenItems');
783
            my $hide = C4::Context->preference('OpacHiddenItems');
785
            $hide = ($hide =~ m/\S/) if $hide; # Just in case it has some spaces/new lines
784
            $hide = ($hide =~ m/\S/) if $hide; # Just in case it has some spaces/new lines
786
            my $branch = '';
785
            my $branch = '';
787
- 

Return to bug 14715