From: Mike Rylander Date: Mon, 3 Oct 2011 15:19:34 +0000 (-0400) Subject: Use original alias when reconstructing the query, if set X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0ad62bc940ca32e304819f454bfa2e72260c61f4;p=working%2FEvergreen.git Use original alias when reconstructing the query, if set Signed-off-by: Mike Rylander --- diff --git a/Open-ILS/src/extras/fts-replacement.pl b/Open-ILS/src/extras/fts-replacement.pl index 0fca66b08b..516405fd97 100755 --- a/Open-ILS/src/extras/fts-replacement.pl +++ b/Open-ILS/src/extras/fts-replacement.pl @@ -54,7 +54,7 @@ sub abstract_query2str { $q .= join(" ", map { _abstract_query2str_modifier($_) } @{$abstract_query->{modifiers}}) if exists $abstract_query->{modifiers}; } elsif ($abstract_query->{type} eq 'node') { - $q .= " " . $abstract_query->{class}; + $q .= " " . ( $abstract_query->{alias} || $abstract_query->{class} ); $q .= "|$_" foreach @{$abstract_query->{fields}}; $q .= ":"; } elsif ($abstract_query->{type} eq 'atom') { diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/QueryParser.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/QueryParser.pm index cefc71b486..dc44b343b7 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/QueryParser.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/QueryParser.pm @@ -1085,7 +1085,7 @@ sub new_atom { return do{$pkg.'::atom'}->new( @_ ); } -sub requested_class { # also split into classname, fields, alias and alias modifier +sub requested_class { # also split into classname, fields and alias my $self = shift; my $class = shift;