--- loncom/interface/Attic/londropadd.pm	2002/05/03 20:38:13	1.40
+++ loncom/interface/Attic/londropadd.pm	2002/08/08 19:27:35	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.40 2002/05/03 20:38:13 matthew Exp $
+# $Id: londropadd.pm,v 1.45 2002/08/08 19:27:35 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -129,7 +129,7 @@ sub domain_form {
         $select_menus{$dom}->{'default'}= 'default';
         $select_menus{$dom}->{'select2'}->{'default'} = 'default';
         # Now build up the other items in the second menu
-        my %servers = &Apache::loncommon::get_home_servers($dom);
+        my %servers = &Apache::loncommon::get_library_servers($dom);
         foreach my $server (keys(%servers)) {
             $select_menus{$dom}->{'select2'}->{$server} 
                                             = "$server $servers{$server}";
@@ -145,18 +145,29 @@ sub domain_form {
 sub menu_phase_one {
     my $r=shift;
     my $upfile_select=&Apache::loncommon::upfile_select_html();
+    my $create_classlist_help = 
+	&Apache::loncommon::help_open_topic("Course_Create_Class_List",
+           "How do I create a class list from a spreadsheet");
+    my $create_csv_help =
+	&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
+           "How do I create a CSV file from a spreadsheet");
     $r->print(<<ENDUPFORM);
 <input type=hidden name=phase value=two>
 <hr>
 <h3>Upload a courselist</h3>
 $upfile_select
 <p><input type=submit name="fileupload" value="Upload Courselist">
+<br />
+$create_classlist_help <br />
+$create_csv_help
+
 <hr />
 <h3>Enroll a single student</h3>
 <p><input type=submit name="enroll" value="Enroll Student"></p>
 <hr />
 <h3>Classlist</h3>
-<p><input type=submit name="view" value="View Class List"></p>
+<p><input type=submit name="view" value="View Class List">
+<input type=submit name="viewcsv" value="Comma Separated Class List"></p>
 <hr />
 <h3>Drop students</h3>
 <p><input type=submit name="drop" value="Selection List"></p>
@@ -525,7 +536,7 @@ sub enroll_single_student {
         if (lc($desiredhost) eq 'default') {
             $desiredhost = undef;
         } else {
-            my %home_servers = &Apache::loncommon::get_home_servers($domain);
+            my %home_servers =&Apache::loncommon::get_library_servers($domain);
             if (! exists($home_servers{$desiredhost})) {
                 $r->print('<font color="#ff0000">Error:</font>'.
                           'Invalid home server specified');
@@ -735,20 +746,46 @@ sub menu_phase_two_view {
         $r->print("There are no students currently enrolled.\n");
     } else {
         # Print out the available choices
-        &show_class_list($r,%currentlist);
+        &show_class_list($r,'view',%currentlist);
+    }
+}
+
+# ============================================== view classlist
+sub menu_phase_two_viewcsv {
+    my $r=shift;
+    my $cid=$ENV{'request.course.id'};
+    my ($error,%currentlist)=&get_current_classlist
+        ($ENV{'course.'.$cid.'.domain'},$ENV{'course.'.$cid.'.num'});
+    if (defined($error)) {
+        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 {
+        &show_class_list($r,'csv',%currentlist);
     }
 }
 
 # =================================================== Show student list to drop
 sub show_class_list {
-    my ($r,%currentlist)=@_;
+    my ($r,$mode,%currentlist)=@_;
     my $cid=$ENV{'request.course.id'};
-    $r->print(<<END);
+    # Print out header 
+    if ($mode eq 'view') {
+        $r->print(<<END);
 <p>
 <table border=2>
 <tr><th>username</th><th>domain</th><th>ID</th>
     <th>student name</th><th>generation</th><th>section</th></tr>
 END
+    } elsif ($mode eq 'csv') {
+        $r->print(<<END);
+username,domain,ID,last name,first name,middle name,generation,section
+END
+    }
     foreach (sort keys %currentlist) {
         my ($sname,$sdom)=split(/\:/,$_);
         my %reply=&Apache::lonnet::idrget($sdom,$sname);
@@ -759,11 +796,14 @@ END
                                       $sdom, $sname);
         my ($tmp) = keys(%info);
         if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
-            $r->print('<tr><td colspan="6"><font color="red">'.
-                      'Internal error: unable to get environment '.
-                      'for '.$sname.' in domain '.$sdom.'</font></td></tr>');
+            $r->print( ($mode eq 'view' ? 
+                       '<tr><td colspan="6"><font color="red">' :'').
+                       'Internal error: unable to get environment '.
+                       'for '.$sname.' in domain '.$sdom.
+                       ( $mode eq 'view' ?'</font></td></tr>' :''));
         } else {
-            $r->print(<<"END");
+            if ($mode eq 'view') {
+                $r->print(<<"END");
 <tr>
     <td>$sname</td>
     <td>$sdom</td>
@@ -773,9 +813,21 @@ END
     <td>$ssec</td>
 </tr>
 END
+            } elsif ($mode eq 'csv') {
+                my @line = ();
+                foreach ($sname,$sdom,$reply{$sname},
+                         $info{'lastname'},$info{'firstname'},
+                         $info{'middlename'},$info{'generation'},$ssec) {
+                    push @line,&Apache::loncommon::csv_translate($_);
+                }
+                my $tmp = $";
+                $" = '","';
+                $r->print("\"@line\"\n");
+                $" = $tmp;
+            }
         }
     }
-    $r->print('</table><br>');
+    $r->print('</table><br>') if ($mode eq 'view');
 }
 
 # =================================================== Show student list to drop
@@ -867,7 +919,7 @@ sub upfile_drop_add {
     if (lc($desiredhost) eq 'default') {
         $desiredhost = undef;
     } else {
-        my %home_servers = &Apache::loncommon::get_home_servers($domain);
+        my %home_servers = &Apache::loncommon::get_library_servers($domain);
         if (! exists($home_servers{$desiredhost})) {
             $r->print('<font color="#ff0000">Error:</font>'.
                       'Invalid home server specified');
@@ -1050,9 +1102,9 @@ sub handler {
     if (($ENV{'request.course.fn'}) && 
         (&Apache::lonnet::allowed('cst',$ENV{'request.course.id'}))) {
         # Start page
-        $r->content_type('text/html');
+        $r->content_type('text/html') if (! exists($ENV{'form.viewcsv'}));
         $r->send_http_header;
-        $r->print(&header());
+        $r->print(&header()) if (! exists($ENV{'form.viewcsv'}));
         # Phase one, initial screen
         unless ($ENV{'form.phase'}) {
             &menu_phase_one($r);
@@ -1075,6 +1127,8 @@ sub handler {
                 &menu_phase_two_drop($r);
             } elsif ($ENV{'form.view'}) {
                 &menu_phase_two_view($r);
+            } elsif ($ENV{'form.viewcsv'}) {
+                &menu_phase_two_viewcsv($r);
             }
         }
         # Phase three
@@ -1092,7 +1146,7 @@ sub handler {
             &enroll_single_student($r);
         }
          # End
-        $r->print('</form></body></html>');
+        $r->print('</form></body></html>') if (! exists($ENV{'form.viewcsv'}));
     } else {
         # Not in a course, or not allowed to modify parms
         $ENV{'user.error.msg'}=