Diff for /loncom/automation/Autocreate.pl between versions 1.6 and 1.11

version 1.6, 2007/07/02 03:36:47 version 1.11, 2010/01/31 18:06:10
Line 2 Line 2
 #  #
 # Automated Course Creation script  # Automated Course Creation script
 #  #
   # $Id$
   #
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).  # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
Line 37 Line 39
     use Apache::lonlocal;      use Apache::lonlocal;
     use LONCAPA::batchcreatecourse;      use LONCAPA::batchcreatecourse;
     use LONCAPA::Configuration;      use LONCAPA::Configuration;
       use LONCAPA();
   
     my $perlvarref = &LONCAPA::Configuration::read_conf('loncapa.conf');      my $perlvarref = &LONCAPA::Configuration::read_conf('loncapa.conf');
     my $logfile = $$perlvarref{'lonDaemons'}.'/logs/autocreate.log';      my $logfile = $$perlvarref{'lonDaemons'}.'/logs/autocreate.log';
Line 101 Line 104
   
     print $fh "Sending to batch - auto,$defdom,$dcname,$dcdom ".join(":",@requests)."\n";      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);      my ($result,$logmsg) = &LONCAPA::batchcreatecourse::create_courses(\@requests,\%courseids,'auto',$defdom,$dcname,$dcdom);
     print $fh "$result && $logmsg\n";      my $outcome;
       if ($result ne '') {
           $outcome = $result."\n";
       }
       if ($logmsg ne '') {
           $outcome .= $logmsg."\n";    
       }
       print $fh $outcome;
   
       my $output;
 # 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) {  
         if ((-e "$batchdir/pending/$request") && $request !~ /\.\./ && $request ne '' &&$request ne './') {          if ((-e "$batchdir/pending/$request") && $request !~ /\.\./ && $request ne '' &&$request ne './') {
             open(FILE,"<$batchdir/pending/$request");              open(FILE,"<$batchdir/pending/$request");
             my @buffer = <FILE>;              my @buffer = <FILE>;
Line 121 Line 132
         }          }
     }      }
   
     my $output;  
     foreach my $key (sort keys %courseids) {      foreach my $key (sort keys %courseids) {
         print $fh "created course: $key - $courseids{$key}\n";          print $fh "created course: $key - $courseids{$key}\n";
         my $newcourse = &Apache::lonnet::escape($key.':'.$courseids{$key});          my $newcourse = &LONCAPA::escape($key.':'.$courseids{$key});
         $output .= $newcourse.':';           $output .= $newcourse.':'; 
     }      }
     $output =~ s/:$//;      $output =~ s/:$//;

Removed from v.1.6  
changed lines
  Added in v.1.11


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