we didn't set modified_time for deleted factoids - fixed

also... if final delete factoid list is >50... don't do it!

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@455 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl
index 7519ef0be91d4edf2ba30877a44a8ada2740285b..5851b642c40fd8b996759cd500800533ad991ad6 100644 (file)
--- a/src/IRC/Schedulers.pl
+++ b/src/IRC/Schedulers.pl
@@ -1035,8 +1035,18 @@ sub factoidCheck {
 
     foreach (@list) {
        my $age = &getFactInfo($_, "modified_time");    
+
        if (!defined $age or $age !~ /^\d+$/) {
-           &WARN("age == NULL or not numeric.");
+           if (scalar @list > 50) {
+               if (!$cache{warnDel}) {
+                   &WARN("list is over 50 (".scalar(@list)."... giving it a miss.");
+                   $cache{warnDel} = 1;
+                   last;
+               }
+           }
+
+           &WARN("old cruft (no time): $_");
+           &delFactoid($_);
            next;
        }
 

diff --git a/src/Process.pl b/src/Process.pl
index 495c00b65a850c2b3e33e61d9633426a99a0bdef..dedad4eac304878685fb65ba13fe173d5dfd3d6c 100644 (file)
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -411,10 +411,10 @@ sub FactoidStuff {
                my $check = &getFactoid("$faqtoid #DEL#");
                if (!$check) {
                    if ($faqtoid !~ /#DEL#/) {
-                       &setFactInfo($faqtoid, "factoid_key", $faqtoid." #DEL#");
-
-                       &setFactInfo($faqtoid, "modified_by", $who);
-                       &setFactInfo($faqtoid, "modified_time", time());
+                       my $new = $faqtoid." #DEL#";
+                       &setFactInfo($faqtoid, "factoid_key", $new);
+                       &setFactInfo($new, "modified_by", $who);
+                       &setFactInfo($new, "modified_time", time());
                    } else {
                        &status("not backing up $faqtoid.");
                    }