Bugzilla – Attachment 26870 Details for
Bug 11944
Cleanup Koha UTF-8
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11944: Facets and resort
Bug-11944-Facets-and-resort.patch (text/plain), 3.78 KB, created by
Jonathan Druart
on 2014-04-07 15:12:31 UTC
(
hide
)
Description:
Bug 11944: Facets and resort
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2014-04-07 15:12:31 UTC
Size:
3.78 KB
patch
obsolete
>From 7195870c306bb953e5c7f4839226d9710c29616f Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Mon, 7 Apr 2014 16:07:20 +0200 >Subject: [PATCH] Bug 11944: Facets and resort > >This patch should fix facets and resort encoding issues. > >Note: This patch will certainly break the search history >--- > C4/Search.pm | 24 +++++++++++++----------- > 1 file changed, 13 insertions(+), 11 deletions(-) > >diff --git a/C4/Search.pm b/C4/Search.pm >index 144dbde..30e4158 100644 >--- a/C4/Search.pm >+++ b/C4/Search.pm >@@ -518,6 +518,8 @@ sub getRecords { > next; > } > >+ SetUTF8Flag($marc_record); >+ > my @used_datas = (); > > foreach my $tag ( @{ $facet->{tags} } ) { >@@ -1305,17 +1307,17 @@ sub buildQuery { > if ( @limits ) { > $q .= ' and '.join(' and ', @limits); > } >- return ( undef, $q, $q, "q=ccl=".uri_escape_utf8($q), $q, '', '', '', '', 'ccl' ); >+ return ( undef, $q, $q, "q=ccl=".$q, $q, '', '', '', '', 'ccl' ); > } > if ( $query =~ /^cql=/ ) { >- return ( undef, $', $', "q=cql=".uri_escape_utf8($'), $', '', '', '', '', 'cql' ); >+ return ( undef, $', $', "q=cql=".$', $', '', '', '', '', 'cql' ); > } > if ( $query =~ /^pqf=/ ) { > if ($query_desc) { >- $query_cgi = "q=".uri_escape_utf8($query_desc); >+ $query_cgi = "q=".$query_desc; > } else { > $query_desc = $'; >- $query_cgi = "q=pqf=".uri_escape_utf8($'); >+ $query_cgi = "q=pqf=".$'; > } > return ( undef, $', $', $query_cgi, $query_desc, '', '', '', '', 'pqf' ); > } >@@ -1487,9 +1489,9 @@ sub buildQuery { > $query .= " $operators[$i-1] "; > $query .= " $index_plus " unless $indexes_set; > $query .= " $operand"; >- $query_cgi .= "&op=".uri_escape_utf8($operators[$i-1]); >- $query_cgi .= "&idx=".uri_escape_utf8($index) if $index; >- $query_cgi .= "&q=".uri_escape_utf8($operands[$i]) if $operands[$i]; >+ $query_cgi .= "&op=".$operators[$i-1]; >+ $query_cgi .= "&idx=".$index if $index; >+ $query_cgi .= "&q=".$operands[$i] if $operands[$i]; > $query_desc .= > " $operators[$i-1] $index_plus $operands[$i]"; > } >@@ -1499,8 +1501,8 @@ sub buildQuery { > $query .= " and "; > $query .= "$index_plus " unless $indexes_set; > $query .= "$operand"; >- $query_cgi .= "&op=and&idx=".uri_escape_utf8($index) if $index; >- $query_cgi .= "&q=".uri_escape_utf8($operands[$i]) if $operands[$i]; >+ $query_cgi .= "&op=and&idx=".$index if $index; >+ $query_cgi .= "&q=".$operands[$i] if $operands[$i]; > $query_desc .= " and $index_plus $operands[$i]"; > } > } >@@ -1512,8 +1514,8 @@ sub buildQuery { > $query .= " $index_plus " unless $indexes_set; > $query .= $operand; > $query_desc .= " $index_plus $operands[$i]"; >- $query_cgi .= "&idx=".uri_escape_utf8($index) if $index; >- $query_cgi .= "&q=".uri_escape_utf8($operands[$i]) if $operands[$i]; >+ $query_cgi .= "&idx=".$index if $index; >+ $query_cgi .= "&q=".$operands[$i] if $operands[$i]; > $previous_operand = 1; > } > } #/if $operands >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11944
:
26364
|
26365
|
26366
|
26367
|
26368
|
26369
|
26370
|
26371
|
26372
|
26407
|
26408
|
26409
|
26737
|
26738
|
26739
|
26740
|
26741
|
26742
|
26743
|
26744
|
26745
|
26746
|
26747
|
26748
|
26794
|
26857
|
26858
|
26859
|
26860
|
26861
|
26862
|
26863
|
26864
|
26865
|
26866
|
26867
|
26868
|
26869
|
26870
|
26871
|
26895
|
26921
|
27021
|
27080
|
27094
|
27158
|
27159
|
27161
|
27193
|
27194
|
27195
|
27196
|
27198
|
27199
|
27200
|
27201
|
27202
|
27203
|
27204
|
27205
|
27206
|
27207
|
27208
|
27209
|
27210
|
27211
|
27212
|
27213
|
27214
|
27215
|
27216
|
27585
|
27586
|
27587
|
27588
|
27589
|
27590
|
27591
|
27592
|
27593
|
27594
|
27595
|
27596
|
27597
|
27598
|
27599
|
27600
|
27601
|
27602
|
27603
|
27880
|
27881
|
27882
|
27883
|
27884
|
27885
|
27886
|
27887
|
27888
|
27889
|
27890
|
27891
|
27892
|
27893
|
27894
|
27895
|
27896
|
27897
|
27898
|
28046
|
28047
|
28048
|
28049
|
28050
|
28051
|
28052
|
28053
|
28054
|
28055
|
28056
|
28057
|
28058
|
28059
|
28060
|
28061
|
28062
|
28063
|
28064
|
28065
|
28066
|
28097
|
28245
|
28246
|
28247
|
28248
|
28249
|
28250
|
28251
|
28252
|
28253
|
28732
|
29981
|
29982
|
29983
|
29984
|
29985
|
29986
|
29987
|
29988
|
29989
|
29990
|
29991
|
29992
|
29993
|
29994
|
29995
|
29996
|
29997
|
29998
|
29999
|
30000
|
30001
|
30002
|
30003
|
30004
|
30005
|
30006
|
30012
|
30016
|
30945
|
31299
|
35223
|
35224
|
35225
|
35226
|
35227
|
35228
|
35229
|
35230
|
35231
|
35232
|
35233
|
35234
|
35235
|
35236
|
35237
|
35238
|
35239
|
35240
|
35241
|
35242
|
35243
|
35244
|
35245
|
35246
|
35247
|
35248
|
35249
|
35250
|
35251
|
35252
|
35253