--- loncom/interface/Attic/londropadd.pm	2002/05/01 20:15:41	1.36
+++ loncom/interface/Attic/londropadd.pm	2002/05/03 17:45:07	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.36 2002/05/01 20:15:41 albertel Exp $
+# $Id: londropadd.pm,v 1.39 2002/05/03 17:45:07 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -106,8 +106,8 @@ sub modifystudent {
     }
     if ($result eq '') {
         $result eq 'Unable to find section for this student';
-    } elsif ($result =~ /^(ok:)+$/) {
-        $result eq 'ok';
+    } else {
+        $result =~ s/(ok:)+/ok/g;
     }
     return $result;
 }
@@ -687,6 +687,7 @@ sub get_current_classlist {
         }
         return (undef,%currentlist);
     } else {
+        $tmp =~ s/^error://;
         return ($tmp,undef);
     }
 }
@@ -695,12 +696,15 @@ sub get_current_classlist {
 sub menu_phase_two_drop {
     my $r=shift;
     my $cid=$ENV{'request.course.id'};
-    my ($error,%currentlist)=&get_current_classlist($ENV{'course.'.$cid.'.domain'},
-                                           $ENV{'course.'.$cid.'.num'});
+    my ($error,%currentlist)=&get_current_classlist
+        ($ENV{'course.'.$cid.'.domain'},$ENV{'course.'.$cid.'.num'});
     if (defined($error)) {
-        $r->print('<pre>ERROR:$error</pre>');
-    }
-    if (!defined(%currentlist)) { 
+        if ($error =~ /^No such file or directory/) {
+            $r->print("There are no students currently enrolled.\n");
+        } else {
+            $r->print("<pre>ERROR:$error</pre>");
+        }
+    } elsif (!defined(%currentlist)) { 
         $r->print("There are no students currently enrolled.\n");
     } else {
         # Print out the available choices
@@ -956,7 +960,7 @@ sub drop_student_list {
     foreach (@droplist) {
         my ($uname,$udom)=split(/\:/,$_);
         my $result = &modifystudent($udom,$uname,$ENV{'request.course.id'});
-        if ($result eq 'ok') {
+        if ($result eq 'ok' || $result eq 'ok:') {
             $r->print('Dropped '.$uname.' at '.$udom.'<br>');
         } else {
             $r->print('Error dropping '.$uname.' at '.$udom.': '.$result.