- make_project: don't create symbolic link html/user_profiles/user_profiles.

If there was ever a need for this, it has disappeared.
    Fixes #524
- fix bug in BOINC-wide team export script

svn path=/trunk/boinc/; revision=14441
This commit is contained in:
David Anderson 2007-12-24 17:32:54 +00:00
parent f9d0d3364a
commit bcf062975c
3 changed files with 16 additions and 8 deletions

View File

@ -12487,3 +12487,14 @@ David 24 Dec 2007
html/inc/ html/inc/
forum.inc forum.inc
util.inc util.inc
David 24 Dec 2007
- make_project: don't create symbolic link html/user_profiles/user_profiles.
If there was ever a need for this, it has disappeared.
Fixes #524
- fix bug in BOINC-wide team export script
html/ops/
team_export.php
py/Boinc/
setup_project.py

View File

@ -5,17 +5,16 @@
// This script for use ONLY by the BOINC-teams project. // This script for use ONLY by the BOINC-teams project.
// It generates an XML file with team and user info // It generates an XML file with team and user info
require_once("../inc/db.inc"); require_once("../inc/boinc_db.inc");
require_once("../inc/util.inc"); require_once("../inc/util.inc");
db_init();
function handle_team($team, $f) { function handle_team($team, $f) {
$user = lookup_user_id($team->userid); $user = BoincUser::lookup_id($team->userid);
if (!$user) { if (!$user) {
echo "no user for team $team->id\n"; echo "no user for team $team->id\n";
exit(1); exit(1);
} }
if ($user->teamid != $team->userid) { if ($user->teamid != $team->id) {
echo "Founder is not member of $team->name\n"; echo "Founder is not member of $team->name\n";
return; return;
} }
@ -47,9 +46,9 @@ function handle_team($team, $f) {
function main() { function main() {
$f = fopen("temp.xml", "w"); $f = fopen("temp.xml", "w");
$result = mysql_query("select * from team"); $teams = BoincTeam::enum();
fwrite($f, "<teams>\n"); fwrite($f, "<teams>\n");
while ($team=mysql_fetch_object($result)) { foreach($teams as $team) {
handle_team($team, $f); handle_team($team, $f);
} }
fwrite($f, "</teams>\n"); fwrite($f, "</teams>\n");

View File

@ -494,8 +494,6 @@ class Project:
my_symlink(self.config.config.download_dir, self.dir('html', 'user', 'download')) my_symlink(self.config.config.download_dir, self.dir('html', 'user', 'download'))
my_symlink('../stats', self.dir('html/user/stats')) my_symlink('../stats', self.dir('html/user/stats'))
my_symlink('../user_profile', self.dir('html/user/user_profile'))
my_symlink('../user_profile', self.dir('html/user_profile/user_profile'))
# Copy the sched server in the cgi directory with the cgi names given # Copy the sched server in the cgi directory with the cgi names given
# source_dir/html/user/schedulers.txt # source_dir/html/user/schedulers.txt