From b2064d0cd0cdfcabf6116447b978ad4edb25056a Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 11 Aug 2010 18:52:11 +0000
Subject: [PATCH] - admin: add script for deleting results with no workunit.   
  There were ~1,400 of these on SETI@home,     presumably because of a bug at
 some point in the past.

svn path=/trunk/boinc/; revision=22197
---
 checkin_notes                      | 14 +++++++++++++
 html/inc/boinc_db.inc              |  4 ++++
 html/ops/delete_orphan_results.php | 32 ++++++++++++++++++++++++++++++
 html/ops/profile_screen_form.php   |  2 +-
 sched/db_purge.cpp                 |  4 +---
 5 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100755 html/ops/delete_orphan_results.php

diff --git a/checkin_notes b/checkin_notes
index b09a7ed49d..17c0f1d0f3 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5917,3 +5917,17 @@ Rom    11 Aug 2010
 
     win_build/
         libboinc_staticcrt.vcproj
+
+David  11 Aug 2010
+    - admin: add script for deleting results with no workunit.
+        There were ~1,400 of these on SETI@home,
+        presumably because of a bug at some point in the past.
+    html/
+        ops/
+            delete_orphan_results.php
+            profile_screen_form.php
+        inc/
+            boinc_db.inc
+
+    sched/
+        db_purge.cpp
diff --git a/html/inc/boinc_db.inc b/html/inc/boinc_db.inc
index 0ff0ce4fef..5e05d50766 100644
--- a/html/inc/boinc_db.inc
+++ b/html/inc/boinc_db.inc
@@ -223,6 +223,10 @@ class BoincResult {
         $db = BoincDb::get();
         return $db->lookup_id($id, 'result', 'BoincResult');
     }
+    function delete() {
+        $db = BoincDb::get();
+        return $db->delete($this, 'result');
+    }
 }
 
 class BoincWorkunit {
diff --git a/html/ops/delete_orphan_results.php b/html/ops/delete_orphan_results.php
new file mode 100755
index 0000000000..3ec3543440
--- /dev/null
+++ b/html/ops/delete_orphan_results.php
@@ -0,0 +1,32 @@
+<?php
+
+// delete results without a corresponding workunit.
+// (in principle these shouldn't exist)
+
+error_reporting(E_ALL);
+ini_set('display_errors', true);
+ini_set('display_startup_errors', true);
+
+require_once("../inc/boinc_db.inc");
+
+$ndel = 0;
+while (1) {
+    $rs = BoincResult::enum("true order by id limit 100");
+    $found = false;
+    foreach ($rs as $r) {
+        $wu = BoincWorkunit::lookup_id($r->workunitid);
+        if ($wu) {
+            echo "$r->id has a WU\n";
+            $found = true;
+            break;
+        } else {
+            echo "$r->id has no WU - deleting\n";
+            $ndel++;
+            $r->delete();
+        }
+    }
+    if ($found) break;
+}
+echo "Done - deleted $ndel results\n";
+
+?>
diff --git a/html/ops/profile_screen_form.php b/html/ops/profile_screen_form.php
index 9b8a46f8bd..b91d1f9c11 100644
--- a/html/ops/profile_screen_form.php
+++ b/html/ops/profile_screen_form.php
@@ -71,7 +71,7 @@ while ($profile = mysql_fetch_object($result)) {
         <br>
     ";
     echo "</td><td><table border=2> ";
-    show_profile($profile, $logged_in_user, true);
+    show_profile($profile, $g_logged_in_user, true);
     echo "</table></td></tr>\n";
     echo "<input type=\"hidden\" name=\"userid$n\" value=\"$profile->userid\">\n";
     $n++;
diff --git a/sched/db_purge.cpp b/sched/db_purge.cpp
index da35df3823..c49a05954b 100644
--- a/sched/db_purge.cpp
+++ b/sched/db_purge.cpp
@@ -18,9 +18,7 @@
 // db_purge options
 //
 // purge workunit and result records that are no longer needed.
-// Specifically, purges WUs for which file_delete_state=DONE;
-// this occurs only when it has been assimilated
-// and all results have server_state=OVER.
+// Specifically, purges WUs for which file_delete_state=DONE.
 // Purging a WU means writing it and all its results
 // to XML-format archive files, then deleting it and its results from the DB.
 //