- "what is test?" now works. this was broken forever.

[infobot.git] / src / Factoids / Question.pl

diff --git a/src/Factoids/Question.pl b/src/Factoids/Question.pl
index 0fb25fb0f586c9665d5e4eca7200a5801e2e7b36..5a0ddb299c5d7ddd62ca16fb7c1939f0e7d03d25 100644 (file)
--- a/src/Factoids/Question.pl
+++ b/src/Factoids/Question.pl
@@ -65,7 +65,7 @@ sub doQuestion {
 
     # valid factoid.
     if ($query =~ s/[!.]$//) {
-       push(@query,$query);
+       push(@query, $query);
     }
 
     $x = &normquery($query);
@@ -82,15 +82,16 @@ sub doQuestion {
 
     my $qregex = join '|', keys %{ $lang{'qWord'} };
 
-    # what's whats => what is; who'?s => who is, etc
-    $query =~ s/ ($qregex)\'?s / $1 is /i;
-    if ($query =~ s/\s+($qregex)\s+//i) { # check for question word
+    # purge prefix question string.
+    if ($query =~ s/^ ($qregex)//i) {
        $questionWord = lc($1);
     }
 
     if ($questionWord eq "" and $finalQMark and $addressed) {
        $questionWord = "where";
     }
+    $query =~ s/^\s+|\s+$//g; # bleh. hacked.
+    push(@query, $query) if ($query ne $x);
 
     if (&IsChanConf("factoidArguments")) {
        $result = &factoidArgs($query[0]);
@@ -194,7 +195,7 @@ sub factoidArgs {
        next if (/#DEL#/);      # deleted.
 
        s/^CMD: //i;
-       &DEBUG("factarg: ''$str' =~ /^$_\$/'");
+#      &DEBUG("factarg: '$str' =~ /^$_\$/");
        my $arg = $_;
 
        # todo: <greycat> ~punish apt for (Eating) (Parentheses)
@@ -231,11 +232,20 @@ sub factoidArgs {
        }
 
        # update stats.
-       my $count = &getFactInfo($q, "requested_count") || 0;
-       $count++;
-       &setFactInfo($q, "requested_by", $nuh);
-       &setFactInfo($q, "requested_time", time());
-       &setFactInfo($q, "requested_count", $count);
+       if (0) {        # old.
+           my $count = &getFactInfo($q, "requested_count") || 0;
+           $count++;
+           &setFactInfo($q, "requested_by", $nuh);
+           &setFactInfo($q, "requested_time", time());
+           &setFactInfo($q, "requested_count", $count);
+       } else {
+           &sqlUpdate("factoids", { factoid_key => $q }, {
+               requested_by            => $nuh,
+               requested_time          => time(),
+               -requested_count        => "requested_count+1",
+           } );
+       }
+
        # end of update stats.
 
        $result = $r;