--- loncom/enrollment/Autoenroll.pl	2007/05/15 06:19:53	1.27
+++ loncom/enrollment/Autoenroll.pl	2008/01/02 03:39:50	1.29
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 #Automated Enrollment script
-# $Id: Autoenroll.pl,v 1.27 2007/05/15 06:19:53 raeburn Exp $
+# $Id: Autoenroll.pl,v 1.29 2008/01/02 03:39:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,11 +75,12 @@
         my %reply = ();
         my %LC_code = ();
         foreach my $key (sort keys %courses) {
-            my $crs;
-            if ($key =~ m/^($dom)_(\w+)$/) {
-                $crs = $2;
-            }
-
+            my %args = (
+                         one_time => 1,
+                       );
+            my %coursehash = &Apache::lonnet::coursedescription($key,\%args);
+            my $crs = $coursehash{'num'};
+            next if ($coursehash{'domain'} ne $dom);
 # Get course settings
             my %settings = &Apache::lonnet::dump('environment',$dom,$crs);
             %{$enrollvar{$crs}} = ();
@@ -235,7 +236,7 @@
                     if ( ($enrollvar{$crs}{autostart} < $timenow) && ( ($enrollvar{$crs}{autoend} > $timenow) || ($enrollvar{$crs}{autoend} == 0) ) ) {
                         print $fh &mt('No institutional classlist data could be retrieved for [_1]',$crs)."\n";
                     } else {
-                        print $fh ('Not within time window for auto-enrollment in [_1]',$crs)."\n";
+                        print $fh &mt('Not within time window for auto-enrollment in [_1]',$crs)."\n";
                     }
                 } else {
                     print $fh &mt('Auto-enrollment not currently enabled for [_1]',$crs)."\n";