--- loncom/imspackages/imsimportdocs.pm	2004/08/05 23:21:49	1.7
+++ loncom/imspackages/imsimportdocs.pm	2006/03/23 23:12:21	1.15
@@ -143,59 +143,54 @@ sub handler {
     &Apache::imsprocessor::ims_config(\@areas,\%cmsmap,\%areaname);
 
 # get course data
-    my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
-    my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
-    my $coursehome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+    my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
 
 # get personal data
  
-    my $uname=$ENV{'user.name'};
-    my $udom=$ENV{'user.domain'};
+    my $uname=$env{'user.name'};
+    my $udom=$env{'user.domain'};
     my $plainname=&Apache::lonnet::escape(
                      &Apache::loncommon::plainname($uname,$udom));
 
 # does this user have privileges to post, etc?
-    my $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'});
+    my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
     unless ($allowed) {
-        $r->print("<html><head><title>The LearningOnline Network with CAPA</title></head>");
-        $r->print(&Apache::loncommon::bodytag('Import IMS package'));  
-        $r->print('<h3>'.&mt('Modification of Course Contents Disallowed').'</h3>'.&mt('Your current role does not grant you the right to modify course content in this course.').'</body></html>');
+        $r->print(&Apache::loncommon::start_page('Import IMS package',undef,
+						 {'only_body' => 1,}));  
+        $r->print('<h3>'.&mt('Modification of Course Contents Disallowed').'</h3>'.&mt('Your current role does not grant you the right to modify course content in this course.').
+		  &Apache::loncommon::end_page());
         return OK;
     }
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
        ['phase']);
 
-    if ($ENV{'form.phase'} eq 'one') {    
+    if ($env{'form.phase'} eq 'one') {    
         &jscript_one(\$javascript);
-    } elsif ($ENV{'form.phase'} eq 'two') {
+    } elsif ($env{'form.phase'} eq 'two') {
         &jscript_two(\$javascript);
-    } elsif ($ENV{'form.phase'} eq 'three') {
+    } elsif ($env{'form.phase'} eq 'three') {
         &jscript_three(\$javascript);
     }
 
+    $javascript = 
+	 "<script type=\"text/javascript\">\n".
+	 "//<!--\n$javascript\n// --></script>\n";
+    my $start_page = &Apache::loncommon::start_page('Import IMS package',
+						    $javascript,
+						    {'only_body' => 1,});
 # print screen
-    $r->print(<<ENDHEAD);
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-<script type="text/javascript">
-<!--
-$javascript
--->
-</script>
-</head>
-ENDHEAD
-# -------------------------------------------------------------------- Body tag
-    $r->print(&Apache::loncommon::bodytag('Import IMS package'));
-    if ($ENV{'form.phase'} eq 'one') {
+    $r->print($start_page);
+
+    if ($env{'form.phase'} eq 'one') {
         &display_one($r);       
-    } elsif ($ENV{'form.phase'} eq 'two') {
+    } elsif ($env{'form.phase'} eq 'two') {
         &display_two($r,$coursenum,\@areas,\%areaname,%cmsmap);
-    } elsif ($ENV{'form.phase'} eq 'three') {
-        &display_three($r,$coursenum,$coursedom,$coursehome,$uname,$udom,\@areas,%cmsmap);
+    } elsif ($env{'form.phase'} eq 'three') {
+        &display_three($r,$coursenum,$coursedom,$uname,$udom,\@areas,%cmsmap);
     }   
-    $r->print("</body><html>");
+    $r->print(&Apache::loncommon::end_page());
     return OK;
 } 
 
@@ -235,6 +230,7 @@ Please choose the CMS used to create you
          <option value='bb5'>Blackboard 5
          <option value='bb6'>Blackboard 6
          <option value='angel'>ANGEL
+         <option value='webct4'>WebCT 4
         </select>
         </font>
        </td>
@@ -258,7 +254,7 @@ Please choose the CMS used to create you
       </tr>
       <tr>
        <td colspan='2'>&nbsp;
-        <input type="hidden" name="folder" value="$ENV{'form.folder'}" />
+        <input type="hidden" name="folder" value="$env{'form.folder'}" />
         <input type="hidden" name="phase" value="two" />
         <input type="file" name="uploadname" size="40" />
        </td>
@@ -299,7 +295,7 @@ ENDBLOCK
 sub display_two {
     my ($r,$crs,$areasref,$areaname,%cmsmap) = @_;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder','source']);
-    my $cms = $ENV{'form.source'};
+    my $cms = $env{'form.source'};
     my $timenow = time;
     my $tempdir = &Apache::imsprocessor::create_tempdir('DOCS',$crs,$timenow);
     my $fname = &Apache::imsprocessor::uploadzip('DOCS',$tempdir);
@@ -309,6 +305,8 @@ sub display_two {
         $unzip_result = &Apache::imsprocessor::expand_zip($tempdir,$fname);
     }
     my %resources = ();
+    my %includedres = ();
+    my %includeditems = ();
     my %items = ();
     my %hrefs = ();
     my %resinfo = ();
@@ -331,10 +329,10 @@ sub display_two {
                 );
 
     if ($unzip_result eq 'ok') {
-        $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo);
+        $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo,'choose',\%includedres,\%includeditems);
         if ($manifest_result eq 'ok') {
             foreach my $res (sort keys %resources) {
-                if ($cms eq 'bb5' || $cms eq 'bb6') {
+                if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webct4') {
                     foreach my $area (keys %{$cmsmap{$cms}}) {
                         if ($resources{$res}{type} eq $cmsmap{$cms}{$area}) {
                             $count{$area} ++;
@@ -464,7 +462,7 @@ ENDBLOCK
       </tr>
       <tr>
        <td colspan='2'>&nbsp;
-          <input type="hidden" name="folder" value="$ENV{'form.folder'}" />
+          <input type="hidden" name="folder" value="$env{'form.folder'}" />
           <input type="hidden" name="source" value="$cms" />
           <input type="hidden" name="tempdir" value="$tempdir" />
           <input type="hidden" name="phase" value="three" />
@@ -499,15 +497,17 @@ ENDDOCUMENT
 
 
 sub display_three {
-    my ($r,$crs,$cdom,$chome,$uname,$udom,$areas,%cmsmap) = @_;
-    my $folder = $ENV{'form.folder'};
-    my $cms = $ENV{'form.source'};
-    my $tempdir = $ENV{'form.tempdir'};
+    my ($r,$crs,$cdom,$uname,$udom,$areas,%cmsmap) = @_;
+    my $folder = $env{'form.folder'};
+    my $cms = $env{'form.source'};
+    my $tempdir = $env{'form.tempdir'};
     my $longcrs = '';
     if ($crs =~ m/^(\d)(\d)(\d)/) {
         $longcrs = $1.'/'.$2.'/'.$3.'/'.$crs;
     }
-    my %imports = ();
+    my %importareas = ();
+    my %includedres = ();
+    my %includeditems = ();
     my @targets = ();
     my %resources = ();
     my %items = ();
@@ -536,32 +536,48 @@ sub display_three {
     my $toplevel = '';
     my $foldername = '';
     my %topitems = ();
-    if (defined($ENV{'form.toplevel'}) ) {
-        $toplevel = $ENV{'form.toplevel'};     
+    if (defined($env{'form.toplevel'}) ) {
+        $toplevel = $env{'form.toplevel'};     
     }
-    if (defined($ENV{'form.foldername'}) ) {
-        $foldername = $ENV{'form.foldername'}; 
+    if (defined($env{'form.foldername'}) ) {
+        $foldername = $env{'form.foldername'}; 
     }
- 
+
     foreach my $area (@{$areas}) {
-        if (defined($ENV{"form.$area"}) ) {          
+        if (defined($env{"form.$area"}) && ($env{'form.'.$area} ne '')) {
             if ($cms eq 'angel' && $area eq 'doc') {
                 foreach (@{$cmsmap{$cms}{$area}}) {
-                    $imports{$_} = 1;
+                    $importareas{$_} = 1;
                 }
             } else {
-                $imports{$cmsmap{$cms}{$area}} = 1;
+                $importareas{$cmsmap{$cms}{$area}} = 1;
             }
             if ($area eq 'board') {
-                $db_handling = $ENV{'form.db_handling'};
+                $db_handling = $env{'form.db_handling'};
             } elsif ($area eq 'users') {
-                $user_handling = $ENV{'form.user_handling'};
+                $user_handling = $env{'form.user_handling'};
+            }
+        }
+    }
+
+    my $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo,'prepare',\%includedres,\%includeditems);
+    if ($manifest_result eq 'ok') {
+        foreach my $res (sort keys %resources) {
+            if ($importareas{$resources{$res}{type}}) {
+                $includedres{$res} = 1;
             }
         }
+        foreach my $itm (sort keys %items) {
+            &Apache::imsprocessor::get_imports(\%includeditems,\%items,\%resources,\%importareas,$itm);
+        }
     }
-   
-    my $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo);
+    foreach my $itm (sort keys %includeditems) {
+        &Apache::imsprocessor::get_parents(\%includeditems,\%items,$itm);
+    }
+
+    $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo,'build',\%includedres,\%includeditems);
     if ($manifest_result eq 'ok') {
+
         my @path = ($cdom,$crs,$timenow);
         my $fullpath = $Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles';
         foreach my $item (@path) {
@@ -576,12 +592,13 @@ sub display_three {
                 mkdir("$fullpath/$name",0770);
             }
         }
-        &Apache::imsprocessor::target_resources(\%resources,\%imports,\@targets);
+        &Apache::imsprocessor::target_resources(\%resources,\%importareas,\@targets);
 
         my @boards = ();
         my @announcements = ();
         my @quizzes = ();
         my @surveys = ();
+        my @pools = ();
         my @groups = ();
         my %messages = ();
         my @timestamp = ();
@@ -590,25 +607,25 @@ sub display_three {
         my @topnames = ();
         my @packages = ();
 
-        &Apache::imsprocessor::process_resinfo($cms,'DOCS',$tempdir,$destdir,\%items,\%resources,\@boards,\@announcements,\@quizzes,\@surveys,\@groups,\%messages,\@timestamp,\%boardnum,\%resinfo,$udom,$uname,$cdom,$crs,$db_handling,$user_handling,\%total,$seqstem,$seqstem,\@resrcfiles,\@packages,\%hrefs);
+        &Apache::imsprocessor::process_resinfo($cms,'DOCS',$tempdir,$destdir,\%items,\%resources,\@targets,\@boards,\@announcements,\@quizzes,\@surveys,\@pools,\@groups,\%messages,\@timestamp,\%boardnum,\%resinfo,$udom,$uname,$cdom,$crs,$db_handling,$user_handling,\%total,$seqstem,$seqstem,\@resrcfiles,\@packages,\%hrefs,\@pages,\@sequences);
 
-        my $copy_result = &Apache::imsprocessor::copy_resources('DOCS',$cms,\%hrefs,$tempdir,\@targets,\%urls,$crs,$cdom,$chome,$destdir,$timenow);
+        my $copy_result = &Apache::imsprocessor::copy_resources('DOCS',$cms,\%hrefs,$tempdir,\@targets,\%urls,$crs,$cdom,$destdir,$timenow,\%importareas);
+
+        &Apache::imsprocessor::build_structure($cms,'DOCS',$destdir,\%items,\%resinfo,\%resources,\@targets,\%hrefs,$udom,$uname,'',$timenow,$cdom,$crs,\@timestamp,\%total,\@boards,\@announcements,\@quizzes,\@surveys,\@pools,\%boardnum,\@pages,\@sequences,\@topurls,\@topnames,\@packages,\%includeditems);
 
-        &Apache::imsprocessor::build_structure($cms,'DOCS',$destdir,\%items,\%resinfo,\%resources,\%hrefs,$udom,$uname,'',$timenow,$cdom,$crs,\@timestamp,\%total,\@boards,\@announcements,\@quizzes,\@surveys,\%boardnum,\@pages,\@sequences,\@topurls,\@topnames,\@packages);
- 
         foreach my $item (@pages) {
             my $filename = $timenow.'/pages/'.$item;
-            my $fetchresult= &Apache::lonnet::process_coursefile('propagate',$crs,$cdom,$chome,$filename,'');
+            my $fetchresult= &Apache::lonnet::process_coursefile('propagate',$crs,$cdom,$filename,'');
         }
         foreach my $item (@sequences) {
             unless ($item eq 'Top.sequence' && $toplevel eq 'oldfolder') {
                 my $filename = $timenow.'/sequences/'.$item;
-                my $fetchresult= &Apache::lonnet::process_coursefile('propagate',$crs,$cdom,$chome,$filename,'');
+                my $fetchresult= &Apache::lonnet::process_coursefile('propagate',$crs,$cdom,$filename,'');
             }
         }
         foreach my $item (@resrcfiles) {
             my $filename = $timenow.'/resfiles/'.$item;
-            my $fetchresult= &Apache::lonnet::process_coursefile('propagate',$crs,$cdom,$chome,$filename,'');
+            my $fetchresult= &Apache::lonnet::process_coursefile('propagate',$crs,$cdom,$filename,'');
         }
 
         my @imports = ();
@@ -620,7 +637,7 @@ sub display_three {
             }
         } elsif ($toplevel eq 'newfolder') {
             my $url = &Apache::lonnet::unescape("/uploaded/$cdom/$crs/$timenow/sequences/Top.sequence");
-            my $name = &Apache::lonnet::unescape("$ENV{'form.foldername'}");
+            my $name = &Apache::lonnet::unescape("$env{'form.foldername'}");
             push @imports, $name, $url;
         }
         my $errtext='';
@@ -630,7 +647,7 @@ sub display_three {
             $Apache::lonratedt::order[0]=1;
             $Apache::lonratedt::resources[1]='';
         }
-        my ($errtext,$fatal)=&Apache::londocs::group_import($crs, $cdom, $folder,@imports);
+        my ($errtext,$fatal)=&Apache::londocs::group_import($crs,$cdom,$folder,'sequence','imsimport',@imports);
         if ($fatal) {
             print STDERR "Fatal error during group_import\n";
         }
@@ -666,11 +683,11 @@ ENDBLOCK
            <input type="hidden" name="orgurl" value="/adm/coursedocs" />
            <input type="hidden" name="selectrole" value="1" />
            <h3><font color="red">Changes will become active for your current session after
-           <input type="hidden" name="$ENV{'request.role'}" value="1" />
+           <input type="hidden" name="$env{'request.role'}" value="1" />
            <input type="button" value="|;
     $initblock .= &mt('re-initializing course');
     $initblock .= qq|" onClick="javascript:init(this.form)"/>|;
-    $initblock .= &mt('or the next time you log in.');
+    $initblock .= ', '.&mt('or the next time you log in.');
     $initblock .= qq|</font></h3></form>|;  
     $r->print($initblock);
     $r->print(<<ENDBLOCKTWO);
