--- loncom/imspackages/imsimport.pm	2013/07/15 16:13:16	1.42
+++ loncom/imspackages/imsimport.pm	2013/07/27 22:04:49	1.43
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 # 
-# $Id: imsimport.pm,v 1.42 2013/07/15 16:13:16 bisitz Exp $
+# $Id: imsimport.pm,v 1.43 2013/07/27 22:04:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -543,7 +543,9 @@ sub display_three {
     my $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,
                           \%resources,\%items,\%hrefs,\%resinfo,'prepare',
                           \%includedres);
+
     if ($manifest_result eq 'ok') {
+        my %possibledep;
         foreach my $res (sort keys %resources) {
             if ($importareas{$resources{$res}{type}}) {
                 $includedres{$res} = 1;
@@ -552,6 +554,13 @@ sub display_three {
                      $resources{$res}{type} eq 'webct.question') {
                     push(@assessmentfiles,$res);
                 }   
+            } elsif ($resources{$res}{usedby}) {
+                $possibledep{$res} = 1;
+            }
+        }
+        foreach my $res (sort(keys(%possibledep))) {
+            if ($includedres{$resources{$res}{usedby}}) {
+                $includedres{$res} = 1;
             }
         }
         foreach my $itm (sort keys %items) {
@@ -566,6 +575,7 @@ sub display_three {
     $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,
                        \%resources,\%items,\%hrefs,\%resinfo,'build',
                        \%includedres,\%includeditems);
+
     if ($manifest_result eq 'ok') {
         &Apache::imsprocessor::target_resources(\%resources,\%importareas,\@targets);
 
@@ -584,7 +594,7 @@ sub display_three {
 
         &Apache::imsprocessor::process_resinfo($cms,'CSTR',$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,\%randompicks);
 
-        my $copy_result = &Apache::imsprocessor::copy_resources('CSTR',$cms,\%hrefs,$tempdir,\@targets,\%urls,$crs,$cdom,$destdir,$timenow,\@assessmentfiles,\%total);
+        my $copy_result = &Apache::imsprocessor::copy_resources('CSTR',$cms,\%hrefs,\%resources,$tempdir,\@targets,\%urls,$crs,$cdom,$destdir,$timenow,\@assessmentfiles,\%total);
    
         &Apache::imsprocessor::build_structure($cms,'CSTR',$destdir,\%items,\%resinfo,\%resources,\@targets,\%hrefs,$udom,$uname,$dirpath,$timenow,$cdom,$crs,\@timestamp,\%total,\@boards,\@announcements,\@quizzes,\@surveys,\@pools,\%boardnum,\@pages,\@sequences,\@topurls,\@topnames,\@packages,\%includeditems,\%randompicks);