modified string regex to allow ".. the .."

git-svn-id: svn://svn.open-ils.org/ILS/trunk@692 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Search.pm b/Open-ILS/src/perlmods/OpenILS/Application/Search.pm
index 317d876..44b76cb 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Search.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Search.pm
@@ -25,9 +25,10 @@ sub child_init {
        OpenILS::Application::SearchCache->child_init();
 }
 
-# returns -1 when we hit a dumb search 
 sub filter_search {
-       my($self, $string, $full) = @_;
+       my($self, $str, $full) = @_;
+
+       my $string = $str;      
 
        $string =~ s/\s+the\s+/ /oi;
        $string =~ s/\s+an\s+/ /oi;
@@ -45,7 +46,14 @@ sub filter_search {
        $string =~ s/^an$//io;
        $string =~ s/^a$//io;
 
-       if(!$full) { return $string; }
+
+       if(!$full) {
+               if($string =~ /^\s*$/o) {
+                       return "";
+               } else {
+                       return $str;
+               }
+       }
 
        my @words = qw/ 
        fiction
@@ -79,6 +87,12 @@ sub filter_search {
        }
 
        warn "Cleansed string to: $string\n";
+       if($string =~ /^\s*$/o) {
+               return "";
+       } else {
+               return $str;
+       }
+       
        return $string;
 }