Diff for /loncom/enrollment/Enrollment.pm between versions 1.5 and 1.7

version 1.5, 2003/12/08 15:51:40 version 1.7, 2003/12/09 20:06:37
Line 1 Line 1
   # Automated Enrollment manager
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 package LONCAPA::Enrollment;  package LONCAPA::Enrollment;
   
 use Apache::loncoursedata;  use Apache::loncoursedata;
 use Apache::lonnet;  use Apache::lonnet;
 use HTML::Entities;  use HTML::Entities;
 use XML::Simple;  
 use LONCAPA::Configuration;  use LONCAPA::Configuration;
   
 use strict;  use strict;
Line 114  sub update_LC { Line 138  sub update_LC {
                     $$logmsg .= " $_,";                      $$logmsg .= " $_,";
                 }                  }
                 chop($$logmsg);                  chop($$logmsg);
                 $$logmsg .= " Because of this ambiguity, no enrollment action was taken for this student.".$linefeed;                  $$logmsg .= ". Because of this ambiguity, no enrollment action was taken for this student.".$linefeed;
             }              }
         } else {          } else {
             @{$enrollinfo{$uname}} = @{$allenrolled{$uname}[0]};              @{$enrollinfo{$uname}} = @{$allenrolled{$uname}[0]};
Line 148  sub update_LC { Line 172  sub update_LC {
 # Check for studentID changes  # Check for studentID changes
                 if ( ($uidhash{$uname}) && ($uidhash{$uname} !~ /error\:/) )  {                  if ( ($uidhash{$uname}) && ($uidhash{$uname} !~ /error\:/) )  {
                     unless ( ($uidhash{$uname}) eq ($stuinfo[ $place{studentID} ]) ) {                      unless ( ($uidhash{$uname}) eq ($stuinfo[ $place{studentID} ]) ) {
                         $$logmsg .= "Change in ID for $uname in class: $crs. StudentID in LON-CAPA system is $uidhash{$uname}, StudentID in institutional data is $stuinfo[ $place{studentID} ]".$linefeed;                           $$logmsg .= "Change in ID for $uname. StudentID in LON-CAPA system is $uidhash{$uname}; StudentID in institutional data is $stuinfo[ $place{studentID} ]".$linefeed; 
                     }                      }
                 }                  }
   
Line 157  sub update_LC { Line 181  sub update_LC {
                     if ( ($$currlist{$uname}[$type] eq "auto") && ($adds == 1) ) {                      if ( ($$currlist{$uname}[$type] eq "auto") && ($adds == 1) ) {
                         my $modify_section_result = &Apache::lonnet::modify_student_enrollment($dom,$uname,undef,undef,undef,undef,undef,$stuinfo[ $place{groupID} ],$$currlist{$uname}[$cend],$$currlist{$uname}[$cstart],'auto',$cid);                          my $modify_section_result = &Apache::lonnet::modify_student_enrollment($dom,$uname,undef,undef,undef,undef,undef,$stuinfo[ $place{groupID} ],$$currlist{$uname}[$cend],$$currlist{$uname}[$cstart],'auto',$cid);
                         if ($modify_section_result =~ /^ok/) {                          if ($modify_section_result =~ /^ok/) {
                             $$logmsg .= "Section for $uname switched from old section: ".$$currlist{$uname}[$sec] ."to new section: ".$stuinfo[ $place{groupID} ]." in class $crs".$linefeed;                              $$logmsg .= "Section for $uname switched from old section: ".$$currlist{$uname}[$sec] ." to new section: ".$stuinfo[ $place{groupID} ].".".$linefeed;
                         } else {                          } else {
                             $$logmsg .= "Error when attempting section change for $uname from old section ".$$currlist{$uname}[$sec]." to new section: ".$stuinfo[ $place{groupID} ]." -error: $modify_section_result".$linefeed;                              $$logmsg .= "Error when attempting section change for $uname from old section ".$$currlist{$uname}[$sec]." to new section: ".$stuinfo[ $place{groupID} ]." -error: $modify_section_result".$linefeed;
                         }                          }
Line 169  sub update_LC { Line 193  sub update_LC {
                     if (grep/^$$currlist{$uname}[ $place{'studentID'} ]$/,@allINids) {                      if (grep/^$$currlist{$uname}[ $place{'studentID'} ]$/,@allINids) {
                         foreach my $match ( @{ $unameFromLCid{ $stuinfo[ $place{studentID} ] } }  ) {                          foreach my $match ( @{ $unameFromLCid{ $stuinfo[ $place{studentID} ] } }  ) {
                             if (grep/^$match$/,@okusers) {                              if (grep/^$match$/,@okusers) {
                                 $$logmsg .= "A possible change in username has been detected for a student enrolled in $crs. The existing LON-CAPA classlist contains user: $uname and student ID: ".$$currlist{$uname}[ $place{studentID} ].".  This username has been dropped from the institutional classlist, but the same student ID is used for user: $match who still appears in the institutional classlist. You may need to move the student data files for user: $uname to $match".$linefeed;                                  $$logmsg .= "A possible change in username has been detected for a student enrolled in this course. The existing LON-CAPA classlist contains user: $uname and student ID: ".$$currlist{$uname}[ $place{studentID} ].".  This username has been dropped from the institutional classlist, but the same student ID is used for user: $match who still appears in the institutional classlist. You may need to contact your Domain Coordinator to request a move of the student data files for user: $uname to $match".$linefeed;
                             }                              }
                         }                          }
                     }                      }
Line 231  sub update_LC { Line 255  sub update_LC {
                             }                              }
                         } elsif ($authtype =~ m/^krb/) {                          } elsif ($authtype =~ m/^krb/) {
                             if ($authparam eq '') {                              if ($authparam eq '') {
                                 $$logmsg .= "No Kerberos domain available for the new user - $uname in course $crs - no enrollment occurred.".$linefeed;                                  $$logmsg .= "No Kerberos domain was provided for the new user - $uname, so the new student was not enrolled in the course.".$linefeed;
                                 $authchk = 'invalid';                                  $authchk = 'invalid';
                             }                              }
                         } else {                          } else {
                             $authchk = 'invalid';                              $authchk = 'invalid';
                             $$logmsg .= "Invalid authentication type for new user - $uname in course $crs - no enrollment occurred.".$linefeed;                              $$logmsg .= "An invalid authentication type was provided for the new user - $uname, so the student was not enrolled in the course.".$linefeed;
                         }                          }
                         if ($authchk eq 'ok') {                           if ($authchk eq 'ok') { 
 # Now create user.  # Now create user.
Line 244  sub update_LC { Line 268  sub update_LC {
                             if ($reply eq 'ok') {                              if ($reply eq 'ok') {
                                 $enrollcount ++;                                  $enrollcount ++;
                                 $addresult .= "$first $last ($pid) - $uname enrolled in section/group $usec.".$linefeed;                                  $addresult .= "$first $last ($pid) - $uname enrolled in section/group $usec.".$linefeed;
                                 $$logmsg .= "New user $uname added successfully. ";                                  if ($context eq 'automated') {
                                       $$logmsg .= "New $dom user $uname added successfully.".$linefeed;
                                   }
                                 unless ($emailenc eq '') {                                  unless ($emailenc eq '') {
                                     my %emailHash;                                      my %emailHash;
                                     $emailHash{'critnotification'}  = $emailenc;                                      $emailHash{'critnotification'}  = $emailenc;
Line 295  sub update_LC { Line 321  sub update_LC {
                         }                          }
 # Report if authentication methods are different.  # Report if authentication methods are different.
                         if ($currentauth ne $auth ) {                          if ($currentauth ne $auth ) {
                             $$logmsg .= "Authentication mismatch for $uname - $currentauth in system, $auth for class $crs".$linefeed;                              $$logmsg .= "Authentication mismatch for $uname - $currentauth in system, $auth based on information in classlist or default for this course.".$linefeed;
                         }                          }
 # Check user data  # Check user data
                         if ($first  ne $userenv{'firstname'}  ||                          if ($first  ne $userenv{'firstname'}  ||
Line 323  sub update_LC { Line 349  sub update_LC {
                         if ($classlist_reply eq 'ok') {                          if ($classlist_reply eq 'ok') {
                             $enrollcount ++;                              $enrollcount ++;
                             $addresult .= "$first $last ($pid) - $uname enrolled in section/group $usec.".$linefeed;                              $addresult .= "$first $last ($pid) - $uname enrolled in section/group $usec.".$linefeed;
                             $$logmsg .= "Existing user $uname enrolled successfully.".$linefeed;                              if ($context eq 'automated') {
                                   $$logmsg .= "Existing $dom user $uname enrolled successfully.".$linefeed;
                               }
                         } else {                          } else {
                             $$logmsg .= "There was a problem updating the classlist db file for user $uname to show the new enrollment -error: $classlist_reply, so no enrollment occurred for this user.".$linefeed;                              $$logmsg .= "There was a problem updating the classlist db file for user $uname to show the new enrollment -error: $classlist_reply, so no enrollment occurred for this user.".$linefeed;
                         }                          }
Line 342  sub update_LC { Line 369  sub update_LC {
 # Check for changed usernames by checking studentIDs  # Check for changed usernames by checking studentIDs
                     if (grep/^$$currlist{$uname}[ $stuid ]$/,@allINids) {                      if (grep/^$$currlist{$uname}[ $stuid ]$/,@allINids) {
                         foreach my $match (@{$unameFromINid{$$currlist{$uname}[ $stuid ]}} ) {                          foreach my $match (@{$unameFromINid{$$currlist{$uname}[ $stuid ]}} ) {
                             $$logmsg .= "A possible change in username has been detected for a student enrolled in $crs. The existing LON-CAPA classlist contains user: $uname and student ID: $$currlist{$uname}[ $place{studentID} ].  This username has been dropped from the institutional classlist, but the same student ID is used for user: $match who still appears in the institutional classlist. You may need to move the student data files for user: $uname to $match.".$linefeed;                              $$logmsg .= "A possible change in username has been detected for a student enrolled in this course. The existing LON-CAPA classlist contains user: $uname and student ID: $$currlist{$uname}[ $place{studentID} ].  This username has been dropped from the institutional classlist, but the same student ID is used for user: $match who still appears in the institutional classlist. You may need to move the student data files for user: $uname to $match.".$linefeed;
                             push @saved,$uname;                              push @saved,$uname;
                         }                          }
                     } elsif (@saved == 0) {                      } elsif (@saved == 0) {
Line 366  sub update_LC { Line 393  sub update_LC {
     }      }
     if ($enrollcount > 0) {      if ($enrollcount > 0) {
         if ($context eq "updatenow") {          if ($context eq "updatenow") {
               $addresult = substr($addresult,0,rindex($addresult,"<li>"));
             $addresult = "The following $enrollcount student(s) was/were added to this LON-CAPA course:<br/><ul><li>".$addresult."</li></ul><br/><br/>";              $addresult = "The following $enrollcount student(s) was/were added to this LON-CAPA course:<br/><ul><li>".$addresult."</li></ul><br/><br/>";
         } else {          } else {
             $addresult = "The following $enrollcount student(s) was/were added to this LON-CAPA course:\n\n".$addresult."\n\n";                  $addresult = "The following $enrollcount student(s) was/were added to this LON-CAPA course:\n\n".$addresult."\n\n";    
Line 373  sub update_LC { Line 401  sub update_LC {
     }      }
     if ($dropcount > 0) {      if ($dropcount > 0) {
         if ($context eq "updatenow") {          if ($context eq "updatenow") {
               $dropresult = substr($dropresult,0,rindex($dropresult,"<li>"));
             $dropresult = "The following $dropcount student(s) was/were expired from this LON-CAPA course:<br/><ul><li>".$dropresult."</li></ul><br/><br/>";              $dropresult = "The following $dropcount student(s) was/were expired from this LON-CAPA course:<br/><ul><li>".$dropresult."</li></ul><br/><br/>";
         } else {          } else {
             $dropresult = "The following $dropcount student(s) was/were expired from this LON-CAPA course:\n\n".$dropresult."\n\n";              $dropresult = "The following $dropcount student(s) was/were expired from this LON-CAPA course:\n\n".$dropresult."\n\n";
Line 396  sub update_LC { Line 425  sub update_LC {
     }      }
     my $changecount = $enrollcount + $dropcount;      my $changecount = $enrollcount + $dropcount;
     return ($changecount,$addresult.$dropresult);       return ($changecount,$addresult.$dropresult); 
 }   }
   
 sub parse_classlist {  sub parse_classlist {
     my ($tmpdir,$dom,$crs,$class,$placeref,$groupID,$studentsref) = @_;                  my ($tmpdir,$dom,$crs,$class,$placeref,$groupID,$studentsref) = @_;
     my $configvars = &LONCAPA::Configuration::read_conf();  
     my $xmlfile = $tmpdir."/tmp/".$dom."_".$crs."_".$class."_classlist.xml";      my $xmlfile = $tmpdir."/tmp/".$dom."_".$crs."_".$class."_classlist.xml";
     my $enrolled = XMLin( $xmlfile, KeyAttr => ['username'] );      my $uname = '';
     foreach my $uname ( sort keys %{$$enrolled{'student'}} ) {      my @state;
         @{ $$studentsref{$uname} } = ();      my @items = ('autharg','authtype','email','enddate','firstname','generation','lastname','middlename','startdate','studentID');
         foreach my $key (sort keys %{$$enrolled{'student'}{$uname}} ) {      my $p = HTML::Parser->new
             my $value = $$enrolled{'student'}{$uname}{$key};      (
             if (ref($value)) {          xml_mode => 1,
                 $$studentsref{$uname}[ $$placeref{$key} ] = '';          start_h =>
             } else {              [sub {
                 if ($key eq 'groupID') {                   my ($tagname, $attr) = @_;
                     $$studentsref{$uname}[ $$placeref{$key} ] = $groupID;                   push @state, $tagname;
                 } else {                   if ("@state" eq "students student") {
                     $$studentsref{$uname}[ $$placeref{$key} ] = $value;                       $uname = $attr->{username};
                 }                   }
             }              }, "tagname, attr"],
         }           text_h =>
     }               [sub {
                    my ($text) = @_;
                    if ("@state" eq "students student groupID") {
                        $$studentsref{$uname}[ $$placeref{'groupID'} ] = $groupID;
                    } else {
                        foreach my $item (@items) {
                            if ("@state" eq "students student $item") {
                                $$studentsref{$uname}[ $$placeref{$item} ] = $text;
                            }
                        }
                    }
                  }, "dtext"],
            end_h =>
                  [sub {
                      my ($tagname) = @_;
                      pop @state;
                   }, "tagname"],
       );
                                                                                                                
       $p->parse_file($xmlfile);
       $p->eof;
 #    if (-e "$xmlfile") {  #    if (-e "$xmlfile") {
 #        unlink $xmlfile;  #        unlink $xmlfile;
 #    }  #    }

Removed from v.1.5  
changed lines
  Added in v.1.7


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>