--- loncom/imspackages/imsimportdocs.pm	2004/12/13 20:01:09	1.8
+++ loncom/imspackages/imsimportdocs.pm	2005/02/14 22:46:12	1.9
@@ -309,6 +309,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,7 +333,7 @@ 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') {
@@ -507,7 +509,9 @@ sub display_three {
     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 = ();
@@ -547,10 +551,10 @@ sub display_three {
         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'};
@@ -559,9 +563,35 @@ sub display_three {
             }
         }
     }
-   
-    my $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo);
+
+    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);
+        }
+    }
+    foreach my $itm (sort keys %includeditems) {
+        &Apache::imsprocessor::get_parents(\%includeditems,\%items,$itm);
+    }
+    foreach (sort keys %includeditems) {
+        print STDERR "Including this item - $_\n";
+    }
+    foreach (sort keys %includedres) {
+        print STDERR "Including this resource - $_\n";
+    }
+    foreach (sort keys %importareas) {
+        print STDERR "Including this area - $_\n";
+    }
+
+
+    $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 +606,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,11 +621,11 @@ 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,\@pages,\@sequences);
+        &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,$chome,$destdir,$timenow,\%importareas);
 
-        &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);
+        &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);
  
         foreach my $item (@pages) {
             my $filename = $timenow.'/pages/'.$item;