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

(-)a/C4/Search.pm (-2 / +2 lines)
Lines 680-686 sub _get_facets_data_from_record { Link Here
680
                next if $field->indicator(1) eq 'z';
680
                next if $field->indicator(1) eq 'z';
681
681
682
                my $data = $field->as_string( $subfield_letters, $facet->{ sep } );
682
                my $data = $field->as_string( $subfield_letters, $facet->{ sep } );
683
                $data =~ s/\s*(?<![A-Z])[.\-,;]*\s*$//;
683
                $data =~ s/\s*(?<!\p{Uppercase})[.\-,;]*\s*$//;
684
684
685
                unless ( grep { $_ eq $data } @used_datas ) {
685
                unless ( grep { $_ eq $data } @used_datas ) {
686
                    push @used_datas, $data;
686
                    push @used_datas, $data;
Lines 779-785 sub _get_facet_from_result_set { Link Here
779
    my $facets = {};
779
    my $facets = {};
780
    foreach my $term ( @terms ) {
780
    foreach my $term ( @terms ) {
781
        my $facet_value = $term->textContent;
781
        my $facet_value = $term->textContent;
782
        $facet_value =~ s/\s*(?<![A-Z])[.\-,;]*\s*$//;
782
        $facet_value =~ s/\s*(?<!\p{Uppercase})[.\-,;]*\s*$//;
783
        $facet_value =~ s/\Q$internal_sep\E/$sep/ if defined $sep;
783
        $facet_value =~ s/\Q$internal_sep\E/$sep/ if defined $sep;
784
        $facets->{ $facet_value } =  ( defined $facets->{$facet_value} ) ? $facets->{ $facet_value } + $term->getAttribute( 'occur' ) : $term->getAttribute( 'occur' );
784
        $facets->{ $facet_value } =  ( defined $facets->{$facet_value} ) ? $facets->{ $facet_value } + $term->getAttribute( 'occur' ) : $term->getAttribute( 'occur' );
785
    }
785
    }
(-)a/admin/searchengine/elasticsearch/index_config.yaml (-2 / +1 lines)
Lines 39-44 index: Link Here
39
        replacement: ''
39
        replacement: ''
40
      facet:
40
      facet:
41
        type: pattern_replace
41
        type: pattern_replace
42
        pattern: '\s*(?<![A-Z])[.\-,;]*\s*$'
42
        pattern: '\s*(?<!\p{Lu})[.\-,;]*\s*$'
43
        replacement: ''
43
        replacement: ''
44
index.mapping.total_fields.limit: 10000
44
index.mapping.total_fields.limit: 10000
45
- 

Return to bug 17661