From 0fa1faafa9a72173d815aee3b59ffa8fc29cf92d Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 8 Oct 2003 20:44:58 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=2424
---
 checkin_notes          | 10 +++++++++-
 html/ops/db_action.php |  6 ++++--
 html/ops/db_form.php   |  1 +
 html/ops/db_ops.inc    | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 4322475c4e..d0866b44ef 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -6606,4 +6606,12 @@ David  Oct 8 2003
             wingui_mainwindow.cpp
             wingui_piecectrl.cpp
     lib/
-        util.C,h
\ No newline at end of file
+        util.C,h
+
+David  Oct 8 2003
+    - add low-detail option to WU display
+
+    html_ops/
+        db_action.php
+        db_form.php
+        db_ops.php
diff --git a/html/ops/db_action.php b/html/ops/db_action.php
index a73dce1c7a..852455fa2e 100644
--- a/html/ops/db_action.php
+++ b/html/ops/db_action.php
@@ -106,14 +106,16 @@
             start_table();
             switch($table) {
             case "result": result_short_header(); break;
+            case "workunit": workunit_short_header(); break;
             case "host":   host_short_header(); break;
             }
         }
         while ($res = mysql_fetch_object($result)) {
             if ($detail == "low") {
                 switch ($table) {
-                case "result":      show_result_short($res);                                      break;
-                case "host":        show_host_short($res);                                        break;
+                case "result":      show_result_short($res); break;
+                case "host":        show_host_short($res); break;
+                case "workunit":    show_workunit_short($res); break;
                 }
             } else {
                 switch ($table) {
diff --git a/html/ops/db_form.php b/html/ops/db_form.php
index 616843ba60..eff1469ffb 100644
--- a/html/ops/db_form.php
+++ b/html/ops/db_form.php
@@ -42,6 +42,7 @@ require_once("db_ops.inc");
         print_detail_field();
     } else if ($table=="workunit") {
         print_checkbox("Hide XML fields", "hide_xml_docs", $hide_xml_docs);
+        print_detail_field();
     } else if ($table=="result") {
         echo "<tr><td align=right>Server state</td><td> ";
         server_state_select();
diff --git a/html/ops/db_ops.inc b/html/ops/db_ops.inc
index 40dc9f409d..05965ceb1d 100644
--- a/html/ops/db_ops.inc
+++ b/html/ops/db_ops.inc
@@ -477,6 +477,39 @@ function show_workunit($wu, $hide_xml_doc) {
     echo "<p>";
 }
 
+function workunit_short_header() {
+    echo "
+        <tr>
+        <th>WU ID</th>
+        <th>canonical result</th>
+        <th>error_mask</th>
+        <th>file delete</th>
+        <th>assimilate</th>
+        </tr>
+    ";
+}
+
+function show_workunit_short($wu) {
+    if ($wu->canonical_resultid) {
+        $cr = "<a href=db_action.php?table=result&id=$wu->canonical_resultid>$wu->canonical_resultid</a>";
+    } else {
+        $cr = "none";
+    }
+    $cr = $cr. " <a href=db_action.php?table=result&workunitid=$wu->id&detail=low>all</a>";
+    $e = wu_error_mask_str($wu->error_mask);
+    $f = file_delete_state_str($wu->file_delete_state);
+    $a = assimilate_state_str($wu->assimilate_state);
+    echo "
+        <tr>
+        <td>$wu->id</td>
+        <td>$cr</td>
+        <td>$e</td>
+        <td>$f</td>
+        <td>$a</td>
+        </tr>
+    ";
+}
+
 function server_state_string($s) {
     switch($s) {
     case 1: return "Inactive";