Athena is a dirty word.

[moira.git] / regtape / grouper.pl

diff --git a/regtape/grouper.pl b/regtape/grouper.pl
index 57d89f2fa1f980914ec260620796a74cce5df823..097b91e814306bcae61616698fa3ffd995475748 100755 (executable)
--- a/regtape/grouper.pl
+++ b/regtape/grouper.pl
@@ -48,26 +48,30 @@ while (($user, $mitid) = $sth->fetchrow_array) {
 ($root_id) = $moira->selectrow_array("SELECT users_id FROM users ".
                                   "WHERE login = 'root'");
 
-open(MRTEST, "|$mrtest");
+open(MRTEST, "|$mrtest >/dev/null 2>&1");
 print MRTEST "connect $db\n";
 print MRTEST "auth\n";
-open(LOG, ">$logfile");
+open(LOG, ">>$logfile");
 
 # Create any lists that don't already exist in Moira
 foreach $class (@$classes) {
      $base = "\L$term-$class";
      $staff = "$base-staff";
 
-     # check_list(name, owner, export, parent, desc)
-
-     &check_list($base, "registrar", 1, "",
-               "Automatically-created class participants list for $class");
-     &check_list("$base-reg", "registrar", 0, $base,
-               "Automatically-generated registered students list for $class");
-     &check_list($staff, $staff, 0, $base,
-               "Automatically-created teaching staff list for $class");
-     &check_list("$base-others", $staff, 0, $base,
-               "Automatically-created non-registered students and miscellaneous people list for $class");
+     # check_list(name, owner, export, desc)
+     &check_list($staff, $staff, 0, 
+                "Teaching staff list for $class");
+     &check_list("$base-reg", $staff, 0,
+                "*** DO NOT MODIFY *** Automatically-created registered students list for $class");
+     &check_list("$base-others", $staff, 0,
+                "Non-registered students and miscellaneous people list for $class");
+     &check_list($base, $staff, 1,
+                "*** DO NOT MODIFY *** Automatically-created participants list for $class");
+     if (!$lists{$base}) {
+        &add_member($staff, LIST, $base);
+        &add_member("$base-reg", LIST, $base);
+        &add_member("$base-others", LIST, $base);
+     }
 }
 
 # Now fill in -reg lists
@@ -128,13 +132,10 @@ $warehouse->disconnect;
 exit 0;
 
 sub check_list {
-    my ( $name, $owner, $export, $parent, $desc ) = @_;
+    my ( $name, $owner, $export, $desc ) = @_;
     if (!$lists{$name}) {
        print LOG "Creating $name\n";
-       print MRTEST "qy alis $name 1 0 1 $export $export \"create unique GID\" 0 LIST $owner \"$desc\"\n";
-        if ($parent) {
-           &add_member($name, LIST, $parent);
-       }
+       print MRTEST "qy alis $name 0 0 1 $export $export \"create unique GID\" 0 0 [NONE] LIST $owner NONE NONE \"$desc\"\n";
     }
 }