* AUTOTIMER: Allow search without topic, e.g. any event inside time range

* buildsearch: Allow simple wildcard search with single *

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/Tools.pm b/lib/Tools.pm
index 97a483d..2f15fcf 100644
--- a/lib/Tools.pm
+++ b/lib/Tools.pm
@@ -335,14 +335,14 @@ sub _buildsearchcomma {
     my $out;
     foreach my $su (split(/\s*,\s*/, $Search)) {
     $su =~ s/\./\\\./sg;
-#   $su =~ s/\'/\\\'/sg;
-#   $su =~ s/\"/\./sg;
-    $su =~ s/\*/\\\*/sg;
+#   $su =~ s/\*/\\\*/sg;
     $su =~ s/\+/\\\+/sg;
     $su =~ s/\?/\\\?/sg;
     $su =~ s/\(/\\\(/sg;
     $su =~ s/\)/\\\)/sg;
 
+    $su =~ s/\*/\.*/sg;
+
     $out .= ' AND ' if($out);
     if($su =~ s/^\-+//) {
         $out .= qq| ($queryField NOT RLIKE ?)|;
@@ -353,7 +353,7 @@ sub _buildsearchcomma {
         push(@$term,$su);
     }
   }
-# dumper($out);
+
   return {
     query => $out,
     term => $term    
@@ -384,21 +384,21 @@ sub _buildsearchlogical {
         $out .= " AND" unless($op);
       
         $su =~ s/\./\\\./sg;
-#       $su =~ s/\'/\\\'/sg;
-#       $su =~ s/\"/\./sg;
-        $su =~ s/\*/\\\*/sg;
+#       $su =~ s/\*/\\\*/sg;
         $su =~ s/\+/\\\+/sg;
         $su =~ s/\?/\\\?/sg;
         $su =~ s/\(/\\\(/sg;
         $su =~ s/\)/\\\)/sg;
 
+        $su =~ s/\*/\.*/sg;
+
         $out .= qq| ($queryField RLIKE ?)|;
         push(@$term,$su);
         $op = 0;
       }
   }
   $out .= " )";
-# dumper($out);
+
   return {
     query => $out,
     term => $term