ws

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

diff --git a/src/Factoids/Reply.pl b/src/Factoids/Reply.pl
index 58ebb0f53ec37fc1470975b8cbebae54e1b79387..056f947e4100475dfe3ddf69642111c7e33e6d1c 100644 (file)
--- a/src/Factoids/Reply.pl
+++ b/src/Factoids/Reply.pl
@@ -10,7 +10,7 @@
 #   rhs - factoid message.
 ##
 
-if (&IsParam("useStrict")) { use strict; }
+# use strict;  # TODO
 
 use vars qw($msgType $uh $lastWho $ident);
 use vars qw(%lang %lastWho);
@@ -27,9 +27,13 @@ sub getReply {
     }
 
     $message =~ tr/A-Z/a-z/;
+    $message =~ s/^cmd:/CMD:/;
+
+    my ($count, $fauthor, $result) = &sqlSelect("factoids",
+       "requested_count,created_by,factoid_value",
+       { factoid_key => $message }
+    );
 
-    my ($result, $fauthor, $count) = &dbGet("factoids", 
-       "factoid_value,created_by,requested_count", "factoid_key=".&dbQuote($message) );
     if ($result) {
        $lhs = $message;
        $mhs = "is";
@@ -61,18 +65,11 @@ sub getReply {
        ### FIXME: old mysql doesn't support
        ### "requested_count=requested_count+1".
        $count++;
-       ### BROKEN!!! - Tim Riker <Tim@Rikers.org> says it's fixed now
-       if (0) {        # old code.
-           &setFactInfo($lhs,"requested_by", $nuh);
-           &setFactInfo($lhs,"requested_time", time());
-           &setFactInfo($lhs,"requested_count", $count);
-       } else {
-           &dbSet("factoids", {'factoid_key' => $lhs}, {
+       &sqlSet("factoids", {'factoid_key' => $lhs}, {
                requested_by    => $nuh,
                requested_time  => time(),
                requested_count => $count
-           } );
-       }
+       } );
 
        # todo: rename $real to something else!
        my $real   = 0;
@@ -156,10 +153,7 @@ sub smart_replace {
     foreach (split //, $string) {
 
        if ($_ eq "(") {
-###        print "( l=>$l, r=>$r\n";
-
            if (!$l and !$r) {
-#              print "STARTING at $i\n";
                $s = $i;
                $t = $i;
            }
@@ -169,25 +163,21 @@ sub smart_replace {
        }
 
        if ($_ eq ")") {
-###        print ") l=>$l, r=>$r\n";
-
            $r++;
            $l--;
 
            if (!$l and !$r) {
                my $substr = substr($old,$s,$i-$s+1);
-#              print "STOP at $i $substr\n";
                push(@rand, substr($old,$t+1,$i-$t-1) );
 
                my $rand = $rand[rand @rand];
-               &status("SARing '$substr' to '$rand'.");
+#              &status("SARing '$substr' to '$rand'.");
                $string =~ s/\Q$substr\E/$rand/;
                undef @rand;
            }
        }
 
        if ($_ eq "|" and $l+$r== 0 and $l==1) {
-#          print "| at $i (l=>$l,r=>$r)\n";
            push(@rand, substr($old,$t+1,$i-$t-1) );
            $t = $i;
        }