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

(-)a/C4/Search.pm (-1 / +2 lines)
Lines 34-39 use C4::Charset; Link Here
34
use YAML;
34
use YAML;
35
use URI::Escape;
35
use URI::Escape;
36
use Business::ISBN;
36
use Business::ISBN;
37
use List::MoreUtils qw/any/;
37
use MARC::Record;
38
use MARC::Record;
38
use MARC::Field;
39
use MARC::Field;
39
use utf8;
40
use utf8;
Lines 532-538 sub getRecords { Link Here
532
                                foreach my $field (@fields) {
533
                                foreach my $field (@fields) {
533
                                    my $data = $field->as_string( $subfield_letters, $facet->{sep} );
534
                                    my $data = $field->as_string( $subfield_letters, $facet->{sep} );
534
535
535
                                    unless ( $data ~~ @used_datas ) {
536
                                    unless ( any { $data eq $_ } @used_datas ) {
536
                                        push @used_datas, $data;
537
                                        push @used_datas, $data;
537
                                        $facets_counter->{ $facet->{idx} }->{$data}++;
538
                                        $facets_counter->{ $facet->{idx} }->{$data}++;
538
                                    }
539
                                    }
(-)a/opac/opac-search.pl (-10 / +7 lines)
Lines 30-44 use Modern::Perl; Link Here
30
use C4::Context;
30
use C4::Context;
31
31
32
my $searchengine = C4::Context->preference("SearchEngine");
32
my $searchengine = C4::Context->preference("SearchEngine");
33
for ( $searchengine ) {
33
if ( $searchengine =~ /^Solr$/ ) {
34
    when ( /^Solr$/ ) {
34
    warn "We use Solr";
35
        warn "We use Solr";
35
    require 'opac/search.pl';
36
        require 'opac/search.pl';
36
    exit;
37
        exit;
37
} elsif ( $searchengine =~ /^Zebra$/ ) {
38
    }
39
    when ( /^Zebra$/ ) {
40
38
41
    }
42
}
39
}
43
40
44
use C4::Output;
41
use C4::Output;
Lines 54-59 use C4::SocialData; Link Here
54
use C4::Ratings;
51
use C4::Ratings;
55
use C4::External::OverDrive;
52
use C4::External::OverDrive;
56
53
54
use List::MoreUtils qw/any/;
57
use POSIX qw(ceil floor strftime);
55
use POSIX qw(ceil floor strftime);
58
use URI::Escape;
56
use URI::Escape;
59
use JSON qw/decode_json encode_json/;
57
use JSON qw/decode_json encode_json/;
Lines 360-366 my @allowed_sortby = qw /acqdate_asc acqdate_dsc author_az author_za call_number Link Here
360
@sort_by = $cgi->param('sort_by');
358
@sort_by = $cgi->param('sort_by');
361
$sort_by[0] = $default_sort_by if !$sort_by[0] && defined($default_sort_by);
359
$sort_by[0] = $default_sort_by if !$sort_by[0] && defined($default_sort_by);
362
foreach my $sort (@sort_by) {
360
foreach my $sort (@sort_by) {
363
    if ( $sort ~~ @allowed_sortby ) {
361
    if ( any { $sort eq $_ } @allowed_sortby ) {
364
        $template->param($sort => 1);
362
        $template->param($sort => 1);
365
    }
363
    }
366
}
364
}
367
- 

Return to bug 12151