Diff for /loncom/automation/Autocreate.pl between versions 1.2 and 1.3

version 1.2, 2005/04/07 06:56:21 version 1.3, 2005/06/01 18:26:20
Line 66 Line 66
     my @requests = grep(!/^\.\.?$/,readdir(DIR));      my @requests = grep(!/^\.\.?$/,readdir(DIR));
     closedir(DIR);      closedir(DIR);
     my %courseids = ();      my %courseids = ();
     my $cccflag = 0;      my @permissions = ('ccc','cin','cta','cep','ccr','cst');
     unless ($env{'allowed.ccc'}) {      my %permissionflags = ();
         $env{'allowed.ccc'} = 'F';      &set_permissions(\%permissionflags,\@permissions);
         $cccflag = 1;      $ENV{'user.name'} = $dcname;
     }      $ENV{'user.domain'} = $dcdom;
     my $wwwid=getpwnam('www');      my $wwwid=getpwnam('www');
     if ($wwwid!=$<) {      if ($wwwid!=$<) {
         my $emailto=$$perlvarref{'lonAdmEMail'};          my $emailto=$$perlvarref{'lonAdmEMail'};
Line 94 Line 94
         exit;          exit;
     }      }
   
     my ($output,$logmsg) = &LONCAPA::batchcreatecourse::create_courses(\@requests,\%courseids,'auto',$defdom,$dcname,$dcdom);      print $fh "Sending to batch - auto,$defdom,$dcname,$dcdom ".join(":",@requests)."\n";
       my ($result,$logmsg) = &LONCAPA::batchcreatecourse::create_courses(\@requests,\%courseids,'auto',$defdom,$dcname,$dcdom);
       print $fh "$result && $logmsg\n";
   
 # Copy requests from pending directory to processed directory and unlink.  # Copy requests from pending directory to processed directory and unlink.
   foreach my $request (@requests) {      foreach my $request (@requests) {  
Line 102 Line 104
             open(FILE,"<$batchdir/pending/$request");              open(FILE,"<$batchdir/pending/$request");
             my @buffer = <FILE>;              my @buffer = <FILE>;
             close(FILE);              close(FILE);
               if (!-e "$batchdir/processed") {
                   mkdir("$batchdir/processed", 0755);
               }
             open(FILE,">$batchdir/processed/$request");              open(FILE,">$batchdir/processed/$request");
             print FILE @buffer;              print FILE @buffer;
             close(FILE);              close(FILE);
Line 111 Line 116
         }          }
     }      }
   
       my $output;
     foreach my $key (sort keys %courseids) {      foreach my $key (sort keys %courseids) {
         print $fh "created course: $key\n";          print $fh "created course: $key - $courseids{$key}\n";
           my $newcourse = &Apache::lonnet::escape($key.':'.$courseids{$key});
           $output .= $newcourse.':'; 
     }      }
       $output =~ s/:$//;
       print $output;
   
     if ($cccflag) {      &unset_permissions(\%permissionflags);
         delete($env{'allowed.ccc'});      delete($ENV{'user.name'});
     }      delete($ENV{'user.domain'});
     print $fh "-- ".localtime(time)." Autocreation messages end\n*******************\n\n";      print $fh "-- ".localtime(time)." Autocreation messages end\n*******************\n\n";
     close($fh);      close($fh);
   
Line 139  sub check_activedc { Line 149  sub check_activedc {
     }      }
     return $activedc;      return $activedc;
 }  }
   
   sub set_permissions {
       my ($permissionflags,$permissions) = @_;
       foreach my $allowtype (@{$permissions}) {
           unless($ENV{"allowed.$allowtype"}) {
               $ENV{"allowed.$allowtype"} = 'F';
               $permissionflags{$allowtype} = 1;
           }
       }
   }
   
   sub unset_permissions {
       my ($permissionflags) = @_;
       foreach my $allowtype (keys %{$permissionflags}) {
           delete($ENV{"allowed.$allowtype"});
       }
   }

Removed from v.1.2  
changed lines
  Added in v.1.3


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