Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

4074 Bugfix: The 'Subject(s)' link(s) are malformed resulting in no search results

Browse source 
This bug was introduced by commit d51332698b
which removed the inability to do a search on anything contianing a colon (:).

This patch expands the regexp to only normalize true limit operators and leave
all other colons (:) intact.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
This commit is contained in:
Chris Nighswonger 2010-02-01 23:18:09 -05:00 committed by Galen Charlton
parent 7e3e572436
commit eb6b10f8c9
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
C4/Search.pm
View file

@ -814,7 +814,7 @@ sub getIndexes{
'biblionumber',
'bio',
'biography',
'callnum',
'callnum',
'cfn',
'Chronological-subdivision',
'cn-bib-source',
@ -927,7 +927,7 @@ sub getIndexes{
'Title-uniform-seealso',
'totalissues',
'yr',
# items indexes
'acqsource',
'barcode',
@ -964,10 +964,10 @@ sub getIndexes{
'stack',
'uri',
'withdrawn',
# subject related
);
return \@indexes;
}
@ -1114,11 +1114,11 @@ sub buildQuery {
) = ( 0, 0, 0, 0, 0 );
}
if(not $index){
$index = 'kw';
}
# Set default structure attribute (word list)
my $struct_attr;
unless ( $indexes_set || !$index || $index =~ /(st-|phr|ext|wrdl)/ ) {
@ -1141,7 +1141,7 @@ sub buildQuery {
if ($auto_truncation){
unless ( $index =~ /(st-|phr|ext)/ ) {
#FIXME only valid with LTR scripts
$operand=join(" ",map{
$operand=join(" ",map{
(index($_,"*")>0?"$_":"$_*")
}split (/\s+/,$operand));
warn $operand if $DEBUG;
@ -1305,7 +1305,9 @@ sub buildQuery {
# Normalize the query and limit strings
# This is flawed , means we can't search anything with : in it
# if user wants to do ccl or cql, start the query with that
$query =~ s/:/=/g;
# $query =~ s/:/=/g;
$query =~ s/(?<=(ti|au|pb|su|an|kw|mc)):/=/g;
$query =~ s/(?<=rtrn):/=/g;
$limit =~ s/:/=/g;
for ( $query, $query_desc, $limit, $limit_desc ) {
s/ / /g; # remove extra spaces