--- loncom/imspackages/imsimportdocs.pm	2006/03/24 17:36:27	1.17
+++ loncom/imspackages/imsimportdocs.pm	2007/08/21 18:22:41	1.21
@@ -1,3 +1,7 @@
+# The LearningOnline Network with CAPA
+#
+# $Id: imsimportdocs.pm,v 1.21 2007/08/21 18:22:41 albertel Exp $
+#
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -30,6 +34,10 @@ use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::imsprocessor;
 use LONCAPA::Configuration;
+use LONCAPA::map();
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 use strict;
 
 sub jscript_one {
@@ -150,7 +158,7 @@ sub handler {
  
     my $uname=$env{'user.name'};
     my $udom=$env{'user.domain'};
-    my $plainname=&Apache::lonnet::escape(
+    my $plainname=&escape(
                      &Apache::loncommon::plainname($uname,$udom));
 
 # does this user have privileges to post, etc?
@@ -631,25 +639,25 @@ sub display_three {
         my @imports = ();
         if ($toplevel eq 'oldfolder') {
             for (my $i=0; $i<@topurls; $i++) {
-                my $url = &Apache::lonnet::unescape($topurls[$i]);
-                my $name = &Apache::lonnet::unescape($topnames[$i]);
-                push @imports, $name, $url;
+                my $url = &unescape($topurls[$i]);
+                my $name = &unescape($topnames[$i]);
+                push(@imports, [$name, $url]);
             }
         } elsif ($toplevel eq 'newfolder') {
-            my $url = &Apache::lonnet::unescape("/uploaded/$cdom/$crs/$timenow/sequences/Top.sequence");
-            my $name = &Apache::lonnet::unescape("$env{'form.foldername'}");
-            push @imports, $name, $url;
+            my $url = &unescape("/uploaded/$cdom/$crs/$timenow/sequences/Top.sequence");
+            my $name = &unescape("$env{'form.foldername'}");
+            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}/) {