--- loncom/imspackages/imsprocessor.pm	2006/03/24 17:16:07	1.33
+++ loncom/imspackages/imsprocessor.pm	2006/03/24 17:36:27	1.34
@@ -64,7 +64,7 @@ sub ims_config {
                 survey => 'FORM',
                 );
     @{$$cmsmap{angel}{doc}} = ('FILE','PAGE');
-    %{$$cmsmap{webct4}} = (
+    %{$$cmsmap{webctce4}} = (
                 quiz => 'webctquiz',
                 survey => 'webctsurvey',
                 doc => 'webcontent'
@@ -158,7 +158,7 @@ sub process_manifest {
               bb6 => 'organization',
               bb5 => 'tableofcontents',
               angel => 'organization',
-              webct4 => 'organization',
+              webctce4 => 'organization',
               );
     my %contents = ();
     my @state = ();
@@ -202,7 +202,7 @@ sub process_manifest {
                             %{$$items{$itm}} = ();
                             $$items{$itm}{contentscount} = 0;
                             @{$$items{$itm}{contents}} = ();
-                            if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webct4') {
+                            if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webctce4') {
                                 $$items{$itm}{resnum} = $attr->{identifierref};
                                 if ($cms eq 'bb5') {
                                     $$items{$itm}{title} = $attr->{title};
@@ -256,7 +256,7 @@ sub process_manifest {
                             $lastitem = $itm;
                         }
                     }
-                    if ($cms eq 'webct4') {
+                    if ($cms eq 'webctce4') {
                         if (($state[-1] eq "webct:properties") && (@state > 4)) {
                             $$items{$itm}{properties} = $attr->{identifierref};
                         }
@@ -267,7 +267,7 @@ sub process_manifest {
                         if ($cms eq 'bb5' || $cms eq 'bb6') {
                             $$resources{$identifier}{file} = $attr->{file};
                             $$resources{$identifier}{type} = $attr->{type};
-                        } elsif ($cms eq 'webct4') {
+                        } elsif ($cms eq 'webctce4') {
                             $$resources{$identifier}{type} = $attr->{type};
                             $$resources{$identifier}{file} = $attr->{href};
                         } elsif ($cms eq 'angel') {
@@ -280,7 +280,7 @@ sub process_manifest {
                     }
                 } elsif ("@state" eq "manifest resources resource file") {
                     if ($$includedres{$identifier} || $phase ne 'build') {
-                        if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webct4') {
+                        if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webctce4') {
                             push @{$$hrefs{$identifier}},$attr->{href};
                         } elsif ($cms eq 'angel') {
                             if ($attr->{href} =~ m/^_assoc\\$identifier\\(.+)$/) {
@@ -303,7 +303,7 @@ sub process_manifest {
                         if ($cms eq 'angel' || $cms eq 'bb6') {
                             $$items{$itm}{title} = $text;
                         }
-                        if ($cms eq 'webct4') {
+                        if ($cms eq 'webctce4') {
                             $$items{$itm}{title} = $text;
                             $$items{$itm}{title} =~ s/(<[^>]*>)//g;
                         }
@@ -372,7 +372,7 @@ sub copy_resources {
                 %{$$url{$key}} = ();
                 foreach my $file (@{$$hrefs{$key}}) {
                     my $source = $tempdir.'/'.$key.'/'.$file;
-                    if ($cms eq 'webct4') {
+                    if ($cms eq 'webctce4') {
                         $source = $tempdir.'/'.$file;
                     }
                     my $filename = '';
@@ -384,12 +384,12 @@ sub copy_resources {
                     }
                     $file =~ s-\\-/-g;
                     my $copyfile = $file;
-                    if ($cms eq 'webct4') {
+                    if ($cms eq 'webctce4') {
                         if ($file =~ m-/my_files/(.+)$-) {
                             $copyfile = $1;
                         }
                     }
-                    unless (($cms eq 'webct4') && ($copyfile =~ m/questionDB\.xml$/ || $copyfile =~ m/quiz_QIZ_\d+\.xml$/ || $copyfile =~ m/properties_QIZ_\d+\.xml$/)) {
+                    unless (($cms eq 'webctce4') && ($copyfile =~ m/questionDB\.xml$/ || $copyfile =~ m/quiz_QIZ_\d+\.xml$/ || $copyfile =~ m/properties_QIZ_\d+\.xml$/)) {
                         $copyfile = $fpath.$copyfile;
                         my $fileresult;
                         if (-e $source) {
@@ -427,7 +427,7 @@ sub copy_resources {
                         } elsif ($cms eq 'bb5' || $cms eq 'bb6') {
                             rename("$tempdir/$key/$file","$destdir/resfiles/$key/$file");
                         }
-                    } elsif ($cms eq 'webct4') {
+                    } elsif ($cms eq 'webctce4') {
                         if ($file =~ m-/my_files/(.+)$-) {
                             my $copyfile = $1;
                             if ($copyfile =~ m-^[^/]+/[^/]+-) {
@@ -569,7 +569,7 @@ sub process_resinfo {
         if (@{$pools}) {
             $$items{'Top'}{'contentscount'} ++;
         }
-    } elsif ($cms eq 'webct4') {
+    } elsif ($cms eq 'webctce4') {
         foreach my $key (sort keys %{$resources}) {
             if (grep/^$key$/,@{$targets}) {
                 if ($$resources{$key}{type} eq "webcontent") {
@@ -649,7 +649,7 @@ sub build_structure {
         my $resnum = $$items{$key}{resnum};
         my $type = $$resources{$resnum}{type};
         my $contentscount = $$items{$key}{'contentscount'}; 
-        if (($cms eq 'angel' && $type eq "FOLDER") || (($cms eq 'bb5' || $cms eq 'bb6') && $$resinfo{$resnum}{'isfolder'} eq "true") && (($type eq "resource/x-bb-document") || ($type eq "resource/x-bb-staffinfo") || ($type eq "resource/x-bb-externallink")) || ($cms eq 'webct4' &&  $contentscount > 0)) {
+        if (($cms eq 'angel' && $type eq "FOLDER") || (($cms eq 'bb5' || $cms eq 'bb6') && $$resinfo{$resnum}{'isfolder'} eq "true") && (($type eq "resource/x-bb-document") || ($type eq "resource/x-bb-staffinfo") || ($type eq "resource/x-bb-externallink")) || ($cms eq 'webctce4' &&  $contentscount > 0)) {
             unless (($cms eq 'bb5') && $key eq 'Top') {
                 $seqtext{$key} = "<map>\n";
             }
@@ -887,12 +887,12 @@ sub build_structure {
 sub make_structure {
     my ($cms,$key,$srcstem,$flag,$count,$timestamp,$boardnum,$hrefs,$pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$randompick) = @_;
     my $src ='';
-    if (($cms eq 'angel' && $type eq 'FOLDER') || (($cms eq 'bb5' || $cms eq 'bb6') && (($$resinfo{$res}{'isfolder'} eq 'true') || $key eq 'Top')) || ($cms eq 'webct4' && $contitemcount > 0)) {
+    if (($cms eq 'angel' && $type eq 'FOLDER') || (($cms eq 'bb5' || $cms eq 'bb6') && (($$resinfo{$res}{'isfolder'} eq 'true') || $key eq 'Top')) || ($cms eq 'webctce4' && $contitemcount > 0)) {
         $src = $srcstem.'/sequences/'.$contitem.'.sequence';
         $$flag{$key}{page} = 0;
         $$flag{$key}{seq} = 1;
         $$count{$key}{seq} ++;
-    } elsif ($cms eq 'webct4' && $randompick) {
+    } elsif ($cms eq 'webctce4' && $randompick) {
         $src = $srcstem.'/sequences/'.$res.'.sequence';
         $$flag{$key}{page} = 0;
         $$flag{$key}{seq} = 1;
@@ -940,7 +940,7 @@ sub make_structure {
             }
             $$flag{$key}{seq} = 0;
         }
-    } elsif ($cms eq 'webct4') {
+    } elsif ($cms eq 'webctce4') {
         if ($type eq 'webctquiz') {
             $src =  $srcstem.'/pages/'.$res.'.page';
             $$count{$key}{page} ++;
@@ -2540,7 +2540,7 @@ sub process_assessment {
         &parse_bb5_assessment($res,$docroot,$container,$settings,\%allanswers,\%allchoices,\@allids);
     } elsif ($cms eq 'bb6') {
         &parse_bb6_assessment($res,$docroot,$container,$settings,\@allids);
-    } elsif ($cms eq 'webct4') {
+    } elsif ($cms eq 'webctce4') {
         unless($$dbparse) {
             &parse_webct4_questionDB($docroot,$$resources{$res}{file},$catinfo,$qzdbsettings,\%alldbanswers,\%alldbchoices,\@alldbquestids);
             if (!-e "$destdir/sequences") {
@@ -2603,7 +2603,7 @@ sub process_assessment {
         }
     }
     my $dirtitle;
-    unless ($cms eq 'webct4') {
+    unless ($cms eq 'webctce4') {
         $dirtitle = $$settings{'title'};
         $dirtitle =~ s/\W//g;
         $dirtitle .= '_'.$res;
@@ -2616,7 +2616,7 @@ sub process_assessment {
         $newdir = "$destdir/problems/$dirtitle";
     }
 
-    if ($cms eq 'webct4') {
+    if ($cms eq 'webctce4') {
         &build_problem_container($cms,$dirtitle,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@allids,$udom,$uname,$dirname,\$containerdir,$cid,$cdom,$cnum,$catinfo,$qzdbsettings);
     } else {
         &build_problem_container($cms,$dirtitle,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@allids,$udom,$uname,$dirname,\$containerdir,$cid,$cdom,$cnum,$catinfo,$settings);
@@ -2658,7 +2658,7 @@ sub build_problem_container {
     my $probsrc = "/res/lib/templates/simpleproblem.problem";
     if ($context eq 'CSTR') {
         foreach my $id (@{$allids}) {
-            if ($cms eq 'webct4') {
+            if ($cms eq 'webctce4') {
                 $probtitle{$id} = $$settings{$id}{title};
             } else {
                 $probtitle{$id} = $$settings{title};
@@ -2667,7 +2667,7 @@ sub build_problem_container {
             $probtitle{$id} =~ s/\W//g;
             $probtitle{$id} .= '_'.$id;
         }
-        if ($cms eq 'webct4' && $container ne 'database') {
+        if ($cms eq 'webctce4' && $container ne 'database') {
             my $catid = $$settings{$$allids[0]}{category};
             my $probdir = $$catinfo{$catid}{title}.'_'.$catid;
             $probdir =~ s/\s/_/g;
@@ -2691,7 +2691,7 @@ sub build_problem_container {
             $curr_id = $j;
             $next_id = $curr_id + 1;
             if ($context eq 'CSTR') {
-                if ($cms eq 'webct4' && $container ne 'database') {
+                if ($cms eq 'webctce4' && $container ne 'database') {
                     my $catid = $$settings{$$allids[$j]}{category};
                     my $probdir = $$catinfo{$catid}{title}.'_'.$catid;
                     $probdir =~ s/\s/_/g;