X-Git-Url: https://git.donarmstrong.com/?p=infobot.git;a=blobdiff_plain;f=src%2FFactoids%2FCore.pl;h=847f7e2d8fff4457d52244c0c2ab8e773c350b42;hp=bb814dc8a99b33a5ce4cf4a43dc9c87c61dbbd84;hb=ab817c7c909abba1654f3b8691961ec8694e8169;hpb=1b325d96346dbd17a6c8c2a99bdd63ddb6ab70f7

diff --git a/src/Factoids/Core.pl b/src/Factoids/Core.pl
index bb814dc..847f7e2 100644
--- a/src/Factoids/Core.pl
+++ b/src/Factoids/Core.pl
@@ -20,7 +20,7 @@ sub validFactoid {
 
         # allow the following only if they have been made on purpose.
         if ( $rhs ne '' and $rhs !~ /^</ ) {
-            / \Q$ident$/i and last;    # someone said i'm something.
+            / \Q$ident\E$/i and last;    # someone said i'm something.
             /^i('m)? /    and last;
             /^(it|that|there|what)('s)?(\s+|$)/ and last;
             /^you('re)?(\s+|$)/                 and last;
@@ -84,7 +84,7 @@ sub validFactoid {
         $rhs =~ /( \Q$ident\E's|\Q$ident\E's )/i and last;    # ownership.
 
         # duplication.
-        $rhs =~ /^\Q$lhs /i and last;
+        $rhs =~ /^\Q$lhs\E /i and last;
         last if ( $rhs =~ /^is /i and / is$/ );
 
         $valid++;
@@ -552,12 +552,14 @@ sub FactoidStuff {
     for ($question) {
 
         # fix the string.
-        s/^hey([, ]+)where/where/i;
+        s/^where is //i;
         s/\s+\?$/?/;
-        s/^whois /who is /i
-          ;    # Must match ^, else factoids with "whois" anywhere break
-        s/where can i find/where is/i;
-        s/how about/where is/i;
+        s/^whois //i;   # Must match ^, else factoids with "whois" anywhere break
+        s/^who is //i;
+        s/^what is (a|an)?//i;
+        s/^how do i //i;
+        s/^where can i (find|get|download)//i;
+        s/^how about //i;
         s/ da / the /ig;
 
         # clear the string of useless words.