* Add vim formatting comments ( # vim:ts=4:sw=4:expandtab:tw=80 )

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

diff --git a/src/Factoids/Question.pl b/src/Factoids/Question.pl
index c269117a7f423228a0a9069a9f5761729698ce84..39b5df2644fc7ca36e532233b2f697ceb4ce781b 100644 (file)
--- a/src/Factoids/Question.pl
+++ b/src/Factoids/Question.pl
@@ -20,7 +20,7 @@ sub doQuestion {
     # my doesn't allow variables to be inherinted, local does.
     # following is used in math()...
     local($query)      = @_;
-    local($reply)      = "";
+    local($reply)      = '';
     local $finalQMark  = $query =~ s/\?+\s*$//;
     $finalQMark                += $query =~ s/\?\s*$//;
     $query             =~ s/^\s+|\s+$//g;
@@ -29,11 +29,11 @@ sub doQuestion {
        return '';
     }
 
-    my $questionWord   = "";
+    my $questionWord   = '';
 
     if (!$addressed) {
        return '' unless ($finalQMark);
-       return '' unless &IsChanConf("minVolunteerLength");
+       return '' unless &IsChanConf('minVolunteerLength') > 0;
        return '' if (length $query < &::getChanConf('minVolunteerLength'));
     } else {
        ### TODO: this should be caught in Process.pl?
@@ -41,7 +41,7 @@ sub doQuestion {
 
        # there is no flag to disable/enable asking factoids...
        # so it was added... thanks zyxep! :)
-       if (&IsFlag("a") ne "a" && &IsFlag("o") ne "o") {
+       if (&IsFlag('a') ne 'a' && &IsFlag('o') ne 'o') {
            &status("$who tried to ask us when not allowed.");
            return;
        }
@@ -87,13 +87,13 @@ sub doQuestion {
        $questionWord = lc($1);
     }
 
-    if ($questionWord eq "" and $finalQMark and $addressed) {
-       $questionWord = "where";
+    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")) {
+    if (&IsChanConf('factoidArguments') > 0) {
        $result = &factoidArgs($query[0]);
 
        return $result if (defined $result);
@@ -103,7 +103,7 @@ sub doQuestion {
     for (my$i=0; $i<scalar @query; $i++) {
        $query  = $query[$i];
        $result = &getReply($query);
-       next if (!defined $result or $result eq "");
+       next if (!defined $result or $result eq '');
 
        # 'see also' factoid redirection support.
 
@@ -138,7 +138,7 @@ sub doQuestion {
 
                return;
            }
-           last if (!defined $newr or $newr eq "");
+           last if (!defined $newr or $newr eq '');
            $result  = $newr;
        }
 
@@ -154,7 +154,7 @@ sub doQuestion {
     }
 
     ### TODO: Use &Forker(); move function to Debian.pl
-    if (&IsChanConf('debianForFactoid')) {
+    if (&IsChanConf('debianForFactoid') > 0) {
        &loadMyModule('Debian');
        $result = &Debian::DebianFind($query);  # ???
        ### TODO: debian module should tell, through shm, that it went
@@ -162,13 +162,13 @@ sub doQuestion {
 ###    return $result if (defined $result);
     }
 
-    if ($questionWord ne "" or $finalQMark) {
+    if ($questionWord ne '' or $finalQMark) {
        # if it has not been explicitly marked as a question
-       if ($addressed and $reply eq "") {
+       if ($addressed and $reply eq '') {
            &status("notfound: <$who> ".join(' :: ', @query))
                                                if ($finalQMark);
 
-           return '' unless (&IsParam("friendlyBots"));
+           return '' unless (&IsParam('friendlyBots'));
 
            foreach (split /\s+/, $param{'friendlyBots'}) {
                &msg($_, ":INFOBOT:QUERY <$who> $query");
@@ -191,7 +191,7 @@ sub factoidArgs {
 
     # ignore split to commands [dumb commands vs. factoids] (editing commands?)
     return undef if $str =~ /\s+\=\~\s+s[\#\/\:]/;
-    my @list = &searchTable("factoids", "factoid_key", "factoid_key", "^cmd: $first ");
+    my @list = &searchTable('factoids', 'factoid_key', 'factoid_key', "^cmd: $first ");
 #    my $delta_time = &timedelta($t);
 #    &DEBUG("factArgs: delta_time = $delta_time s");
 #    &DEBUG("factArgs: list => ".scalar(@list) );
@@ -207,9 +207,6 @@ sub factoidArgs {
 #      &DEBUG("factarg: '$str' =~ /^$_\$/");
        my $arg = $_;
 
-       # TODO: <greycat> ~punish apt for (Eating) (Parentheses)
-       # how the hell do I fix the above? -dms.
-
        # eval (evil!) code. cleaned up courtesy of lear.
        my @vals;
        eval {
@@ -241,9 +238,9 @@ sub factoidArgs {
        }
 
        # update stats. old mysql/sqlite don't do +1
-       my ($count) = &sqlSelect("factoids", "requested_count", { factoid_key => $q });
+       my ($count) = &sqlSelect('factoids', 'requested_count', { factoid_key => $q });
        $count++;
-       &sqlSet("factoids", {'factoid_key' => $q}, {
+       &sqlSet('factoids', {'factoid_key' => $q}, {
                requested_by    => $nuh,
                requested_time  => time(),
                requested_count => $count
@@ -304,3 +301,5 @@ sub factoidArgs {
 }
 
 1;
+
+# vim:ts=4:sw=4:expandtab:tw=80