--- loncom/automation/Autocreate.pl 2005/06/29 22:03:10 1.4 +++ loncom/automation/Autocreate.pl 2008/02/07 04:39:42 1.8 @@ -34,6 +34,7 @@ use strict; use lib '/home/httpd/lib/perl'; use Apache::lonnet; + use Apache::lonlocal; use LONCAPA::batchcreatecourse; use LONCAPA::Configuration; @@ -60,17 +61,21 @@ close($fh); exit; } - + + # Initialize language handler + &Apache::lonlocal::get_language_handle(); + my $batchdir = $$perlvarref{'lonDaemons'}.'/tmp/addcourse/'.$defdom.'/auto'; opendir(DIR,"$batchdir/pending"); my @requests = grep(!/^\.\.?$/,readdir(DIR)); closedir(DIR); my %courseids = (); - my @permissions = ('ccc','cin','cta','cep','ccr','cst'); + my @permissions = ('mau','ccc','cin','cta','cep','ccr','cst'); my %permissionflags = (); &set_permissions(\%permissionflags,\@permissions); $env{'user.name'} = $dcname; $env{'user.domain'} = $dcdom; + $env{'request.role.domain'} = $defdom; my $wwwid=getpwnam('www'); if ($wwwid!=$<) { my $emailto=$$perlvarref{'lonAdmEMail'}; @@ -96,10 +101,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); - 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. - 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 = ; @@ -116,7 +129,6 @@ } } - my $output; foreach my $key (sort keys %courseids) { print $fh "created course: $key - $courseids{$key}\n"; my $newcourse = &Apache::lonnet::escape($key.':'.$courseids{$key}); @@ -128,6 +140,7 @@ &unset_permissions(\%permissionflags); delete($env{'user.name'}); delete($env{'user.domain'}); + delete($env{'request.role.domain'}); print $fh "-- ".localtime(time)." Autocreation messages end\n*******************\n\n"; close($fh);