--- loncom/imspackages/imsimport.pm	2006/03/27 18:39:55	1.17
+++ loncom/imspackages/imsimport.pm	2006/12/05 02:55:54	1.22
@@ -34,20 +34,24 @@ 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,});
-    $start_page =~ s/\n/\\n/g;
-    $end_page =~ s/\n/\\n/g;
 
     $$jsref = <<"END_OF_ONE";
 function verify() {
@@ -307,6 +311,7 @@ Please choose the CMS used to create you
          <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>
@@ -410,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 'webctce4') {
+                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} ++;
@@ -652,6 +660,7 @@ sub display_three {
     my @pages = ();
     my @sequences = ();
     my @resrcfiles = ();
+    my @assessmentfiles = ();
 
     my $tempdir = $env{'form.tempdir'};
 
@@ -672,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) {
@@ -688,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);
 
@@ -707,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);
 
@@ -740,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;
@@ -809,7 +827,6 @@ sub handler {
     my $javascript = '';
     my $page_name = '';
     my $current_page = '';
-    my $loadentries = '';
     my $qcount = '';
 
 # get personal information for this user
@@ -839,7 +856,7 @@ sub handler {
         $fn=$env{'form.filename'};
         $fn=~s/^http\:\/\/[^\/]+\///;
         $fn=~s/^\///;
-        $fn=~s/(\~|priv\/)(\w+)//;
+        $fn=~s/(\~|priv\/)($LONCAPA::username_re)//;
         $fn=~s/\/+/\//g;
     } else {
         $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
@@ -852,7 +869,6 @@ sub handler {
     unless ($pathname eq '/') {
         $fullpath .= '/';
     }
-    my $loadentries = '';
 
     my @areas = ();
     my %cmsmap = ();
@@ -874,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.