--- loncom/imspackages/imsimport.pm	2006/03/23 23:12:21	1.14
+++ loncom/imspackages/imsimport.pm	2006/11/27 16:37:36	1.21
@@ -34,15 +34,21 @@ use HTML::Entities();
 use Apache::lonlocal;
 use Apache::lonupload;
 use File::Basename();
-                                                                                            
+use LONCAPA;
+
 # ----------------------------------------------------------------  Jscript One
 sub jscript_one {
     my ($fullpath,$jsref) = @_;
 
+    my %body_layout = ('rightmargin'  => "0",
+		       'leftmargin'   => "0",
+		       'marginwidth'  => "0",
+		       'topmargin'    => "0",
+		       'marginheight' => "0");
     my $start_page = 
 	&Apache::loncommon::start_page('Create IMS import directory',undef,
 				       {'only_body'   => 1,
-					'add_entries' => "topmargin='0' leftmargin='0' marginheight='0'marginwidth='0' rightmargin='0'",
+					'add_entries' => \%body_layout,
 					'js_ready'    => 1,});
     my $end_page = 
 	&Apache::loncommon::end_page({'js_ready' => 1,});
@@ -78,10 +84,10 @@ function createWin() {
   newWindow.document.write("<tr><td width='2'>&nbsp;</td><td width='3'>&nbsp;</td>\\n")
   newWindow.document.write("<td><form name='fileaction' action='/adm/cfile' method='post'>\\n")
   newWindow.document.write("<font face='arial,helvetica,sans-serif'>Enter the name of the new directory where you will store the contents of your IMS package.<br /><br />")
-  newWindow.document.write("<input type='hidden' name='filename' value='$fullpath'>")
-  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='hidden' name='filename' value='$fullpath' />")
+  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='Go' onClick='document.fileaction.submit();' />")
   newWindow.document.write("</td></tr>\\n")
   newWindow.document.write("</table>")
@@ -300,11 +306,12 @@ sub display_one {
         <font face='Arial,Helvetica,sans-serif'>
 Please choose the CMS used to create your IMS content package.&nbsp;&nbsp;
         <select name="source">
-         <option value='-1' selected="true">Please select
-         <option value='bb5'>Blackboard 5
-         <option value='bb6'>Blackboard 6
-         <option value='angel'>ANGEL
-         <option value='webct4'>WebCT 4
+         <option value='-1' selected="true">Please select</option>
+         <option value='bb5'>Blackboard 5</option>
+         <option value='bb6'>Blackboard 6</option>
+         <option value='angel'>ANGEL</option>
+         <option value='webctce4'>WebCT 4 Campus Edition</option>
+         <option value='webctvista4'>WebCT Vista 4</option>
         </select>
         </font>
        </td>
@@ -327,7 +334,7 @@ Please choose the CMS used to create you
        <td>&nbsp;</td>
        <td>
         <font face='Arial,Helvetica,sans-serif'>
-Please choose a destination LON-CAPA directory in which to store the contents of the IMS package file. <input type="button" name="createdir" value="Create Directory" onClick="javascript:createWin()"><input type="hidden" name="newdir" value=""></font>
+Please choose a destination LON-CAPA directory in which to store the contents of the IMS package file. <input type="button" name="createdir" value="Create Directory" onClick="javascript:createWin()" /><input type="hidden" name="newdir" value="" /></font>
        </td>
       </tr>
       <tr>
@@ -339,9 +346,9 @@ Please choose a destination LON-CAPA dir
       </tr>
       <tr>
        <td colspan='2'>
-          <input type="hidden" name="uploaduname" value="$uname">
-          <input type="hidden" name="filename" value="$fn">
-          <input type="hidden" name="phase" value="three">
+          <input type="hidden" name="uploaduname" value="$uname" />
+          <input type="hidden" name="filename" value="$fn" />
+          <input type="hidden" name="phase" value="three" />
        </td>
       </tr>
       <tr>
@@ -352,10 +359,10 @@ Please choose a destination LON-CAPA dir
         <table border='0' cellspacing='0' cellpadding='0' width="100%">
          <tr>
           <td align='left'>
-           <input type='button' name='exitpage' value='Exit now' onClick="javascript:location.href='$fullpath'">
+           <input type='button' name='exitpage' value='Exit now' onClick="javascript:location.href='$fullpath'" />
           </td>
           <td align='right'>
-           <input type="button" name="nextpage" value="Proceed" onClick="javascript:nextPage()">
+           <input type="button" name="nextpage" value="Proceed" onClick="javascript:nextPage()" />
           </td>
          </tr>
         </table>
@@ -408,10 +415,13 @@ sub display_two {
     my $conditions;
 
     if ($unzip_result eq 'ok') {
-        $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo,'choose',\%includedres,\%includeditems);
+        $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' || $cms eq 'webct4') {
+                if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webctce4' 
+                    || $cms eq 'webctvista4') {
                     foreach my $area (keys %{$$cmsmap{$cms}}) {
                         if ($resources{$res}{type} eq $$cmsmap{$cms}{$area}) {
                             $count{$area} ++;
@@ -490,13 +500,13 @@ ENDBLOCK
                     if ($area eq 'board') {
                         $r->print("            <td align='left'><font face='arial,helvetica,sans-serif'>&nbsp;&nbsp;
                  <select name='db_handling'>
-                  <option value='-2'>&lt;-- Check Import first
+                  <option value='-2'>&lt;-- Check Import first</option>
                  </select></font>
                 </td>");
                     } elsif ($area eq 'users') {
                         $r->print("            <td align='left'><font face='arial,helvetica,sans-serif'>&nbsp;&nbsp;
                  <select name='user_handling'>
-                  <option value='-2'>&lt;-- Check Import first
+                  <option value='-2'>&lt;-- Check Import first</option>
                  </select>
                  </font>        
                 </td>");
@@ -543,7 +553,7 @@ ENDBLOCKTWO
 <br /><br />
 Choose course:&nbsp;&nbsp;
                  <select name='targetcourse'>
-                  <option value='-1'>Not required
+                  <option value='-1'>Not required</option>
                  </select></font>
        </td>
       </tr>
@@ -587,10 +597,10 @@ ENDBLOCK
         <table border='0' cellspacing='0' cellpadding='0' width="100%">
          <tr>
           <td align='left'>
-           <input type='button' name='exitpage' value='Exit now' onClick="javascript:location.href='$fullpath'">
+           <input type='button' name='exitpage' value='Exit now' onClick="javascript:location.href='$fullpath'" />
           </td>
           <td align='right'>
-           <input type="button" name="nextpage" value="Import package" onClick="javascript:nextPage($counter)">
+           <input type="button" name="nextpage" value="Import package" onClick="javascript:nextPage($counter)" />
           </td>
          </tr>
         </table>
@@ -650,6 +660,7 @@ sub display_three {
     my @pages = ();
     my @sequences = ();
     my @resrcfiles = ();
+    my @assessmentfiles = ();
 
     my $tempdir = $env{'form.tempdir'};
 
@@ -670,11 +681,18 @@ sub display_three {
         }
     }
 
-    my $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo,'prepare',\%includedres);
+    my $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,
+                          \%resources,\%items,\%hrefs,\%resinfo,'prepare',
+                          \%includedres);
     if ($manifest_result eq 'ok') {
         foreach my $res (sort keys %resources) {
             if ($importareas{$resources{$res}{type}}) {
                 $includedres{$res} = 1;
+                if ($resources{$res}{type} eq 'webct.manifest' || 
+                     $resources{$res}{type} eq 'webct.assessment' ||
+                     $resources{$res}{type} eq 'webct.question') {
+                    push(@assessmentfiles,$res);
+                }   
             }
         }
         foreach my $itm (sort keys %items) {
@@ -686,7 +704,9 @@ sub display_three {
         &Apache::imsprocessor::get_parents(\%includeditems,\%items,$itm);
     }
 
-    $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo,'build',\%includedres,\%includeditems);
+    $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);
 
@@ -705,7 +725,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,\%importareas);
+        my $copy_result = &Apache::imsprocessor::copy_resources('CSTR',$cms,\%hrefs,$tempdir,\@targets,\%urls,$crs,$cdom,$destdir,$timenow,\%importareas,\@assessmentfiles);
    
         &Apache::imsprocessor::build_structure($cms,'CSTR',$destdir,\%items,\%resinfo,\%resources,\@targets,\%hrefs,$udom,$uname,$newdir,$timenow,$cdom,$crs,\@timestamp,\%total,\@boards,\@announcements,\@quizzes,\@surveys,\@pools,\%boardnum,\@pages,\@sequences,\@topurls,\@topnames,\@packages,\%includeditems,\%randompicks);
 
@@ -738,7 +758,7 @@ sub get_ccroles {
     my @crslist = ();
     my %descrip =();
     foreach my $key (keys %roles ) {
-        if ($key =~ m/^\/(\w+)\/(\w+)_cc$/) {
+        if ($key =~ m{^/($LONCAPA::domain_re)/($LONCAPA::username_re)_cc$}) {
             my $cdom = $1;
             my $crs = $2;
             my $role_end = 0;
@@ -807,7 +827,6 @@ sub handler {
     my $javascript = '';
     my $page_name = '';
     my $current_page = '';
-    my $loadentries = '';
     my $qcount = '';
 
 # get personal information for this user
@@ -850,7 +869,6 @@ sub handler {
     unless ($pathname eq '/') {
         $fullpath .= '/';
     }
-    my $loadentries = '';
 
     my @areas = ();
     my %cmsmap = ();
@@ -872,9 +890,7 @@ sub handler {
     $javascript = "<script type=\"text/javascript\">\n//<!--\n$javascript\n// --></script>\n";
 
     my $title = 'Upload IMS package to Construction Space';
-    $r->print(&Apache::loncommon::start_page($title, $javascript,
-					     {'add_entries' =>
-						  $loadentries,}));
+    $r->print(&Apache::loncommon::start_page($title, $javascript));
 
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
         $r->print('<h3><font color=red>'.&mt('Co-Author').': '.$uname.