Diff for /loncom/enrollment/Autoenroll.pl between versions 1.7 and 1.9

version 1.7, 2004/02/08 15:47:45 version 1.9, 2004/06/08 22:09:44
Line 39 Line 39
 #only run if configured to  #only run if configured to
     if (! &localenroll::run()) { exit; }      if (! &localenroll::run()) { exit; }
   
 # Determine the library server's domain  # Determine the library server's domain and hostID
     my $perlvarref = LONCAPA::Configuration::read_conf('loncapa.conf');      my $perlvarref = LONCAPA::Configuration::read_conf('loncapa.conf');
     my $dom = $$perlvarref{'lonDefDomain'};      my $dom = $$perlvarref{'lonDefDomain'};
     my $logfile = $$perlvarref{'lonDaemons'}.'/logs/autoenroll.log';      my $logfile = $$perlvarref{'lonDaemons'}.'/logs/autoenroll.log';
     $ENV{'user.domain'} = $dom;      $ENV{'user.domain'} = $dom;
       my $hostid = $$perlvarref{'lonHostID'};
   
 # Determine the present time;  # Determine the present time;
     my $timenow = time();      my $timenow = time();
   
 # Determine the courses  # Determine the courses
     my %courses = &Apache::lonnet::courseiddump($dom,'.',1);       my %courses = &Apache::lonnet::courseiddump($dom,'.',1,$hostid); 
     my %affiliates = ();      my %affiliates = ();
     my %enrollvar = ();      my %enrollvar = ();
     my %reply = ();      my %reply = ();
Line 112 Line 113
             }              }
         }          }
     }      }
     &localenroll::fetch_enrollment($dom,\%affiliates,\%reply);      my $outcome = &Apache::lonnet::fetch_enrollment_query($hostid,$dom,\%affiliates,\%reply);
   
 # Now go through classes and perform required enrollment changes.  # Now go through classes and perform required enrollment changes.
     open (my $fh,">>$logfile");      open (my $fh,">>$logfile");
Line 163 Line 164
                 }                  }
             }              }
         } else {          } else {
             print $fh "No institutional classlist data could be retrieved for $crs\n";              if ( ($enrollvar{$crs}{autoadds} == 1) || ($enrollvar{$crs}{autodrops} == 1) ) {
                   if ( ($enrollvar{$crs}{autostart} < $timenow) && ( ($enrollvar{$crs}{autoend} > $timenow) || ($enrollvar{$crs}{autoend} == 0) ) ) {
                       print $fh "No institutional classlist data could be retrieved for $crs\n";
                   } else {
                       print $fh "Not within time window for auto-enrollment in $crs\n";
                   }
               } else {
                   print $fh "Auto-enrollment not currently enabled for $crs\n";
               }
         }          }
     }      }
     print $fh "-- ".localtime(time)." Enrollment messages end\n*******************\n\n";      print $fh "-- ".localtime(time)." Enrollment messages end\n*******************\n\n";

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


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