Added wait on signon failure due to update contacts failing

[quix0rs-gnu-social.git] / scripts / fixup_conversations.php

diff --git a/scripts/fixup_conversations.php b/scripts/fixup_conversations.php
index 2cfa422e659f859806c7cdea78fba016963062ad..80890fe98d8ec82fc07b95aa945dc18636b6d0db 100755 (executable)
--- a/scripts/fixup_conversations.php
+++ b/scripts/fixup_conversations.php
@@ -1,8 +1,8 @@
 #!/usr/bin/env php
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -25,19 +25,14 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 common_log(LOG_INFO, 'Fixing up conversations.');
 
 $notice = new Notice();
-$notice->whereAdd('conversation is null');
-$notice->orderBy('id');
-
-$cnt = $notice->find();
-
-print "Found $cnt notices.\n";
+$notice->query('select id, reply_to from notice where conversation is null');
 
 while ($notice->fetch()) {
 
-    print "$notice->id =>";
-
+    $cid = null;
+    
     $orig = clone($notice);
-
+    
     if (empty($notice->reply_to)) {
         $notice->conversation = $notice->id;
     } else {
@@ -52,6 +47,9 @@ while ($notice->fetch()) {
         } else {
             $notice->conversation = $reply->conversation;
         }
+       
+       unset($reply);
+       $reply = null;
     }
 
     print "$notice->conversation";
@@ -63,5 +61,8 @@ while ($notice->fetch()) {
         continue;
     }
 
+    $orig = null;
+    unset($orig);
+    
     print ".\n";
 }