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

(-)a/C4/Search.pm (-2 / +2 lines)
Lines 443-449 sub getRecords { Link Here
443
                # loop through the results
443
                # loop through the results
444
                $results_hash->{'hits'} = $size;
444
                $results_hash->{'hits'} = $size;
445
                my $times;
445
                my $times;
446
                if ( $offset + $results_per_page <= $size ) {
446
                if ( $results_per_page != 'all' && ($offset + $results_per_page <= $size) ) {
447
                    $times = $offset + $results_per_page;
447
                    $times = $offset + $results_per_page;
448
                }
448
                }
449
                else {
449
                else {
Lines 1884-1890 sub searchResults { Link Here
1884
1884
1885
    # handle which records to actually retrieve
1885
    # handle which records to actually retrieve
1886
    my $times;
1886
    my $times;
1887
    if ( $hits && $offset + $results_per_page <= $hits ) {
1887
    if ( $hits && $results_per_page != 'all' && ($offset + $results_per_page <= $hits) ) {
1888
        $times = $offset + $results_per_page;
1888
        $times = $offset + $results_per_page;
1889
    }
1889
    }
1890
    else {
1890
    else {
(-)a/catalogue/search.pl (-5 / +12 lines)
Lines 150-156 use C4::Members qw(GetMember); Link Here
150
use URI::Escape;
150
use URI::Escape;
151
use POSIX qw(ceil floor);
151
use POSIX qw(ceil floor);
152
use C4::Search::History;
152
use C4::Search::History;
153
153
use String::Random;
154
use Koha::LibraryCategories;
154
use Koha::LibraryCategories;
155
use Koha::Virtualshelves;
155
use Koha::Virtualshelves;
156
use Koha::SearchEngine::Search;
156
use Koha::SearchEngine::Search;
Lines 446-455 for (my $ii = 0; $ii < @operands; ++$ii) Link Here
446
# Params that can only have one value
446
# Params that can only have one value
447
my $scan = $params->{'scan'};
447
my $scan = $params->{'scan'};
448
my $count = C4::Context->preference('numSearchResults') || 20;
448
my $count = C4::Context->preference('numSearchResults') || 20;
449
my $results_per_page = $params->{'count'} || $count;
449
my @results_per_page_options = grep /^\d+$/,
450
my $offset = $params->{'offset'} || 0;
450
                               map {s/\s+//g;$_;}
451
                               split /,/, C4::Context->preference('numSearchResultsPerPage');
452
push(@results_per_page_options, $count);
453
@results_per_page_options = do { my %seen; grep { !$seen{$_}++ } @results_per_page_options };
454
@results_per_page_options = sort {$a <=> $b} @results_per_page_options;
455
456
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
451
my $page = $cgi->param('page') || 1;
457
my $page = $cgi->param('page') || 1;
452
#my $offset = ($page-1)*$results_per_page;
458
my $offset = $params->{'offset'} || 0;
453
my $hits;
459
my $hits;
454
my $expanded_facet = $params->{'expand'};
460
my $expanded_facet = $params->{'expand'};
455
461
Lines 536-541 for (my $i=0;$i<@servers;$i++) { Link Here
536
    my $server = $servers[$i];
542
    my $server = $servers[$i];
537
    if ($server =~/biblioserver/) { # this is the local bibliographic server
543
    if ($server =~/biblioserver/) { # this is the local bibliographic server
538
        $hits = $results_hashref->{$server}->{"hits"};
544
        $hits = $results_hashref->{$server}->{"hits"};
545
        $results_per_page = $hits if $results_per_page == 'all';
539
        my $page = $cgi->param('page') || 0;
546
        my $page = $cgi->param('page') || 0;
540
        my @newresults = searchResults('intranet', $query_desc, $hits, $results_per_page, $offset, $scan,
547
        my @newresults = searchResults('intranet', $query_desc, $hits, $results_per_page, $offset, $scan,
541
                                       $results_hashref->{$server}->{"RECORDS"});
548
                                       $results_hashref->{$server}->{"RECORDS"});
Lines 599-605 for (my $i=0;$i<@servers;$i++) { Link Here
599
            if ($query_desc || $limit_desc) {
606
            if ($query_desc || $limit_desc) {
600
                $template->param(searchdesc => 1);
607
                $template->param(searchdesc => 1);
601
            }
608
            }
602
            $template->param(results_per_page =>  $results_per_page);
609
            $template->param(results_per_page =>  $results_per_page == $hits ? 'all' : $results_per_page);
603
            # must define a value for size if not present in DB
610
            # must define a value for size if not present in DB
604
            # in order to avoid problems generated by the default size value in TT
611
            # in order to avoid problems generated by the default size value in TT
605
            foreach my $line (@newresults) {
612
            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 (-4 / +19 lines)
Lines 95-103 $("#forgetholdfor").click(function(){ Link Here
95
    $(".btn-group").removeClass("open");
95
    $(".btn-group").removeClass("open");
96
    return false;
96
    return false;
97
});
97
});
98
$('#sortbyform').find("input:submit").hide();
98
$('#resultoptionsform').find("input:submit").hide();
99
$('#sort_by').change(function() {
99
$('#sort_by').change(function() {
100
        $('#sortbyform').submit();
100
        $('#resultoptionsform').submit();
101
    });
102
$('#results_per_page').change(function() {
103
        $.cookie('results_per_page', $(this).val());
104
        $('#resultoptionsform').submit();
101
    });
105
    });
102
        var param1 = "<label for=\"addto\">"+_("Add to:")+"<\/label><select name=\"addto\" id=\"addto\"><option value=\"\"><\/option>";
106
        var param1 = "<label for=\"addto\">"+_("Add to:")+"<\/label><select name=\"addto\" id=\"addto\"><option value=\"\"><\/option>";
103
        [% IF ( intranetbookbag ) %]     param1 += "<option value=\"addtocart\">"+_("Cart")+"<\/option>"; [% END %]
107
        [% IF ( intranetbookbag ) %]     param1 += "<option value=\"addtocart\">"+_("Cart")+"<\/option>"; [% END %]
Lines 342-348 var holdForPatron = function () { Link Here
342
346
343
    [% IF ( total ) %]
347
    [% IF ( total ) %]
344
        <div id="searchheader">
348
        <div id="searchheader">
345
            <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="sortbyform">
349
            <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="resultoptionsform">
346
                [% IF ( searchdesc ) %]
350
                [% IF ( searchdesc ) %]
347
                    [% FOREACH QUERY_INPUT IN QUERY_INPUTS %]
351
                    [% FOREACH QUERY_INPUT IN QUERY_INPUTS %]
348
                    <input type="hidden" name="[% QUERY_INPUT.input_name |html %]" value="[% QUERY_INPUT.input_value |html %]"/>
352
                    <input type="hidden" name="[% QUERY_INPUT.input_name |html %]" value="[% QUERY_INPUT.input_value |html %]"/>
Lines 356-363 var holdForPatron = function () { Link Here
356
                    <select id="sort_by" name="sort_by">
360
                    <select id="sort_by" name="sort_by">
357
                    [% INCLUDE 'resort_form.inc' %]
361
                    [% INCLUDE 'resort_form.inc' %]
358
                    </select>
362
                    </select>
359
                    <input type="submit" value="Go" />
360
                <!-- RESORT END -->
363
                <!-- RESORT END -->
364
                <!-- RESULTS_PER_PAGE START -->
365
                    <label for="results_per_page">Results per page: </label>
366
                    <select id="results_per_page" name="results_per_page">
367
                        <option value="20" [% 'SELECTED' IF results_per_page == '20' %]>20</option>
368
                        <option value="40" [% 'SELECTED' IF results_per_page == '40' %]>40</option>
369
                        <option value="60" [% 'SELECTED' IF results_per_page == '60' %]>60</option>
370
                        <option value="80" [% 'SELECTED' IF results_per_page == '80' %]>80</option>
371
                        <option value="100" [% 'SELECTED' IF results_per_page == '100' %]>100</option>
372
                        <option value="all" [% 'SELECTED' IF results_per_page == 'all' %]>all</option>
373
                    </select>
374
                <!-- RESULTS_PER_PAGE END -->
375
                    <input type="submit" value="Go" />
361
            </form>
376
            </form>
362
            <h3>
377
            <h3>
363
                [% 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;
378
                [% 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;
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (+15 lines)
Lines 145-150 Link Here
145
                                    [% UNLESS tag %]
145
                                    [% UNLESS tag %]
146
                                        <div class="sort_by pull-right">
146
                                        <div class="sort_by pull-right">
147
                                            <select id="sort_by" class="resort" name="sort_by"> [% INCLUDE 'resort_form.inc' %] </select>
147
                                            <select id="sort_by" class="resort" name="sort_by"> [% INCLUDE 'resort_form.inc' %] </select>
148
149
                                            <label for="results_per_page">Results per page: </label>
150
                                            <select id="results_per_page" name="results_per_page">
151
                                                <option value="20" [% 'SELECTED' IF results_per_page == '20' %]>20</option>
152
                                                <option value="40" [% 'SELECTED' IF results_per_page == '40' %]>40</option>
153
                                                <option value="60" [% 'SELECTED' IF results_per_page == '60' %]>60</option>
154
                                                <option value="80" [% 'SELECTED' IF results_per_page == '80' %]>80</option>
155
                                                <option value="100" [% 'SELECTED' IF results_per_page == '100' %]>100</option>
156
                                                <option value="all" [% 'SELECTED' IF results_per_page == 'all' %]>all</option>
157
                                            </select>
158
148
                                            <input type="submit" class="btn btn-small clearfix" id="sortsubmit" value="Go" />
159
                                            <input type="submit" class="btn btn-small clearfix" id="sortsubmit" value="Go" />
149
                                        </div>
160
                                        </div>
150
                                    [% END %]
161
                                    [% END %]
Lines 792-797 $(document).ready(function(){ Link Here
792
    $('.resort').change(function() {
803
    $('.resort').change(function() {
793
        $('#bookbag_form').submit();
804
        $('#bookbag_form').submit();
794
    });
805
    });
806
    $('#results_per_page').change(function() {
807
        $.cookie('results_per_page', $(this).val());
808
        $('#bookbag_form').submit();
809
    });
795
    $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_("Clear all")+"<\/a>");
810
    $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_("Clear all")+"<\/a>");
796
    $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_("Select all")+"<\/a>");
811
    $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_("Select all")+"<\/a>");
797
812
(-)a/opac/opac-search.pl (-6 / +11 lines)
Lines 518-527 if ($params->{'limit-yr'}) { Link Here
518
my $scan = $params->{'scan'};
518
my $scan = $params->{'scan'};
519
my $count = C4::Context->preference('OPACnumSearchResults') || 20;
519
my $count = C4::Context->preference('OPACnumSearchResults') || 20;
520
my $countRSS         = C4::Context->preference('numSearchRSSResults') || 50;
520
my $countRSS         = C4::Context->preference('numSearchRSSResults') || 50;
521
my $results_per_page = $params->{'count'} || $count;
521
my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count;
522
my $offset = $params->{'offset'} || 0;
523
my $page = $cgi->param('page') || 1;
522
my $page = $cgi->param('page') || 1;
524
$offset = ($page-1)*$results_per_page if $page>1;
523
my $offset = $params->{'offset'} || 0;
525
my $hits;
524
my $hits;
526
my $expanded_facet = $params->{'expand'};
525
my $expanded_facet = $params->{'expand'};
527
526
Lines 603-609 if ($tag) { Link Here
603
    # FIXME: No facets for tags search.
602
    # FIXME: No facets for tags search.
604
} elsif ($build_grouped_results) {
603
} elsif ($build_grouped_results) {
605
    eval {
604
    eval {
606
        ($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,undef,$query_type,$scan);
605
        unless($results_per_page =~ /\d+/) { # all
606
            # pazpar2 expects $results_per_page to be an integer, we hack around
607
            # this by setting $results_per_page to the max value of a 32bit
608
            # signed int - as defined by parpaz2 session.c:perform_termlist()
609
            $results_per_page = 2147483647;
610
        }
611
        ($error, $results_hashref, $facets) = C4::Search::pazGetRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$query_type,$scan);
607
    };
612
    };
608
} else {
613
} else {
609
    $pasarParams .= '&amp;query=' . uri_escape_utf8($query);
614
    $pasarParams .= '&amp;query=' . uri_escape_utf8($query);
Lines 629-634 for (my $i=0;$i<@servers;$i++) { Link Here
629
    my $server = $servers[$i];
634
    my $server = $servers[$i];
630
    if ($server && $server =~/biblioserver/) { # this is the local bibliographic server
635
    if ($server && $server =~/biblioserver/) { # this is the local bibliographic server
631
        $hits = $results_hashref->{$server}->{"hits"};
636
        $hits = $results_hashref->{$server}->{"hits"};
637
        $results_per_page = $hits if $results_per_page == 'all';
632
        my $page = $cgi->param('page') || 0;
638
        my $page = $cgi->param('page') || 0;
633
        my @newresults;
639
        my @newresults;
634
        if ($build_grouped_results) {
640
        if ($build_grouped_results) {
Lines 785-791 for (my $i=0;$i<@servers;$i++) { Link Here
785
            if ($query_desc || $limit_desc) {
791
            if ($query_desc || $limit_desc) {
786
                $template->param(searchdesc => 1);
792
                $template->param(searchdesc => 1);
787
            }
793
            }
788
            $template->param(results_per_page =>  $results_per_page);
794
            $template->param(results_per_page =>  $results_per_page == $hits ? 'all' : $results_per_page);
789
            my $hide = C4::Context->preference('OpacHiddenItems');
795
            my $hide = C4::Context->preference('OpacHiddenItems');
790
            $hide = ($hide =~ m/\S/) if $hide; # Just in case it has some spaces/new lines
796
            $hide = ($hide =~ m/\S/) if $hide; # Just in case it has some spaces/new lines
791
            my $branch = '';
797
            my $branch = '';
792
- 

Return to bug 14715