--- loncom/automation/Autocreate.pl 2007/09/03 15:34:16 1.7 +++ loncom/automation/Autocreate.pl 2010/01/31 18:06:10 1.11 @@ -2,6 +2,8 @@ # # Automated Course Creation script # +# $Id: Autocreate.pl,v 1.11 2010/01/31 18:06:10 raeburn Exp $ +# # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -37,6 +39,7 @@ use Apache::lonlocal; use LONCAPA::batchcreatecourse; use LONCAPA::Configuration; + use LONCAPA(); my $perlvarref = &LONCAPA::Configuration::read_conf('loncapa.conf'); my $logfile = $$perlvarref{'lonDaemons'}.'/logs/autocreate.log'; @@ -101,16 +104,18 @@ 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 $output; + my $outcome; if ($result ne '') { - $output = $result."\n"; + $outcome = $result."\n"; } if ($logmsg ne '') { - $output .= $logmsg."\n"; + $outcome .= $logmsg."\n"; } + print $fh $outcome; + my $output; # 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 './') { open(FILE,"<$batchdir/pending/$request"); my @buffer = ; @@ -129,7 +134,7 @@ foreach my $key (sort keys %courseids) { 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 =~ s/:$//;