X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FModules%2FFactoids.pl;h=1e231efa336ca941390870b73594f80168b9dfc1;hb=b8fa03ddc7413bbf76158cd781ff35d16cd2a44f;hp=d803088c95651aececd2ced80a97f6303ec7d79a;hpb=ad2c3ea8b6f00cdc680d7be31bf8ea2212618c2b;p=infobot.git

diff --git a/src/Modules/Factoids.pl b/src/Modules/Factoids.pl
index d803088..1e231ef 100644
--- a/src/Modules/Factoids.pl
+++ b/src/Modules/Factoids.pl
@@ -204,6 +204,7 @@ sub CmdFactStats {
 		my $redirf = lc $2;
 		my $redir = &getFactInfo($redirf, "factoid_value");
 		next if (defined $redir);
+		next if (length $val > 50);
 
 		$redir{$redirf}{$factoid} = 1;
 	    }
@@ -268,7 +269,7 @@ sub CmdFactStats {
 	my $prefix = "dupe factoid ";
 	return &formListReply(1, $prefix, @list);
 
-    } elsif ($type =~ /^lame$/i) {
+    } elsif ($type =~ /^(2|too)short$/i) {
 	# Custom select statement.
 	my $query = "SELECT factoid_key,factoid_value FROM factoids WHERE length(factoid_value) <= 40";
 	my $sth = $dbh->prepare($query);
@@ -277,8 +278,9 @@ sub CmdFactStats {
 	my @list;
 	while (my @row = $sth->fetchrow_array) {
 	    my($key,$val) = ($row[0], $row[1]);
-	    next if ($val =~ /^</);
-	    next if ($val =~ /\s{2,}/);
+	    my $match = 0;
+	    $match++ if ($val =~ /\s{3,}/);
+	    next unless ($match);
 
 	    $key =~ s/\,/\037\,\037/g;
 	    push(@list, $key);
@@ -289,6 +291,31 @@ sub CmdFactStats {
 	my $prefix = "Lame factoids ";
 	return &formListReply(1, $prefix, @list);
 
+    } elsif ($type =~ /^listfix$/i) {
+	# Custom select statement.
+	my $query = "SELECT factoid_key,factoid_value FROM factoids";
+	my $sth = $dbh->prepare($query);
+	&ERROR("factstats(listfix): => '$query'.") unless $sth->execute;
+
+	my @list;
+	while (my @row = $sth->fetchrow_array) {
+	    my($key,$val) = ($row[0], $row[1]);
+	    my $match = 0;
+	    $match++ if ($val =~ /\S+,? or \S+,? or \S+,? or \S+,?/);
+	    next unless ($match);
+
+	    $key =~ s/\,/\037\,\037/g;
+	    push(@list, $key);
+	    $val =~ s/,? or /, /g;
+	    &DEBUG("fixed: => $val.");
+	    &setFactInfo($key,"factoid_value", $val);
+	}
+	$sth->finish;
+
+	# parse the results.
+	my $prefix = "Inefficient lists fixed ";
+	return &formListReply(1, $prefix, @list);
+
     } elsif ($type =~ /^locked$/i) {
 	my %hash = &dbGetCol("factoids", "factoid_key","locked_by");
 	my @list = keys %hash;
@@ -481,9 +508,10 @@ sub CmdFactStats {
     } elsif ($type =~ /^seefix$/i) {
 	my @list = &searchTable("factoids", "factoid_key",
 			"factoid_value", "^see ");
-	my %redir;
-	my $f;
+	my @newlist;
 	my $fixed = 0;
+	my %loop;
+	my $f;
 
 	for (@list) {
 	    my $factoid = $_;
@@ -492,27 +520,25 @@ sub CmdFactStats {
 		my $redirf = lc $2;
 		my $redir = &getFactInfo($redirf, "factoid_value");
 
+		if ($redirf =~ /^\Q$factoid\W$/i) {
+		    &delFactoid($factoid);
+		    $loop{$factoid} = 1;
+		}
+
 		if (defined $redir) {	# good.
 		    &setFactInfo($factoid,"factoid_value","<REPLY> see $redir");
 		    $fixed++;
 		} else {
-		    $redir{$redirf}{$factoid} = 1;
+		    push(@newlist, $redirf);
 		}
 	    }
 	}
 
-	my @newlist;
-	foreach $f (keys %redir) {
-	    my @sublist = keys %{$redir{$f}};
-	    for (@sublist) {
-		s/([\,\;]+)/\037$1\037/g;
-	    }
-
-	    push(@newlist, join(', ', @sublist)." => $f");
-	}
-
 	# parse the results.
-	&performReply("Fixed $fixed factoids.");
+	&msg($who, "Fixed $fixed factoids.");
+	&msg($who, "Self looped factoids removed: ".
+		sort(keys %loop) ) if (scalar keys %loop);
+
 	my $prefix = "Loose link (dead) redirections in factoids ";
 	return &formListReply(1, $prefix, @newlist);