--- loncom/imspackages/imsimport.pm	2013/06/04 22:20:28	1.39
+++ 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.39 2013/06/04 22:20:28 raeburn Exp $
+# $Id: imsimport.pm,v 1.43 2013/07/27 22:04:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -100,7 +100,7 @@ function createWin() {
   newWindow.document.write("<input type='hidden' name='action' value='newdir' />")
   newWindow.document.write("<input type='hidden' name='callingmode' value='imsimport' />")
   newWindow.document.write("$fullpath<input type='text' name='newfilename' value='' />")
-  newWindow.document.write("<input type='button' value='$lt{'go'}' onClick='document.fileaction.submit();' />")
+  newWindow.document.write("<input type='button' value='$lt{'go'}' onclick='document.fileaction.submit();' />")
   newWindow.document.write("</td></tr>\\n")
   newWindow.document.write("</table>")
   newWindow.document.write('$end_page')
@@ -286,7 +286,7 @@ END_OF_TWO
 # ---------------------------------------------------------------- Display One
 sub display_one {
     my ($r,$fn,$fullpath,$formname) = @_;
-    $r->print('<form name="'.$formname.'" method="post">'.
+    $r->print('<form name="'.$formname.'" method="post" action="">'.
               &Apache::lonhtmlcommon::topic_bar(1,&mt('Specify the Course Management system used to create the package')).
         &mt('Choose the CMS used to create your IMS content package.').'&nbsp;&nbsp;
         <select name="source">
@@ -298,11 +298,11 @@ sub display_one {
          <option value="webctvista4">WebCT Vista 4</option>
         </select><br />'."\n".
         &Apache::lonhtmlcommon::topic_bar(2,&mt('Create a directory where you will unpack your IMS package'))."\n".
-         &mt('Create a destination LON-CAPA directory in which to store the contents of the IMS package file.').'&nbsp;&nbsp;<input type="button" name="createdir" value="Create Directory" onClick="javascript:createWin()" /><input type="hidden" name="newdir" value="" /><br /><br />
+         &mt('Create a destination LON-CAPA directory in which to store the contents of the IMS package file.').'&nbsp;&nbsp;<input type="button" name="createdir" value="Create Directory" onclick="javascript:createWin()" /><input type="hidden" name="newdir" value="" /><br /><br />
           <input type="hidden" name="filename" value="'.$fn.'" />
           <input type="hidden" name="phase" value="three" />
-          <input type="button" name="nextpage" value="'.&mt('Proceed').'" onClick="javascript:nextPage();" />&nbsp;&nbsp;&nbsp;&nbsp;
-          <input type="button" name="exitpage" value="'.&mt('Exit now').'" onClick="javascript:location.href='."'$fullpath'".'" />
+          <input type="button" name="nextpage" value="'.&mt('Proceed').'" onclick="javascript:nextPage();" />&nbsp;&nbsp;&nbsp;&nbsp;
+          <input type="button" name="exitpage" value="'.&mt('Exit now').'" onclick="javascript:location.href='."'$fullpath'".'" />
          </form>');
 }
 
@@ -396,7 +396,7 @@ sub display_two {
                 $conditions = 'none';
             }
 
-            $r->print('<form name="pickoptions" method="post">'.
+            $r->print('<form name="pickoptions" method="post" action="">'.
                       &Apache::lonhtmlcommon::topic_bar(3,$lt{'cont'}).
                       &Apache::loncommon::start_data_table().
                       &Apache::loncommon::start_data_table_header_row().
@@ -409,7 +409,7 @@ sub display_two {
                     $r->print(&Apache::loncommon::start_data_table_row()."\n".
                               '<td><input name="'.$area.'" type="checkbox" ');
                     if ($area eq 'board' || $area eq 'users') {
-                        $r->print('onClick="javascript:setOptions('."'$area','$counter'".');" ');
+                        $r->print('onclick="javascript:setOptions('."'$area','$counter'".');" ');
                     }
                     $r->print('/></td>'.
                               '<td>&nbsp;&nbsp;'.$$areaname{$area}.'&nbsp;&nbsp; - '.
@@ -459,8 +459,8 @@ sub display_two {
             if ($count{users} == 0) {
                 $r->print('<input type="hidden" name="users" value="" />'."\n");
             }
-            $r->print('<input type="button" name="nextpage" value="'.$lt{'impa'}.'" onClick="javascript:nextPage('."'$counter.'".')" />&nbsp;&nbsp;&nbsp;
-           <input type="button" name="exitpage" value="'.$lt{'exit'}.'" onClick="javascript:location.href='."'$fullpath'".'" /></form>');
+            $r->print('<input type="button" name="nextpage" value="'.$lt{'impa'}.'" onclick="javascript:nextPage('."'$counter.'".')" />&nbsp;&nbsp;&nbsp;
+           <input type="button" name="exitpage" value="'.$lt{'exit'}.'" onclick="javascript:location.href='."'$fullpath'".'" /></form>');
         } else {
             $r->print($lt{'unpa'});
         }
@@ -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);
 
@@ -751,7 +761,7 @@ END_JS
             &display_three($r,$uname,$udom,\@areas,\%areaname,\%cmsmap,$destdir,$dirpath);
         }
     } else {
-        &Apache::lonupload::phaseone($r,$fn,'imsimport');
+        &Apache::lonupload::phaseone($r,$fn,'imsimport',$uname,$udom);
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;