--- loncom/imspackages/imsimportdocs.pm 2006/05/30 12:45:50 1.18 +++ loncom/imspackages/imsimportdocs.pm 2007/08/21 18:22:41 1.21 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: imsimportdocs.pm,v 1.18 2006/05/30 12:45:50 www Exp $ +# $Id: imsimportdocs.pm,v 1.21 2007/08/21 18:22:41 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,6 +34,7 @@ use Apache::loncommon; use Apache::lonlocal; use Apache::imsprocessor; use LONCAPA::Configuration; +use LONCAPA::map(); use lib '/home/httpd/lib/perl/'; use LONCAPA; @@ -640,23 +641,23 @@ sub display_three { for (my $i=0; $i<@topurls; $i++) { my $url = &unescape($topurls[$i]); my $name = &unescape($topnames[$i]); - push @imports, $name, $url; + push(@imports, [$name, $url]); } } elsif ($toplevel eq 'newfolder') { my $url = &unescape("/uploaded/$cdom/$crs/$timenow/sequences/Top.sequence"); my $name = &unescape("$env{'form.foldername'}"); - push @imports, $name, $url; + push(@imports, [$name, $url]); } my $errtext=''; my $fatal=0; ($errtext,$fatal)= &Apache::londocs::mapread($crs,$cdom,$folder.'.sequence'); - if ($#Apache::lonratedt::order<1) { - $Apache::lonratedt::order[0]=1; - $Apache::lonratedt::resources[1]=''; + if ($#LONCAPA::map::order<1) { + $LONCAPA::map::order[0]=1; + $LONCAPA::map::resources[1]=''; } my ($errtext,$fatal)=&Apache::londocs::group_import($crs,$cdom,$folder,'sequence','imsimport',@imports); if ($fatal) { - print STDERR "Fatal error during group_import\n"; + &Apache::lonnet::logthis("Fatal error during group_import."); } } if ($tempdir =~ m/^\/home\/httpd\/perl\/tmp\/$crs\/\d{10}/) {