From 07a853d73aa7e6c2cfbda5273819c8dc97c27796 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 2 Feb 2009 23:12:35 +0000
Subject: [PATCH] - Manager: change terms for STD, LTD - web: change script
 that locks old threads to exempt team forums

svn path=/trunk/boinc/; revision=17121
---
 checkin_notes                   | 9 +++++++++
 clientgui/DlgItemProperties.cpp | 8 ++++----
 html/ops/autolock.php           | 2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index a01a8fa1ba..e20364be7d 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1070,3 +1070,12 @@ David  2 Feb 2009
     client/
         rr_sim.cpp,h
         work_fetch.cpp,h
+
+David  2 Feb 2009
+    - Manager: change terms for STD, LTD
+    - web: change script that locks old threads to exempt team forums
+
+    clientgui/
+        DlgItemProperties.cpp
+    html/ops/
+        autolock.php
diff --git a/clientgui/DlgItemProperties.cpp b/clientgui/DlgItemProperties.cpp
index 0607cfadf9..c76adffee0 100755
--- a/clientgui/DlgItemProperties.cpp
+++ b/clientgui/DlgItemProperties.cpp
@@ -135,16 +135,16 @@ void CDlgItemProperties::renderInfos(PROJECT* project_in) {
     );
 	
 	addSection(_("Scheduling"));
-	addProperty(_("Short term debt"),wxString::Format(wxT("%0.2f"), project->short_term_debt));
-	addProperty(_("CPU long term debt"),wxString::Format(wxT("%0.2f"), project->cpu_long_term_debt));
+	addProperty(_("CPU scheduling priority"),wxString::Format(wxT("%0.2f"), project->short_term_debt));
+	addProperty(_("CPU work fetch priority"),wxString::Format(wxT("%0.2f"), project->cpu_long_term_debt));
     if (project->cpu_backoff_time > dtime()) {
 		addProperty(_("CPU work fetch deferred for"), FormatTime(project->cpu_backoff_time - dtime()));
     }
     if (project->cuda_debt) {
-        addProperty(_("CUDA long term debt"),wxString::Format(wxT("%0.2f"), project->cuda_debt));
+        addProperty(_("NVIDIA GPU work fetch priority"),wxString::Format(wxT("%0.2f"), project->cuda_debt));
     }
     if (project->cuda_backoff_time > dtime()) {
-		addProperty(_("CUDA work fetch deferred for"), FormatTime(project->cuda_backoff_time - dtime()));
+		addProperty(_("NVIDIA GPU work fetch deferred for"), FormatTime(project->cuda_backoff_time - dtime()));
     }
 	addProperty(_("Duration correction factor"),wxString::Format(wxT("%0.4f"), project->duration_correction_factor));
 	m_gbSizer->Layout();
diff --git a/html/ops/autolock.php b/html/ops/autolock.php
index 13a0f124b4..d4fcc63883 100755
--- a/html/ops/autolock.php
+++ b/html/ops/autolock.php
@@ -34,7 +34,7 @@ echo "starting at $t\n";
 $t = time() - $max_age_days*86400;
 $db = BoincDb::get();
 if (!$db) die("can't open DB\n");
-$db->do_query("update DBNAME.thread set locked=1 where timestamp<$t and locked=0 and sticky=0");
+$db->do_query("update DBNAME.thread, DBNAME.forum set DBNAME.thread.locked=1 where DBNAME.thread.forum=DBNAME.forum.id and DBNAME.forum.parent_type=0 and DBNAME.thread.timestamp<$t and DBNAME.thread.locked=0 and DBNAME.thread.sticky=0");
 $n = $db->affected_rows();
 $t = time_str(time());
 echo "finished at $t; locked $n threads\n";