- added CR's here and there; minor reformatting

[infobot.git] / src / Process.pl

diff --git a/src/Process.pl b/src/Process.pl
index 1862e7a61040812f35ac91d38ec6705d3ad03735..fffba84f174ca5451b43f80e6e179fc2aa285fd2 100644 (file)
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -399,25 +399,33 @@ sub FactoidStuff {
            return 'locked factoid' if (&IsLocked($faqtoid) == 1);
 
            if (&IsParam("factoidDeleteDelay")) {
-               if ($faqtoid =~ /#DEL#/ and !&IsFlag("o")) {
+               if ($faqtoid =~ / #DEL#$/ and !&IsFlag("o")) {
                    &msg($who, "cannot delete it ($faqtoid).");
                    return;
                }
+
                &status("forgot (safe delete): <$who> '$faqtoid' =is=> '$result'");
                ### TODO: check if the "backup" exists and overwrite it
                my $check = &getFactoid("$faqtoid #DEL#");
+               &DEBUG("Process: check => '$check'.");
+
                if (!$check) {
-                   if ($faqtoid !~ /#DEL#/) {
+                   if ($faqtoid !~ / #DEL#$/) {
+                       &DEBUG("Process: backing up $faqtoid to '$new'.");
                        my $new = $faqtoid." #DEL#";
+                       # this looks weird but does it work?
                        &setFactInfo($faqtoid, "factoid_key", $new);
                        &setFactInfo($new, "modified_by", $who);
                        &setFactInfo($new, "modified_time", time());
+
                    } else {
                        &status("not backing up $faqtoid.");
                    }
+
                } else {
                    &status("forget: not overwriting backup!");
                }
+
            } else {
                &status("forget: <$who> '$faqtoid' =is=> '$result'");
            }