--- loncom/imspackages/imsprocessor.pm	2004/03/21 20:44:58	1.6
+++ loncom/imspackages/imsprocessor.pm	2005/07/13 19:56:37	1.24
@@ -1,6 +1,32 @@
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+
 package Apache::imsprocessor;
 
 use Apache::lonnet;
+use Apache::loncleanup;
+use LWP::UserAgent;
+use HTTP::Request::Common;
 use LONCAPA::Configuration;
 use strict;
 
@@ -18,7 +44,8 @@ sub ims_config {
                 survey => 'assessment/x-bb-survey',
                 users => 'course/x-bb-user',
                 );
- 
+    %{$$cmsmap{bb6}} =  %{$$cmsmap{bb5}};
+    $$cmsmap{bb6}{conference} = 'resource/x-bb-conference';
     %{$$cmsmap{angel}} =  (
                 board => 'BOARD',
                 extlink => 'LINK',
@@ -26,10 +53,12 @@ sub ims_config {
                 quiz => 'QUIZ',
                 survey => 'FORM',
                 );
-
     @{$$cmsmap{angel}{doc}} = ('FILE','PAGE');
-
-
+    %{$$cmsmap{webct4}} = (
+                quiz => 'webctquiz',
+                survey => 'webctsurvey',
+                doc => 'webcontent'
+                );
     %{$areaname} = (
                 announce => 'Announcements',
                 board => 'Discussion Boards',
@@ -41,7 +70,6 @@ sub ims_config {
                 survey => 'Surveys',
                 users => 'Enrollment',
                 );
-         
 }
  
 sub create_tempdir {
@@ -70,7 +98,7 @@ sub uploadzip {
     my ($context,$tempdir,$source) = @_;
     my $fname;
     if ($context eq 'DOCS') {
-        $fname=$ENV{'form.uploadname.filename'};
+        $fname=$env{'form.uploadname.filename'};
 # Replace Windows backslashes by forward slashes
         $fname=~s/\\/\//g;
 # Get rid of everything but the actual filename
@@ -82,9 +110,9 @@ sub uploadzip {
 # See if there is anything left
         unless ($fname) { return 'error: no uploaded file'; }
 # Save the file
-        chomp($ENV{'form.uploadname'});
+        chomp($env{'form.uploadname'});
         open(my $fh,'>'.$tempdir.'/'.$fname);
-        print $fh $ENV{'form.uploadname'};
+        print $fh $env{'form.uploadname'};
         close($fh);
     } elsif ($context eq 'CSTR') {
         if ($source =~ m/\/([^\/]+)$/) {
@@ -99,11 +127,11 @@ sub uploadzip {
 sub expand_zip {
     my ($tempdir,$filename) = @_;
     my $zipfile = "$tempdir/$filename";
+    if (!-e "$zipfile") {
+        return 'no zip';
+    }
     if ($filename =~ m|\.zip$|i) {
         open(OUTPUT, "unzip -o $zipfile -d $tempdir  2> /dev/null |");
-        while (<OUTPUT>) {
-            print "$_<br />";
-        }
         close(OUTPUT);
     } else {
         return 'nozip';
@@ -115,10 +143,12 @@ sub expand_zip {
 }
 
 sub process_manifest {
-    my ($cms,$tempdir,$resources,$items,$hrefs,$resinfo) = @_;
+    my ($cms,$tempdir,$resources,$items,$hrefs,$resinfo,$phase,$includedres,$includeditems) = @_;
     my %toc = (
+              bb6 => 'organization',
               bb5 => 'tableofcontents',
               angel => 'organization',
+              webct4 => 'organization',
               );
     my %contents = ();
     my @state = ();
@@ -136,14 +166,15 @@ sub process_manifest {
  
     if ($cms eq 'angel') {
         $$resources{'toplevel'}{type} = "FOLDER";
-    } elsif ($cms eq 'bb5') {
+    } elsif ($cms eq 'bb5' || $cms eq 'bb6') {
         $$resources{'toplevel'}{type} = 'resource/x-bb-document';
+    } else {
+        $$resources{'toplevel'}{type} = 'webcontent';
     }
 
-
     unless (-e "$tempdir/imsmanifest.xml") {
         return 'nomanifest';
-    } 
+    }
 
     my $xmlfile = $tempdir.'/imsmanifest.xml';
     my $p = HTML::Parser->new
@@ -153,105 +184,119 @@ sub process_manifest {
            [sub {
                 my ($tagname, $attr) = @_;
                 push @state, $tagname;
-                my $num = @state - 3;
-                my $start = $num;
-                my $statestr = '';
-                foreach (@state) {
-                    $statestr .= "$_ ";
-                }
+                my $start = @state - 3;
                 if ( ($state[0] eq "manifest") && ($state[1] eq "organizations") && ($state[2] eq $toc{$cms}) ) {
-                    my $searchstr = "manifest organizations $toc{$cms}";
-                    while ($num > 0) {
-                        $searchstr .= " item";
-                        $num --; 
-                    }
-                    if (("@state" eq $searchstr) && (@state > 3)) {
-                        $itm = $attr->{identifier};              
-                        %{$$items{$itm}} = ();
-                        $$items{$itm}{contentscount} = 0;
-                        if ($cms eq 'bb5') {
-                            $$items{$itm}{resnum} = $attr->{identifierref};
-                            $$items{$itm}{title} = $attr->{title};
-                        } elsif ($cms eq 'angel') {
-                            if ($attr->{identifierref} =~ m/^res(.+)$/) {
-                                $$items{$itm}{resnum} = $1;
-                            }
-                        }
-                        unless (defined(%{$$resources{$$items{$itm}{resnum}}}) ) {
-                            %{$$resources{$$items{$itm}{resnum}}} = ();
-                        }
-                        $$resources{$$items{$itm}{resnum}}{revitm} = $itm;
-
-                        if ($start > @seq) {
-                            unless ($lastitem eq '') {
-                                push @seq, $lastitem;
-                                unless ( defined($contents{$seq[-1]}) ) {
-                                    @{$contents{$seq[-1]}} = ();
+                    if ($state[-1] eq 'item') {
+                        $itm = $attr->{identifier};
+                        if ($$includeditems{$itm} || $phase ne 'build') {
+                            %{$$items{$itm}} = ();
+                            $$items{$itm}{contentscount} = 0;
+                            @{$$items{$itm}{contents}} = ();
+                            if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webct4') {
+                                $$items{$itm}{resnum} = $attr->{identifierref};
+                                if ($cms eq 'bb5') {
+                                    $$items{$itm}{title} = $attr->{title};
+                                }
+                            } elsif ($cms eq 'angel') {
+                                if ($attr->{identifierref} =~ m/^res(.+)$/) {
+                                    $$items{$itm}{resnum} = $1;
                                 }
-                                push @{$contents{$seq[-1]}},$itm;
-                                $$items{$itm}{parentseq} = $seq[-1];
                             }
-                        }
-                        elsif ($start < @seq) {
-                            my $diff = @seq - $start;
-                            while ($diff > 0) {
-                                pop @seq;
-                                $diff --;
+                            unless (defined(%{$$resources{$$items{$itm}{resnum}}}) ) {
+                                %{$$resources{$$items{$itm}{resnum}}} = ();
                             }
-                            if (@seq) {
+                            $$resources{$$items{$itm}{resnum}}{revitm} = $itm;
+                            if ($start > @seq) {
+                                unless ($lastitem eq '') {
+                                    push @seq, $lastitem;
+                                    unless ( defined($contents{$seq[-1]}) ) {
+                                        @{$contents{$seq[-1]}} = ();
+                                    }
+                                    push @{$contents{$seq[-1]}},$itm;
+                                    $$items{$itm}{parentseq} = $seq[-1];
+                                }
+                            } elsif ($start < @seq) {
+                                my $diff = @seq - $start;
+                                while ($diff > 0) {
+                                    pop @seq;
+                                    $diff --;
+                                }
+                                if (@seq) {
+                                    push @{$contents{$seq[-1]}}, $itm;
+                                }
+                            } else {
                                 push @{$contents{$seq[-1]}}, $itm;
                             }
-                        } else {
-                            push @{$contents{$seq[-1]}}, $itm;
-                        }
-                        my $path;
-                        if (@seq > 1) {
-                            $path = join(',',@seq);
-                        } elsif (@seq > 0) {
-                            $path = $seq[0];
-                        }
-                        $$items{$itm}{filepath} = $path;
-                        if ($cms eq 'bb5') {
-                            if ($$items{$itm}{filepath} eq 'Top') {
-                                $$items{$itm}{resnum} = $itm;
-                                $$resources{$$items{$itm}{resnum}}{type} = 'resource/x-bb-document';
-                                $$resources{$$items{$itm}{resnum}}{revitm} = $itm;
-                                $$resinfo{$$items{$itm}{resnum}}{'isfolder'} = 'true';
+                            my $path;
+                            if (@seq > 1) {
+                                $path = join(',',@seq);
+                            } elsif (@seq > 0) {
+                                $path = $seq[0];
                             }
+                            $$items{$itm}{filepath} = $path;
+                            if ($cms eq 'bb5' || $cms eq 'bb6') {
+                                if ($$items{$itm}{filepath} eq 'Top') {
+                                    $$items{$itm}{resnum} = $itm;
+                                    $$resources{$$items{$itm}{resnum}}{type} = 'resource/x-bb-document';
+                                    $$resources{$$items{$itm}{resnum}}{revitm} = $itm;
+                                    $$resinfo{$$items{$itm}{resnum}}{'isfolder'} = 'true';
+                                }
+                            }
+                            $$items{$seq[-1]}{contentscount} ++;
+                            $lastitem = $itm;
+                        }
+                    }
+                    if ($cms eq 'webct4') {
+                        if (($state[-1] eq "webct:properties") && (@state > 4)) {
+                            $$items{$itm}{properties} = $attr->{identifierref};
                         }
-                        $$items{$seq[-1]}{contentscount} ++;
-                        $lastitem = $itm;
                     }
                 } elsif ("@state" eq "manifest resources resource" ) {
                     $identifier = $attr->{identifier};
-                    if ($cms eq 'bb5') {                 
-                        $$resources{$identifier}{file} = $attr->{file};
-                        $$resources{$identifier}{type} = $attr->{type};
-                    } elsif ($cms eq 'angel') {
-                        $identifier = substr($identifier,3);
-                        if ($attr->{href} =~ m-^_assoc/$identifier/(.+)$-) {
-                            $$resources{$identifier}{file} = $1;
-                        }                    
+                    if ($$includedres{$identifier} || $phase ne 'build') { 
+                        if ($cms eq 'bb5' || $cms eq 'bb6') {
+                            $$resources{$identifier}{file} = $attr->{file};
+                            $$resources{$identifier}{type} = $attr->{type};
+                        } elsif ($cms eq 'webct4') {
+                            $$resources{$identifier}{type} = $attr->{type};
+                            $$resources{$identifier}{file} = $attr->{href};
+                        } elsif ($cms eq 'angel') {
+                            $identifier = substr($identifier,3);
+                            if ($attr->{href} =~ m-^_assoc/$identifier/(.+)$-) {
+                                $$resources{$identifier}{file} = $1;
+                            }
+                        }
+                        @{$$hrefs{$identifier}} = ();
                     }
-                    @{$$hrefs{$identifier}} = ();
                 } elsif ("@state" eq "manifest resources resource file") {
-                    if ($cms eq 'bb5') {
-                        push @{$$hrefs{$identifier}},$attr->{href};
-                    } elsif ($cms eq 'angel') {
-                        if ($attr->{href} =~ m/^_assoc\\$identifier\\(.+)$/) {
-                            push @{$$hrefs{$identifier}},$1;
-                        } elsif ($attr->{href} =~ m/^Icons\\icon(\w+)\.gif/) {
-                            $$resources{$identifier}{type} = $1;
-                        } 
+                    if ($$includedres{$identifier} || $phase ne 'build') {
+                        if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webct4') {
+                            push @{$$hrefs{$identifier}},$attr->{href};
+                        } elsif ($cms eq 'angel') {
+                            if ($attr->{href} =~ m/^_assoc\\$identifier\\(.+)$/) {
+                                push @{$$hrefs{$identifier}},$1;
+                            } elsif ($attr->{href} =~ m/^Icons\\icon(\w+)\.gif/) {
+                                $$resources{$identifier}{type} = $1;
+                            }
+                        }
                     }
                 }
            }, "tagname, attr"],
         text_h =>
             [sub {
                 my ($text) = @_;
-                if ($state[0] eq "manifest" && $state[1] eq "organizations" && $state[2] eq "organization" && $state[-1] eq "title") {
-                    if ($cms eq 'angel') {
-                        $$items{$itm}{title} = $text;
+                if ("@state" eq "manifest metadata lom general title langstring") {
+                    $$items{'Top'}{title} = $text;
+                }
+                if ($state[0] eq "manifest" && $state[1] eq "organizations" && $state[2] eq $toc{$cms} && $state[-1] eq "title") {
+                    if ($$includeditems{$itm} || $phase ne 'build') {
+                        if ($cms eq 'angel' || $cms eq 'bb6') {
+                            $$items{$itm}{title} = $text;
+                        }
+                        if ($cms eq 'webct4') {
+                            $$items{$itm}{title} = $text;
+                            $$items{$itm}{title} =~ s/(<[^>]*>)//g;
+                        }
                     }
                 }
               }, "dtext"],
@@ -270,6 +315,35 @@ sub process_manifest {
     return 'ok' ;
 }
 
+sub get_imports {
+    my ($includeditems,$items,$resources,$importareas,$itm) = @_;
+    if (exists($$items{$itm}{resnum})) {
+        if ($$importareas{$$resources{$$items{$itm}{resnum}}{type}}) {
+            unless (exists($$includeditems{$itm})) {
+                $$includeditems{$itm} = 1;
+            }
+        }
+    }
+    if ($$items{$itm}{contentscount} > 0) {
+        foreach my $child (@{$$items{$itm}{contents}}) {
+            &get_imports($includeditems,$items,$resources,$importareas,$child);
+        }
+    }
+}
+
+sub get_parents {
+    my ($includeditems,$items,$itm) = @_;
+    my @pathitems = ();
+    if ($$items{$itm}{filepath} =~ m/,/) {
+       @pathitems = split/,/,$$items{$itm}{filepath};
+    } else {
+       $pathitems[0] = $$items{$itm}{filepath};
+    }
+    foreach (@pathitems) {
+        $$includeditems{$_} = 1;
+    }
+}
+
 sub target_resources {
     my ($resources,$oktypes,$targets) = @_;
     foreach my $key (keys %{$resources}) {
@@ -288,6 +362,9 @@ sub copy_resources {
                 %{$$url{$key}} = ();
                 foreach my $file (@{$$hrefs{$key}}) {
                     my $source = $tempdir.'/'.$key.'/'.$file;
+                    if ($cms eq 'webct4') {
+                        $source = $tempdir.'/'.$file;
+                    }
                     my $filename = '';
                     my $fpath = $timenow.'/resfiles/'.$key.'/';
                     if ($cms eq 'angel') {
@@ -296,8 +373,19 @@ sub copy_resources {
                         }
                     }
                     $file =~ s-\\-/-g;
-                    $file = $fpath.$file;
-                    my $fileresult = &Apache::lonnet::process_coursefile('copy',$crs,$cdom,$chome,$file,$source);
+                    my $copyfile = $file;
+                    if ($cms eq 'webct4') {
+                        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$/)) {
+                        $copyfile = $fpath.$copyfile;
+                        my $fileresult;
+                        if (-e $source) {
+                            $fileresult = &Apache::lonnet::process_coursefile('copy',$crs,$cdom,$chome,$copyfile,$source);
+                        }
+                    }
                 }
             }
         }
@@ -306,28 +394,49 @@ sub copy_resources {
             mkdir("$destdir/resfiles",0770);
         }
         foreach my $key (sort keys %{$hrefs}) {
-            foreach my $file (@{$$hrefs{$key}}) {
-                $file =~ s-\\-/-g;
-                if ( ($cms eq 'angel' && $file ne 'pg'.$key.'.htm') || ($cms eq 'bb5') ) {
-                    if (!-e "$destdir/resfiles/$key") {
-                        mkdir("$destdir/resfiles/$key",0770);
-                    }
-
-                    my $filepath = $file;
-                    my $front = '';
-                    while ($filepath =~ m-(\w+)/(.+)-) {
-                        $front .= $1.'/';
-                        $filepath = $2;
-                        my $fulldir = "$destdir/resfiles/$key/$front";
-                        chop($fulldir);
-                        if (!-e "$fulldir") {
-                            mkdir("$fulldir",0770);
+            if (grep/^$key$/,@{$targets}) {
+                foreach my $file (@{$$hrefs{$key}}) {
+                    $file =~ s-\\-/-g;
+                    if ( ($cms eq 'angel' && $file ne 'pg'.$key.'.htm') || ($cms eq 'bb5') || ($cms eq 'bb6')) {
+                        if (!-e "$destdir/resfiles/$key") {
+                            mkdir("$destdir/resfiles/$key",0770);
+                        }
+                        my $filepath = $file;
+                        my $front = '';
+                        while ($filepath =~ m-(\w+)/(.+)-) {
+                            $front .= $1.'/';
+                            $filepath = $2;
+                            my $fulldir = "$destdir/resfiles/$key/$front";
+                            chop($fulldir);
+                            if (!-e "$fulldir") {
+                                mkdir("$fulldir",0770);
+                            }
+                        }
+                        if ($cms eq 'angel') {
+                            rename("$tempdir/_assoc/$key/$file","$destdir/resfiles/$key/$file");
+                        } elsif ($cms eq 'bb5' || $cms eq 'bb6') {
+                            rename("$tempdir/$key/$file","$destdir/resfiles/$key/$file");
+                        }
+                    } elsif ($cms eq 'webct4') {
+                        if ($file =~ m-/my_files/(.+)$-) {
+                            my $copyfile = $1;
+                            if ($copyfile =~ m-^[^/]+/[^/]+-) {
+                                my @dirs = split/\//,$copyfile;
+                                my $path = "$destdir/resfiles";
+                                while (@dirs > 1) {
+                                    $path .= '/'.$dirs[0];
+                                    if (!-e "$path") {
+                                        mkdir("$path",0755);
+                                    }
+                                    shift @dirs;
+                                }
+                            }
+                            if (-e "$tempdir/$file") {
+                                rename("$tempdir/$file","$destdir/resfiles/$copyfile");
+                            }
+                        } elsif ($file !~ m-/data/(.+)$-) {
+                            &Apache::lonnet::logthis("IMS import error: WebCT4 - file $file is in unexpected location");
                         }
-                    }
-                    if ($cms eq 'angel') {
-                        rename("$tempdir/_assoc/$key/$file","$destdir/resfiles/$key/$file");
-                    } elsif ($cms eq 'bb5') {
-                        rename("$tempdir/$key/$file","$destdir/resfiles/$key/$file");
                     }
                 }
             }
@@ -335,48 +444,27 @@ sub copy_resources {
     }
 }
 
-sub process_coursefile {
-    my ($crs,$cdom,$chome,$file,$source)=@_;
-    my $fetchresult = '';
-    my $fpath = '';
-    my $fname = $file;
-    ($fpath,$fname) = ($file =~ m/^(.*)\/([^\/])$/);
-    $fpath=$cdom.'/'.$crs.'/'.$fpath;
-    my $filepath=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles';
-    unless ($fpath eq '') {
-        my @parts=split(/\//,$fpath);
-        foreach my $part (@parts) {
-            $filepath.= '/'.$part;
-            if ((-e $filepath)!=1) {
-                mkdir($filepath,0777);
-            }
-        }
-    }
-    if ($source eq '') {
-        $fetchresult eq 'no source file provided';
-    } else {
-        my $destination = $filepath.'/'.$fname;
-        rename($source,$destination);
-        $fetchresult= &Apache::lonnet::reply('fetchuserfile:'.$cdom.'/'.$crs.'/'.$file,$chome);
-        unless ($fetchresult eq 'ok') {
-            &Apache::lonnet::logthis('Failed to transfer '.$cdom.'/'.$crs.'/'.$fname.' to host '.$chome.': '.$fetchresult);
-        }
-    }
-    return $fetchresult;
-}
-
 sub process_resinfo {
-    my ($cms,$docroot,$destdir,$items,$resources,$boards,$announcements,$quizzes,$surveys,$groups,$messages,$timestamp,$boardnum,$resinfo,$udom,$uname,$cdom,$crs,$db_handling,$user_handling,$total,$dirname,$seqstem,$resrcfiles) = @_;
+    my ($cms,$context,$docroot,$destdir,$items,$resources,$targets,$boards,$announcements,$quizzes,$surveys,$pools,$groups,$messages,$timestamp,$boardnum,$resinfo,$udom,$uname,$cdom,$crs,$db_handling,$user_handling,$total,$dirname,$seqstem,$resrcfiles,$packages,$hrefs,$pagesfiles,$sequencesfiles,$randompicks) = @_;
     my $board_id = time;
     my $board_count = 0;
+    my $dbparse = 0;
     my $announce_handling = 'include';
     my $longcrs = '';
+    my %qzdbsettings = ();
+    my %catinfo = ();
     if ($crs =~ m/^(\d)(\d)(\d)/) {
         $longcrs = $1.'/'.$2.'/'.$3.'/'.$crs;
     }
+    if ($context eq 'CSTR') {
+        if (!-e "$destdir/resfiles") {
+            mkdir("$destdir/resfiles",0770);
+        }
+    }
     if ($cms eq 'angel') {
         my $currboard = '';
         foreach my $key (sort keys %{$resources}) {
+          if (grep/^$key$/,@{$targets}) {
             if ($$resources{$key}{type} eq "BOARD") {
                 push @{$boards}, $key;
                 $$boardnum{$$resources{$key}{revitm}} = $board_count;
@@ -401,13 +489,15 @@ sub process_resinfo {
             } elsif ($$resources{$key}{type} eq "DROPBOX") {
                 %{$$resinfo{$key}} = ();
             }
+          }
         }
-    } elsif ($cms eq 'bb5') {
+    } elsif ($cms eq 'bb5' || $cms eq 'bb6') {
         foreach my $key (sort keys %{$resources}) {
+          if (grep/^$key$/,@{$targets}) {
             if ($$resources{$key}{type} eq "resource/x-bb-document") {
                 unless ($$items{$$resources{$key}{revitm}}{filepath} eq 'Top') {
                     %{$$resinfo{$key}} = ();
-                    &process_content($key,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$resrcfiles);
+                    &process_content($cms,$key,$context,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$resrcfiles,$packages,$hrefs);
                 }
             } elsif ($$resources{$key}{type} eq "resource/x-bb-staffinfo") {
                 %{$$resinfo{$key}} = ();
@@ -426,14 +516,15 @@ sub process_resinfo {
                 }
             } elsif ($$resources{$key}{type} eq "assessment/x-bb-pool") {
                 %{$$resinfo{$key}} = ();
-                &process_assessment($key,$docroot,'pool',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname);
+                &process_assessment($cms,$context,$key,$docroot,'pool',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs);
+                push @{$pools}, $key;
             } elsif ($$resources{$key}{type} eq "assessment/x-bb-quiz") {
                 %{$$resinfo{$key}} = ();
-                &process_assessment($key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname);
+                &process_assessment($cms,$context,$key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs);
                 push @{$quizzes}, $key;
             } elsif ($$resources{$key}{type} eq "assessment/x-bb-survey") {
                 %{$$resinfo{$key}} = ();
-                &process_assessment($key,$docroot,'survey',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname);
+                &process_assessment($cms,$context,$key,$docroot,'survey',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs);
                 push @{$surveys}, $key;
             } elsif ($$resources{$key}{type} eq "assessment/x-bb-group") {
                 %{$$resinfo{$key}} = ();
@@ -451,6 +542,7 @@ sub process_resinfo {
                     &process_announce($key,$docroot,$destdir,\%{$$resinfo{$key}},$resinfo,$seqstem,$resrcfiles);
                 }
             }
+          }
         }
         if (@{$announcements}) {
             $$items{'Top'}{'contentscount'} ++;
@@ -463,22 +555,37 @@ sub process_resinfo {
         }
         if (@{$surveys}) {
             $$items{'Top'}{'contentscount'} ++;
-        
+        }
+        if (@{$pools}) {
+            $$items{'Top'}{'contentscount'} ++;
+        }
+    } elsif ($cms eq 'webct4') {
+        foreach my $key (sort keys %{$resources}) {
+            if (grep/^$key$/,@{$targets}) {
+                if ($$resources{$key}{type} eq "webcontent") {
+                    %{$$resinfo{$key}} = ();
+                    &webct4_content($key,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$$resources{$key}{type},$$items{$$resources{$key}{revitm}}{title},$resrcfiles);
+                } elsif ($$resources{$key}{type} eq "webctquiz") {
+                    &process_assessment($cms,$context,$key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs);
+                }
+            }
         }
     }
 
     $$total{'board'} = $board_count;
     $$total{'quiz'} = @{$quizzes};
     $$total{'surv'} = @{$surveys};
+    $$total{'pool'} = @{$pools};
 }
 
 sub build_structure {
-    my ($cms,$context,$destdir,$items,$resinfo,$resources,$hrefs,$udom,$uname,$newdir,$timenow,$cdom,$crs,$timestamp,$total,$boards,$announcements,$quizzes,$surveys,$boardnum,$pagesfiles,$seqfiles,$topurls,$topnames) = @_;
+    my ($cms,$context,$destdir,$items,$resinfo,$resources,$targets,$hrefs,$udom,$uname,$newdir,$timenow,$cdom,$crs,$timestamp,$total,$boards,$announcements,$quizzes,$surveys,$pools,$boardnum,$pagesfiles,$seqfiles,$topurls,$topnames,$packages,$includeditems,$randompicks) = @_;
     my %flag = ();
     my %count = ();
     my %pagecontents = ();
     my %seqtext = ();
     my $topnum = 0;
+    my $topspecials = @$announcements + @$boards + @$quizzes + @$surveys + @$pools;
 
     if (!-e "$destdir") {
         mkdir("$destdir",0755);
@@ -510,6 +617,7 @@ sub build_structure {
     }
 
     foreach my $key (sort keys %{$items}) {
+      if ($$includeditems{$key}) {
         %{$flag{$key}} = (
                           page => 0,
                           seq => 0,
@@ -530,22 +638,50 @@ sub build_structure {
         my $curr_id = 1;
         my $resnum = $$items{$key}{resnum};
         my $type = $$resources{$resnum}{type};
-        if (($cms eq 'angel' && $type eq "FOLDER") || ($cms eq 'bb5' && $$resinfo{$resnum}{'isfolder'} eq "true") && (($type eq "resource/x-bb-document") || ($type eq "resource/x-bb-staffinfo") || ($type eq "resource/x-bb-externallink")) ) {
-            unless ($cms eq 'bb5' && $key eq 'Top') {
+        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)) {
+            unless (($cms eq 'bb5') && $key eq 'Top') {
                 $seqtext{$key} = "<map>\n";
             }
-            if ($$items{$key}{contentscount} == 0) {
-                $seqtext{$key} .= qq|<resource id="$curr_id" src="" type="start"></resource>
+            if ($contentscount == 0) {
+	        if ($key eq 'Top') {
+                    unless ($topspecials) {
+                        $seqtext{$key} .= qq|<resource id="$curr_id" src="" type="start"></resource>
+<link from="$curr_id" to="$next_id" index="$curr_id"></link>
+<resource id="$next_id" src="" type="finish"></resource>\n|;
+                    }
+                } else {
+                    $seqtext{$key} .= qq|<resource id="$curr_id" src="" type="start"></resource>
 <link from="$curr_id" to="$next_id" index="$curr_id"></link>
 <resource id="$next_id" src="" type="finish"></resource>\n|;
+                }
             } else {
-                my $contcount = @{$$items{$key}{contents}};
+                my $contcount = 0;
+                if (defined($$items{$key}{contents})) { 
+                    $contcount = @{$$items{$key}{contents}};
+                } else {
+                    &Apache::lonnet::logthis("IMS Import error for item: $key- contents count = $contentscount, but identity of contents not defined.");
+                }
                 my $contitem = $$items{$key}{contents}[0];
-                my $res = $$items{$contitem}{resnum};
-                my $type = $$resources{$res}{type};
+                my $contitemcount = $$items{$contitem}{contentscount}; 
+                my ($res,$itm,$type,$file);
+                if (exists($$items{$contitem}{resnum})) {
+                    $res = $$items{$contitem}{resnum};
+                    $itm = $$resources{$res}{revitm};
+                    $type = $$resources{$res}{type};
+                    $file = $$resources{$res}{file};
+                }
                 my $title = $$items{$contitem}{title};
-                $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$resinfo,$contitem,$uname,$cdom);
+                my $packageflag = 0;
+                if (grep/^$res$/,@{$packages}) {
+                    $packageflag = 1;
+                }
+                $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$$randompicks{$contitem});
                 unless ($flag{$key}{page} == 1) {
+                    if ($$randompicks{$contitem}) {
+                        $seqtext{$key} .= qq|
+<param to="$curr_id" type="int_pos" name="parameter_randompick" value="$$randompicks{$contitem}"></param>\n|;
+                    }
                     $seqtext{$key} .= qq|<resource id="$curr_id" src="$src" title="$title" type="start"|;
                     unless ($flag{$key}{seq} || $flag{$key}{board} || $flag{$key}{file}) {
                         $flag{$key}{page} = 1;
@@ -557,19 +693,38 @@ sub build_structure {
                 }
                 if ($contcount == 1) {
                     $seqtext{$key} .= qq|></resource>
-<link from="$curr_id" to="$next_id" index="$curr_id"></link>
+<link from="$curr_id" to="$next_id" index="$curr_id"></link>|;
+                    if ($key eq 'Top') {
+                        unless ($topspecials) {
+                            $seqtext{$key} .= qq|
 <resource id="$next_id" src="" type="finish"></resource>\n|;
+                        }
+                    } else {
+                        $seqtext{$key} .= qq|
+<resource id="$next_id" src="" type="finish"></resource>\n|;
+                    }
                 } else {
                     if ($contcount > 2 ) {
                         for (my $i=1; $i<$contcount-1; $i++) {
                             my $contitem = $$items{$key}{contents}[$i];
+                            my $contitemcount = $$items{$contitem}{contentscount};
                             my $res = $$items{$contitem}{resnum};
                             my $type = $$resources{$res}{type};
-                            my $title = $$items{$contitem}{title};  
-                            $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$resinfo,$contitem,$uname,$cdom);
+                            my $file = $$resources{$res}{file};
+                            my $title = $$items{$contitem}{title};
+                            my $packageflag = 0;
+                            if (grep/^$res$/,@{$packages}) {
+                                $packageflag = 1;
+                            }
+                            $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$$randompicks{$contitem});
                             unless ($flag{$key}{page} == 1) {
                                 $seqtext{$key} .= qq|></resource>
-<link from="$curr_id" to="$next_id" index="$curr_id"></link>
+<link from="$curr_id" to="$next_id" index="$curr_id"></link>\n|;
+                                if ($$randompicks{$contitem}) {
+                                    $seqtext{$key} .= qq|
+<param to="$next_id" type="int_pos" name="parameter_randompick" value="$$randompicks{$contitem}"></param>|;
+                                }
+                                $seqtext{$key} .= qq|
 <resource id="$next_id" src="$src" title="$title"|;
                                 $curr_id ++;
                                 $next_id ++;
@@ -584,11 +739,17 @@ sub build_structure {
                         }
                     }
                     my $contitem = $$items{$key}{contents}[-1];
+                    my $contitemcount = $$items{$contitem}{contentscount};
                     my $res = $$items{$contitem}{resnum};
                     my $type = $$resources{$res}{type};
+                    my $file = $$resources{$res}{file};
                     my $title = $$items{$contitem}{title};
+                    my $packageflag = 0;
+                    if (grep/^$res$/,@{$packages}) {
+                        $packageflag = 1;
+                    }
+                    $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$$randompicks{$contitem});
 
-                    $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$resinfo,$contitem,$uname,$cdom);
                     if ($flag{$key}{page}) {
                         if ($count{$key}{seq} + $count{$key}{page} + $count{$key}{board} + $count{$key}{file} +1 == 1) {
                             $seqtext{$key} .= qq|></resource>
@@ -597,7 +758,12 @@ sub build_structure {
                         }
                     } else {
                         $seqtext{$key} .= qq|></resource>
-<link from="$curr_id" to="$next_id" index="$curr_id"></link>
+<link from="$curr_id" to="$next_id" index="$curr_id"></link>\n|;
+                        if ($$randompicks{$contitem}) {
+                            $seqtext{$key} .= qq|
+<param to="$next_id" type="int_pos" name="parameter_randompick" value="$$randompicks{$contitem}"></param>\n|;
+                        }
+                        $seqtext{$key} .= qq|
 <resource id="$next_id" src="$src" title="$title" |;
                         if ($key eq 'Top') {
                             push @{$topurls}, $src;
@@ -610,11 +776,11 @@ sub build_structure {
                         $curr_id ++;
                         $next_id ++;
                         $seqtext{$key} .= qq|></resource>
-<link from="$curr_id" to="$next_id index="$curr_id"></link>\n|;
+<link from="$curr_id" to="$next_id" index="$curr_id"></link>\n|;
                     } 
                 }
             }
-            unless ($cms eq 'bb5' && $key eq 'Top') {
+            unless (($cms eq 'bb5') && $key eq 'Top') {
                 $seqtext{$key} .= "</map>\n";
                 open(LOCFILE,">$destdir/sequences/$key.sequence");
                 print LOCFILE $seqtext{$key};
@@ -625,10 +791,11 @@ sub build_structure {
             $$total{page} += $count{$key}{page};
         }
         $$total{seq} += $count{$key}{seq};
+      }
     }
     $topnum += ($count{'Top'}{page} + $count{'Top'}{seq});
 
-    if ($cms eq 'bb5') {
+    if ($cms eq 'bb5' || $cms eq 'bb6') {
         if (@{$announcements} > 0) {
             &process_specials($context,'announcements',$announcements,\$topnum,$$items{'Top'}{contentscount},$destdir,$udom,$uname,$cdom,$crs,$timenow,$newdir,$timestamp,$resinfo,\$seqtext{'Top'},$pagesfiles,$seqfiles,$topurls,$topnames);
         }
@@ -641,7 +808,9 @@ sub build_structure {
         if (@{$surveys} > 0)  {
             &process_specials($context,'surveys',$surveys,\$topnum,$$items{'Top'}{contentscount},$destdir,$udom,$uname,$cdom,$crs,$timenow,$newdir,$timestamp,$resinfo,\$seqtext{'Top'},$pagesfiles,$seqfiles,$topurls,$topnames);
         }
-
+        if (@{$pools} > 0)  {
+            &process_specials($context,'pools',$pools,\$topnum,$$items{'Top'}{contentscount},$destdir,$udom,$uname,$cdom,$crs,$timenow,$newdir,$timestamp,$resinfo,\$seqtext{'Top'},$pagesfiles,$seqfiles,$topurls,$topnames);
+        }
         $seqtext{'Top'} .= "</map>\n";
         open(TOPFILE,">$destdir/sequences/Top.sequence");
         print TOPFILE $seqtext{'Top'};
@@ -659,24 +828,44 @@ sub build_structure {
     foreach my $key (sort keys %pagecontents) {
         for (my $i=0; $i<@{$pagecontents{$key}}; $i++) {
             my $filename = $destdir.'/pages/'.$key.'_'.$i.'.page';
+            my $resource = "$filestem/resfiles/$$items{$pagecontents{$key}[$i][0]}{resnum}.html";
+            my $res = $$items{$pagecontents{$key}[$i][0]}{resnum};
+            my $resource = $filestem.'/resfiles/'.$res.'.html';
+            if (grep/^$res$/,@{$packages}) {
+                $resource =  $filestem.'/resfiles/'.$res.'./index.html'; # should be entry_point
+            }
             open(PAGEFILE,">$filename");
             print PAGEFILE qq|<map>
-<resource src="$filestem/resfiles/$$items{$pagecontents{$key}[$i][0]}{resnum}.html" id="1" type="start" title="$$items{$pagecontents{$key}[$i][0]}{title}"></resource>
+<resource src="$resource" id="1" type="start" title="$$items{$pagecontents{$key}[$i][0]}{title}"></resource>
 <link to="2" index="1" from="1">\n|;
             if (@{$pagecontents{$key}[$i]} == 1) {
                 print PAGEFILE qq|<resource src="" id="2" type="finish"></resource>\n|;
             } elsif (@{$pagecontents{$key}[$i]} == 2)  {
-                print PAGEFILE qq|<resource src="$filestem/resfiles/$$items{$pagecontents{$key}[$i][1]}{resnum}.html" id="2" type="finish" title="$$items{$pagecontents{$key}[$i][1]}{title}"></resource>\n|;
+                my $res = $$items{$pagecontents{$key}[$i][1]}{resnum};
+                my $resource = $filestem.'/resfiles/'.$res.'.html';
+                if (grep/^$res$/,@{$packages}) {
+                    $resource =  $filestem.'/resfiles/'.$res.'./index.html'; # should be entry_point
+                }
+                print PAGEFILE qq|<resource src="$resource" id="2" type="finish" title="$$items{$pagecontents{$key}[$i][1]}{title}"></resource>\n|;
             } else {
                 for (my $j=1; $j<@{$pagecontents{$key}[$i]}-1; $j++) {
                     my $curr_id = $j+1;
                     my $next_id = $j+2;
-                    my $resource = $filestem.'/resfiles/'.$$items{$pagecontents{$key}[$i][$j]}{resnum}.'.html';
+                    my $res = $$items{$pagecontents{$key}[$i][$j]}{resnum};
+                    my $resource = $filestem.'/resfiles/'.$res.'.html';
+                    if (grep/^$res$/,@{$packages}) {
+                        $resource =  $filestem.'/resfiles/'.$res.'./index.html'; # entry_point
+                    }
                     print PAGEFILE qq|<resource src="$resource" id="$curr_id" title="$$items{$pagecontents{$key}[$i][$j]}{title}"></resource>
 <link to="$next_id" index="$curr_id" from="$curr_id">\n|;
                 }
                 my $final_id = @{$pagecontents{$key}[$i]};
-                print PAGEFILE qq|<resource src="$filestem/resfiles/$$items{$pagecontents{$key}[$i][-1]}{resnum}.html" id="$final_id" type="finish" title="$$items{$pagecontents{$key}[$i][-1]}{title}"></resource>\n|;
+                my $res = $$items{$pagecontents{$key}[$i][-1]}{resnum};
+                my $resource = $filestem.'/resfiles/'.$res.'.html';
+                if (grep/^$res$/,@{$packages}) {
+                    $resource =  $filestem.'/resfiles/'.$res.'./index.html'; # entry_point
+                }
+                print PAGEFILE qq|<resource src="$resource" id="$final_id" type="finish" title="$$items{$pagecontents{$key}[$i][-1]}{title}"></resource>\n|;
             }
             print PAGEFILE "</map>";
             close(PAGEFILE);
@@ -686,13 +875,18 @@ sub build_structure {
 }
 
 sub make_structure {
-    my ($cms,$key,$srcstem,$flag,$count,$timestamp,$boardnum,$hrefs,$pagecontents,$res,$type,$resinfo,$contitem,$uname,$cdom) = @_;
+    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' && ($$resinfo{$res}{'isfolder'} eq 'true')  || ($key eq 'Top')) ) {
+    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)) {
         $src = $srcstem.'/sequences/'.$contitem.'.sequence';
         $$flag{$key}{page} = 0;
         $$flag{$key}{seq} = 1;
         $$count{$key}{seq} ++;
+    } elsif ($cms eq 'webct4' && $randompick) {
+        $src = $srcstem.'/sequences/'.$res.'.sequence';
+        $$flag{$key}{page} = 0;
+        $$flag{$key}{seq} = 1;
+        $$count{$key}{seq} ++;
     } elsif ($cms eq 'angel' && $type eq 'BOARD') {
         $src = '/adm/'.$cdom.'/'.$uname.'/'.$$timestamp[$$boardnum{$res}].'/bulletinboard'; 
         $$flag{$key}{page} = 0;
@@ -709,7 +903,7 @@ sub make_structure {
     } elsif ($cms eq 'angel' && (($type eq "PAGE") || ($type eq "LINK")) )  {
         if ($$flag{$key}{page}) {
             if ($$count{$key}{page} == -1) {
-                print STDERR "Array index is -1, we shouldnt be here, key is $key, type is $type\n";
+                &Apache::lonnet::logthis("IMS Angel import error in array index for page: value = -1, resource is $key, type is $type.");
             } else { 
                 push @{$$pagecontents{$key}[$$count{$key}{page}]},$contitem;
             }
@@ -719,14 +913,46 @@ sub make_structure {
             @{$$pagecontents{$key}[$$count{$key}{page}]} = ("$contitem");
             $$flag{$key}{seq} = 0;
         }
-    } elsif ($cms eq 'bb5') {
+    } elsif ($cms eq 'bb5' || $cms eq 'bb6') {
         if ($$flag{$key}{page}) {
             push @{$$pagecontents{$key}[$$count{$key}{page}]},$contitem;
         } else {
+            if ($contcount == 1) {
+                if ($packageflag) {
+                    $src = $srcstem.'/resfiles/'.$res.'/index.html'; # Needs to be entry point
+                } else {
+                    $src = $srcstem.'/resfiles/'.$res.'.html';
+                }
+            } else {
+                $$count{$key}{page} ++;
+                $src = $srcstem.'/pages/'.$key.'_'.$$count{$key}{page}.'.page';
+                @{$$pagecontents{$key}[$$count{$key}{page}]} = ("$contitem");
+            }
+            $$flag{$key}{seq} = 0;
+        }
+    } elsif ($cms eq 'webct4') {
+        if ($type eq 'webctquiz') {
+            $src =  $srcstem.'/pages/'.$res.'.page';
             $$count{$key}{page} ++;
-            $src = $srcstem.'/pages/'.$key.'_'.$$count{$key}{page}.'.page';
-            @{$$pagecontents{$key}[$$count{$key}{page}]} = ("$contitem");
             $$flag{$key}{seq} = 0;
+        } else {
+            if (grep/^$file$/,@{$$hrefs{$res}}) {
+                my $filename;
+                if ($file =~ m-/([^/]+)$-) {
+                    $filename = $1;
+                }
+                $src =  $srcstem.'/resfiles/'.$res.'/'.$filename;
+            } else {
+                foreach my $file (@{$$hrefs{$res}}) {
+                    my $filename;
+                    if ($file =~ m-/([^/]+)$-) {
+                        $filename = $1;
+                    }
+                    $src = $srcstem.'/resfiles/'.$res.'/'.$filename;
+                }
+            }
+            $$flag{$key}{page} = 0;
+            $$flag{$key}{file} = 1;
         }
     }
     return $src;
@@ -750,12 +976,14 @@ sub process_specials {
                   quizzes => 'quizzes',
                   surveys => 'surveys',
                   announcements => 'announcements',
+                  pools => 'pools'
                   );
     my %seqtitles = (
                   boards => 'Course Bulletin Boards',
                   quizzes => 'Course Quizzes',
                   surveys => 'Course Surveys',
                   announcements => 'Course Announcements',
+                  pools => 'Course Question Pools'
                    );
     $$topnum ++;
 
@@ -797,6 +1025,8 @@ sub process_specials {
         $specialsrc = "/adm/$udom/$uname/$$timestamp[0]/bulletinboard";
     } elsif ($type eq 'announcements') {
         $specialsrc = "$seqstem/resfiles/$$specials[0].html";
+    } elsif ($type eq 'pools') {
+        $specialsrc = "$seqstem/sequences/$$specials[0].sequence";
     } else {
         $specialsrc = "$seqstem/pages/$$specials[0].page";
     }
@@ -846,13 +1076,13 @@ sub process_user {
      [sub {
         my ($tagname, $attr) = @_;
         push @state, $tagname;
-        if (@state eq "USERS USER") {
+        if ("@state" eq "USERS USER") {
             $userid = $attr->{value};
             %{$$settings{$userid}} = ();
             @{$$settings{$userid}{links}} = ();
-        } elsif (@state eq "USERS USER LOGINID") {  
+        } elsif ("@state" eq "USERS USER LOGINID") {  
             $$settings{$userid}{loginid} = $attr->{value};
-        } elsif (@state eq "USERS USER PASSPHRASE") {  
+        } elsif ("@state" eq "USERS USER PASSPHRASE") {  
             $$settings{$userid}{passphrase} = $attr->{value};
         } elsif ("@state" eq "USERS USER STUDENTID" ) {
             $$settings{$userid}{studentid} = $attr->{value};
@@ -890,7 +1120,7 @@ sub process_user {
      end_h =>
      [sub {
         my ($tagname) = @_;
-        if (@state eq "USERS USER") {
+        if ("@state" eq "USERS USER") {
             $linknum = 0;
         }
         pop @state;
@@ -927,14 +1157,14 @@ sub process_group {
      [sub {
         my ($tagname, $attr) = @_;
         push @state, $tagname;
-        if (@state eq "GROUPS GROUP") {
+        if ("@state" eq "GROUPS GROUP") {
             $grp = $attr->{id};
         }        
-        if (@state eq "GROUPS GROUP TITLE") {
+        if ("@state" eq "GROUPS GROUP TITLE") {
             $$settings{$grp}{title} = $attr->{value};
-        } elsif (@state eq "GROUPS GROUP FLAGS ISAVAILABLE") {  
+        } elsif ("@state" eq "GROUPS GROUP FLAGS ISAVAILABLE") {  
             $$settings{$grp}{isavailable} = $attr->{value};
-        } elsif (@state eq "GROUPS GROUP FLAGS HASCHATROOM") {  
+        } elsif ("@state" eq "GROUPS GROUP FLAGS HASCHATROOM") {  
             $$settings{$grp}{chat} = $attr->{value};
         } elsif ("@state" eq "GROUPS GROUP FLAGS HASDISCUSSIONBOARD") {
             $$settings{$grp}{discussion} = $attr->{value};
@@ -979,11 +1209,11 @@ sub process_staff {
      [sub {
         my ($tagname, $attr) = @_;
         push @state, $tagname;
-        if (@state eq "STAFFINFO TITLE") {
+        if ("@state" eq "STAFFINFO TITLE") {
             $$settings{title} = $attr->{value};
-        } elsif (@state eq "STAFFINFO BIOGRAPHY TEXTCOLOR") {
+        } elsif ("@state" eq "STAFFINFO BIOGRAPHY TEXTCOLOR") {
             $$settings{textcolor} = $attr->{value};
-        } elsif (@state eq "STAFFINFO BIOGRAPHY FLAGS ISHTML") {
+        } elsif ("@state" eq "STAFFINFO BIOGRAPHY FLAGS ISHTML") {
             $$settings{ishtml} = $attr->{value};
         } elsif ("@state" eq "STAFFINFO FLAGS ISAVAILABLE" ) {
             $$settings{isavailable} = $attr->{value};
@@ -1156,12 +1386,12 @@ sub process_link {
         [sub {
             my ($tagname, $attr) = @_;
             push @state, $tagname;
-            if (@state eq "EXTERNALLINK TITLE") {
+            if ("@state" eq "EXTERNALLINK TITLE") {
                 $$settings{title} = $attr->{value};
-            } elsif (@state eq "EXTERNALLINK TEXTCOLOR") {  
+            } elsif ("@state" eq "EXTERNALLINK TEXTCOLOR") {  
                 $$settings{textcolor} = $attr->{value};
-            } elsif (@state eq "EXTERNALLINK DESCRIPTION FLAGS ISHTML") {  
-                $$settings{ishtml} = $attr->{value};                               
+            } elsif ("@state" eq "EXTERNALLINK DESCRIPTION FLAGS ISHTML") {  
+                $$settings{ishtml} = $attr->{value};
             } elsif ("@state" eq "EXTERNALLINK FLAGS ISAVAILABLE" ) {
                 $$settings{isavailable} = $attr->{value};
             } elsif ("@state" eq "EXTERNALLINK FLAGS LAUNCHINNEWWINDOW" ) {
@@ -1171,7 +1401,7 @@ sub process_link {
             } elsif ("@state" eq "EXTERNALLINK POSITION" ) {
                 $$settings{position} = $attr->{value};
             } elsif ("@state" eq "EXTERNALLINK URL" ) {
-              $$settings{url} = $attr->{value};
+                $$settings{url} = $attr->{value};
             }
         }, "tagname, attr"],
         text_h =>
@@ -1435,19 +1665,11 @@ sub addposting {
     }
     return $status;
 }
-# ---------------------------------------------------------------- Process Blackboard Assessments - pools, quizzes, surveys
-sub process_assessment {
-    my ($res,$docroot,$container,$dirname,$destdir,$settings,$total,$udom,$uname) = @_;
+
+sub parse_bb5_assessment {
+    my ($res,$docroot,$container,$settings,$allanswers,$allchoices,$allids) = @_;
     my $xmlfile = $docroot.'/'.$res.".dat";
-#  print "XML file is $xmlfile\n";
     my @state = ();
-    my @allids = ();
-    my %allanswers = ();
-    my %allchoices = ();
-    my $resdir = '';
-    if ($docroot =~ m|public_html/(.+)$|) {
-        $resdir = $1;
-    }
     my $id; # the current question ID
     my $answer_id; # the current answer ID
     my %toptag = ( pool => 'POOL',
@@ -1493,11 +1715,9 @@ sub process_assessment {
         }    
         if ("@state" eq "$toptag{$container} QUESTIONLIST QUESTION") {  
             $id = $attr->{id};
-            unless ($container eq 'pool') {
-                push @allids, $id;
-            }
+            push @{$allids}, $id;
             %{$$settings{$id}} = ();
-            @{$allanswers{$id}} = ();
+            @{$$allanswers{$id}} = ();
             $$settings{$id}{class} = $attr->{class};
             unless ($container eq "pool") {
                 $$settings{$id}{points} = $attr->{points};
@@ -1507,7 +1727,7 @@ sub process_assessment {
             $id = $attr->{id};
         } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "BODY") && ($state[3] eq "FLAGS") ) {
             if ($state[4] eq "ISHTML") {
-                $$settings{$id}{html} = $attr->{value};
+                $$settings{$id}{ishtml} = $attr->{value};
             } elsif ($state[4] eq "ISNEWLINELITERAL") {
                 $$settings{$id}{newline} = $attr->{value};
             }
@@ -1519,7 +1739,7 @@ sub process_assessment {
             $$settings{$id}{name} = $attr->{name};
         } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[-1] eq "ANSWER") ) {
             $answer_id = $attr->{id};
-            push @{$allanswers{$id}},$answer_id;
+            push @{$$allanswers{$id}},$answer_id;
             %{$$settings{$id}{$answer_id}} = ();
             $$settings{$id}{$answer_id}{position} = $attr->{position};
             if ($$settings{$id}{class} eq 'QUESTION_MATCH') {
@@ -1528,7 +1748,7 @@ sub process_assessment {
             }
         } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[-1] eq "CHOICE") ) {
             $answer_id = $attr->{id};
-            push @{$allchoices{$id}},$answer_id; 
+            push @{$$allchoices{$id}},$answer_id; 
             %{$$settings{$id}{$answer_id}} = ();
             $$settings{$id}{$answer_id}{position} = $attr->{position};
             $$settings{$id}{$answer_id}{placement} = $attr->{placement};
@@ -1563,6 +1783,8 @@ sub process_assessment {
      text_h =>
      [sub {
         my ($text) = @_;
+        $text =~ s/^\s+//g;
+        $text =~ s/\s+$//g;
         unless ($container eq "pool") {        
             if ("@state" eq "ASSESSMENT DESCRIPTION TEXT") {
                 $$settings{description} = $text;
@@ -1570,16 +1792,459 @@ sub process_assessment {
                 $$settings{instructions}{text} = $text;
             }
         }
-        if ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "BODY") && ($state[3] eq "TEXT") ) {
+        if ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "BODY") && ($state[-1] eq "TEXT") ) {
+            unless ($text eq '') { 
+                $$settings{$id}{text} = $text;
+            }
+        } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "ANSWER") && ($state[-1] eq "TEXT") ) {
+            unless ($text eq '') {
+                $$settings{$id}{$answer_id}{text} = $text;
+            }
+        } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "CHOICE") && ($state[-1] eq "TEXT") ) {
+            unless ($text eq '') {
+                $$settings{$id}{$answer_id}{text} = $text;
+            }
+        } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "GRADABLE") && ($state[-1] eq "FEEDBACK_WHEN_CORRECT") ) {
+            unless ($text eq '') {
+                $$settings{$id}{feedback_corr} = $text;
+            }
+        } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "GRADABLE") && ($state[-1] eq "FEEDBACK_WHEN_INCORRECT") ) {
+            unless ($text eq '') {
+                $$settings{$id}{feedback_incorr} = $text;
+            }
+        }
+      }, "dtext"],
+     end_h =>
+     [sub {
+        my ($tagname) = @_;
+        pop @state;
+     }, "tagname"],
+    );
+    $p->unbroken_text(1);
+    $p->marked_sections(1);
+    $p->parse_file($xmlfile);
+    $p->eof;
+}
+
+sub parse_bb6_assessment {
+     my ($res,$docroot,$container,$settings,$allanswers,$allchoices,$allids) = @_;
+     return;
+}
+
+sub parse_webct4_assessment {
+    my ($res,$docroot,$href,$container,$allids) = @_;
+    my $xmlfile = $docroot.'/'.$href; #quiz file
+    my @state = ();
+    my $id; # the current question ID
+    my $p = HTML::Parser->new
+    (
+     xml_mode => 1,
+     start_h =>
+     [sub {
+        my ($tagname, $attr) = @_;
+        push @state, $tagname;
+        my $depth = 0;
+        my @seq = ();
+        if ("@state" eq "questestinterop assessment section itemref") {
+            $id = $attr->{linkrefid}; 
+            push(@{$allids},$id);
+        }
+     }, "tagname, attr"],
+     text_h =>
+     [sub {
+        my ($text) = @_;
+      }, "dtext"],
+     end_h =>
+     [sub {
+        my ($tagname) = @_;
+        pop @state;
+     }, "tagname"],
+    );
+    $p->unbroken_text(1);
+    $p->parse_file($xmlfile);
+    $p->eof;
+}
+
+sub parse_webct4_quizprops {
+    my ($res,$docroot,$href,$container,$qzparams) = @_;
+    my $xmlfile = $docroot.'/'.$href; #properties file
+    my @state = ();
+    %{$$qzparams{$res}} = ();
+    my $p = HTML::Parser->new
+    (
+     xml_mode => 1,
+     start_h =>
+     [sub {
+        my ($tagname, $attr) = @_;
+        push @state, $tagname;
+     }, "tagname, attr"],
+     text_h =>
+     [sub {
+        my ($text) = @_;
+        if ($state[0] eq 'properties' && $state[1] eq 'delivery')  {
+            if ($state[2] eq 'time_available') {
+                $$qzparams{$res}{opendate} = $text;
+            } elsif ($state[2] eq 'time_due') {
+                $$qzparams{$res}{duedate} = $text;
+            } elsif ($state[3] eq 'max_attempt') {
+                $$qzparams{$res}{tries} = $text;
+            } elsif ($state[3] eq 'post_submission') {
+                $$qzparams{$res}{posts} = $text;
+            } elsif ($state[3] eq 'method') {
+                $$qzparams{$res}{method} = $text;
+            }
+        } elsif ($state[0] eq 'properties' && $state[1] eq 'processing')  {
+            if ($state[2] eq 'scores' && $state[3] eq 'score') {
+                $$qzparams{$res}{weight} = $text;
+            } elsif ($state[2] eq 'selection' && $state[3] eq 'select') {
+                $$qzparams{$res}{numpick} = $text;
+            }
+        } elsif ($state[0] eq 'properties' && $state[1] eq 'result') {
+            if ($state[2] eq 'display_answer') {
+                $$qzparams{$res}{showanswer} = $text;
+            }
+        } 
+      }, "dtext"],
+     end_h =>
+     [sub {
+        my ($tagname) = @_;
+        pop @state;
+     }, "tagname"],
+    );
+    $p->unbroken_text(1);
+    $p->parse_file($xmlfile);
+    $p->eof;
+}
+
+sub parse_webct4_questionDB {
+    my ($docroot,$href,$catinfo,$settings,$allanswers,$allchoices,$allids) = @_;
+    $href =~ s#[^/]+$##;
+    my $xmlfile = $docroot.'/'.$href.'questionDB.xml'; #quizDB file
+    my @state = ();
+    my $category; # the current category ID
+    my $id; # the current question ID
+    my $list; # the current list ID for multiple choice questions
+    my $numid; # the current answer ID for numerical questions
+    my $grp; # the current group ID for matching questions
+    my $label; # the current reponse label for string questions 
+    my $str_id; # the current string ID for string questions
+    my $unitid; # the current unit ID for numerical questions
+    my $answer_id; # the current answer ID
+    my $fdbk; # the current feedback ID
+    my $currvar; # the current variable for numerical problems
+    my $fibtype; # the current fill-in-blank type for numerical or string
+    my $prompt;
+    my $boxnum; 
+    my %setvar = (
+                   varname => '',
+                   action => '',
+                 );
+    my $currtexttype;
+    my $currimagtype;  
+    my $p = HTML::Parser->new
+    (
+     xml_mode => 1,
+     start_h =>
+     [sub {
+        my ($tagname, $attr) = @_;
+        push @state, $tagname;
+        if ("@state" eq "questestinterop section") {
+            $category = $attr->{ident};
+            %{$$catinfo{$category}} = ();
+            $$catinfo{$category}{title} = $attr->{title};   
+        }
+        if ("@state" eq "questestinterop section item") {
+            $id = $attr->{ident};
+            push @{$allids}, $id;
+            push(@{$$catinfo{$category}{contents}},$id);
+            %{$$settings{$id}} = ();
+            @{$$allchoices{$id}} = ();
+            @{$$settings{$id}{grps}} = ();
+            @{$$settings{$id}{lists}} = ();
+            @{$$settings{$id}{feedback}} = ();
+            @{$$settings{$id}{str}} = ();
+            %{$$settings{$id}{strings}} = ();
+            @{$$settings{$id}{numids}} = ();
+            @{$$settings{$id}{boxes}} = ();
+            %{$$allanswers{$id}} = ();
+            $$settings{$id}{title} = $attr->{title};
+            $$settings{$id}{category} = $category;
+            $boxnum = 0;
+        }
+
+        if ("@state" eq "questestinterop section item presentation material mattext") {
+            $$settings{$id}{texttype} = $attr->{texttype};
+            $currtexttype = $attr->{texttype};
+        }
+        if ("@state" eq "questestinterop section item presentation material matimage") {
+            $$settings{$id}{imagtype} = $attr->{imagtype};
+            $currimagtype = $attr->{imagtype};
+            $$settings{$id}{uri} = $attr->{uri};
+        }
+
+# Matching
+        if ("@state" eq "questestinterop section item presentation response_grp") {
+            $$settings{$id}{class} = 'match';
+            $grp = $attr->{ident};
+            push(@{$$settings{$id}{grps}},$grp);
+            %{$$settings{$id}{$grp}} = ();
+            @{$$settings{$id}{$grp}{correctanswer}} = ();
+            $$settings{$id}{$grp}{rcardinality} = $attr->{rcardinality};
+        }
+        if ("@state" eq "questestinterop section item presentation response_grp material mattext") { 
+            $$settings{$id}{$grp}{texttype} = $attr->{texttype};
+            $currtexttype = $attr->{texttype};
+        }
+        if ("@state" eq "questestinterop section item presentation response_grp render_choice response_label") {
+            $answer_id = $attr->{ident};
+            push(@{$$allanswers{$id}{$grp}},$answer_id);
+            %{$$settings{$id}{$grp}{$answer_id}} = ();
+            $$settings{$id}{$grp}{$answer_id}{texttype} =  $attr->{texttype};
+            $currtexttype = $attr->{texttype};
+        }
+
+# Multiple choice
+
+        if ("@state" eq "questestinterop section item presentation flow material mattext") {
+            $$settings{$id}{texttype} = $attr->{texttype};
+            $currtexttype = $attr->{texttype};
+        }
+        if ("@state" eq "questestinterop section item presentation flow response_lid") {
+            $$settings{$id}{class} = 'multiplechoice';
+            $list = $attr->{ident};
+            push(@{$$settings{$id}{lists}},$list);
+            %{$$settings{$id}{$list}} = ();
+            @{$$allanswers{$id}{$list}} = ();
+            @{$$settings{$id}{$list}{correctanswer}} = ();
+            $$settings{$id}{$list}{rcardinality} = $attr->{rcardinality};
+        }
+        if ("@state" eq "questestinterop section item presentation flow response_lid render_choice") {
+            $$settings{$id}{$list}{randomize} = $attr->{shuffle};
+        }
+        if ("@state" eq "questestinterop section item presentation flow response_lid render_choice flow_label response_label") {
+            $answer_id = $attr->{ident};
+            push(@{$$allanswers{$id}{$list}},$answer_id);
+            %{$$settings{$id}{$list}{$answer_id}} = ();
+        }
+        if ("@state" eq "questestinterop section item presentation flow response_lid render_choice flow_label response_label material mattext") {
+            $$settings{$id}{$list}{$answer_id}{texttype} = $attr->{texttype};
+            $currtexttype = $attr->{texttype};
+        }
+
+# Numerical
+        if ("@state" eq "questestinterop section item presentation material mat_extension webct:x_webct_v01_dynamicmattext") {
+            $$settings{$id}{texttype} = $attr->{texttype};
+            $currtexttype = $attr->{texttype};
+        }
+        if ("@state" eq "questestinterop section item presentation response_num") {
+            $$settings{$id}{class} = 'numerical';
+            $numid = $attr->{ident};
+            push(@{$$settings{$id}{numids}},$numid);
+            %{$$settings{$id}{$numid}} = ();
+            %{$$settings{$id}{$numid}{vars}} = ();
+            @{$$settings{$id}{$numid}{units}} = ();
+            $$settings{$id}{$numid}{rcardinality} = $attr->{rcardinality};
+        }
+        if ("@state" eq "questestinterop section item presentation response_num material mat_extension webct:x_webct_v01_dynamicdata webct:x_webct_v01_datarange webct:x_webct_v01_minvalue webct:x_webct_v01_variable") {            
+            $currvar = $attr->{name};
+            %{$$settings{$id}{$numid}{vars}{$currvar}} = ();
+        }
+        if ("@state" eq "questestinterop section item presentation response_num material mat_extension webct:x_webct_v01_dynamicdata webct:x_webct_v01_datarange webct:x_webct_v01_maxvalue webct:x_webct_v01_variable") {
+            $currvar = $attr->{name};
+        }
+        if ("@state" eq "questestinterop section item presentation response_num material mat_extension webct:x_webct_v01_dynamicdata webct:x_webct_v01_datarange webct:x_webct_v01_decimalnum webct:x_webct_v01_variable") {
+            $currvar = $attr->{name};
+        }
+        if ("@state" eq "questestinterop section item presentation response_num render_fib") {
+            $fibtype = $attr->{fibtype};
+            $prompt = $attr->{prompt};
+        }
+        if ("@state" eq "questestinterop section item presentation response_num render_fib response_label") {
+            $$settings{$id}{$numid}{label} = $attr->{ident};
+        }
+
+# String or Numerical
+        if ("@state" eq "questestinterop section item presentation response_str") {
+            $str_id = $attr->{ident};
+            push(@{$$settings{$id}{str}},$str_id);
+            @{$$settings{$id}{boxes}[$boxnum]} = ();
+            $boxnum ++;
+            %{$$settings{$id}{$str_id}} = ();
+            @{$$settings{$id}{$str_id}{labels}} = ();
+            $$settings{$id}{$str_id}{rcardinality} = $attr->{rcardinality};
+        }
+
+        if ("@state" eq "questestinterop section item presentation response_str render_fib") {
+            $fibtype = $attr->{fibtype};
+            $prompt = $attr->{prompt};
+        }    
+        if ("@state" eq "questestinterop section item presentation response_str render_fib response_label") {
+            $label = $attr->{ident};
+            push(@{$$settings{$id}{$str_id}{labels}},$label);
+            @{$$settings{$id}{strings}{$label}} = ();
+            %{$$settings{$id}{$str_id}{$label}} = ();
+            $$settings{$id}{$str_id}{$label}{fibtype} = $fibtype;
+        }
+
+# Numerical
+        if ("@state" eq "questestinterop section item resprocessing itemproc_extension webct:x_webct_v01_autocalculate webct:x_webct_v01_anspresentation") {
+            $$settings{$id}{$numid}{digits} = $attr->{digits};
+            $$settings{$id}{$numid}{format} = $attr->{format};
+        }
+        if ("@state" eq "questestinterop section item resprocessing itemproc_extension webct:x_webct_v01_autocalculate webct:x_webct_v01_anstolerance") {
+            $$settings{$id}{$numid}{toltype} = $attr->{type};
+        }
+        if ("@state" eq "questestinterop section item resprocessing itemproc_extension webct:x_webct_v01_autocalculate webct:x_webct_v01_unit") {
+            my $unitid = $attr->{ident};
+            %{$$settings{$id}{$numid}{$unitid}} = ();
+            push(@{$$settings{$id}{$numid}{units}},$unitid);
+            $$settings{$id}{$numid}{$unitid}{value} = $attr->{value}; 
+            $$settings{$id}{$numid}{$unitid}{space} = $attr->{space};
+            $$settings{$id}{$numid}{$unitid}{case} = $attr->{case};
+        }
+
+# Matching 
+        if ("@state" eq "questestinterop section item resprocessing respcondition conditionvar varequal") {
+            if ($$settings{$id}{class} eq 'match') {
+                unless ($attr->{respident} eq 'WebCT_Incorrect') {
+                    $grp = $attr->{respident};
+                }
+# String
+            } else {
+                $label = $attr->{respident};
+                $$settings{$id}{$label}{case} = $attr->{case};   
+            } 
+        }
+        if ("@state" eq "questestinterop section item resprocessing respcondition setvar") {
+            $setvar{varname} = $attr->{varname};
+            if ($setvar{varname} eq 'WebCT_Correct') {
+                push(@{$$settings{$id}{$grp}{correctanswer}},$answer_id);
+            }
+        }
+
+# String
+        if ("@state" eq "questestinterop section item resprocessing") {
+            $boxnum = -1;
+        }
+        if ("@state" eq "questestinterop section item resprocessing respcondition") {            $boxnum ++;
+        }
+        if ("@state" eq "questestinterop section item resprocessing respcondition conditionvar varsubset") {
+            $$settings{$id}{class} = 'string';
+            $label = $attr->{respident};
+        }
+        if ("@state" eq "questestinterop section item resprocessing respcondition conditionvar not") {
+            $$settings{$id}{class} = 'paragraph';
+        }
+ 
+
+# Feedback
+ 
+        if ("@state" eq "questestinterop section item respcondition displayfeedback") {
+            $fdbk = $attr->{linkrefid};
+            push(@{$$settings{$id}{feedback}},$fdbk);
+            $$settings{$id}{$fdbk} = ();
+            $$settings{$id}{$fdbk}{feedbacktype} = $attr->{feedbacktype};
+        }
+        if ("@state" eq "questestinterop section item itemfeedback") {
+            $fdbk = $attr->{ident};
+            $$settings{$id}{$fdbk}{view} = $attr->{view};
+        }
+        if ("@state" eq "questestinterop section item itemfeedback material mattext") {
+            $$settings{$id}{$fdbk}{texttype} = $attr->{texttype};
+            $currtexttype = $attr->{texttype};
+        }
+     }, "tagname, attr"],
+     text_h =>
+     [sub {
+        my ($text) = @_;
+        if ($currtexttype eq '/text/html') {
+            $text =~ s#(&lt;img\ssrc=")([^"]+)"&gt;#$1../resfiles/$2#g;
+        }
+        if ("@state" eq "questestinterop section item itemmetadata qmd_itemtype") {
+            $$settings{$id}{itemtype} = $text;
+            if ($text eq 'String') {
+                $$settings{$id}{class} = 'string';
+            }
+        }
+
+        if ("@state" eq "questestinterop section item presentation material mattext") {
             $$settings{$id}{text} = $text;
-        } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "ANSWER") && ($state[3] eq "TEXT") ) {
-            $$settings{$id}{$answer_id}{text} = $text;
-        } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "CHOICE") && ($state[3] eq "TEXT") ) {
-            $$settings{$id}{$answer_id}{text} = $text;            
-        } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "GRADABLE") && ($state[3] eq "FEEDBACK_WHEN_CORRECT") ) {
-            $$settings{$id}{feedback_corr} = $text;
-        } elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "GRADABLE") && ($state[3] eq "FEEDBACK_WHEN_INCORRECT") ) {
-            $$settings{$id}{feedback_incorr} = $text;       
+        }
+# Matching
+        if ("@state" eq "questestinterop section item presentation response_grp material mattext") {
+            $$settings{$id}{$grp}{text} = $text;
+            unless ($text eq '') {
+                push(@{$$allchoices{$id}},$grp);
+            }
+        }
+        if ("@state" eq "questestinterop section item presentation response_grp render_choice response_label material mattext") {
+            $$settings{$id}{$grp}{$answer_id}{text} = $text;
+        }
+
+# Multiple choice
+
+        if ("@state" eq "questestinterop section item presentation flow material mattext") {
+            $$settings{$id}{text} = $text;
+        }
+
+        if ("@state" eq "questestinterop section item presentation flow response_lid render_choice flow_label response_label material mattext") {
+            $$settings{$id}{$list}{$answer_id}{text} = $text;
+        }
+
+# Numerical
+        if ("@state" eq "questestinterop section item presentation material mat_extension webct:x_webct_v01_dynamicmattext") {
+            $$settings{$id}{text} = $text;
+        }
+        if ("@state" eq "questestinterop section item presentation response_num material mat_extension webct:x_webct_v01_dynamicdata webct:x_webct_v01_datarange webct:x_webct_v01_minvalue webct:x_webct_v01_variable") {
+             $$settings{$id}{$numid}{vars}{$currvar}{min} = $text;
+        }
+        if ("@state" eq "questestinterop section item presentation response_num material mat_extension webct:x_webct_v01_dynamicdata webct:x_webct_v01_datarange webct:x_webct_v01_maxvalue webct:x_webct_v01_variable") {
+             $$settings{$id}{$numid}{vars}{$currvar}{max} = $text;
+        }
+        if ("@state" eq "questestinterop section item presentation response_num material mat_extension webct:x_webct_v01_dynamicdata webct:x_webct_v01_datarange webct:x_webct_v01_decimalnum webct:x_webct_v01_variable") {
+             $$settings{$id}{$numid}{vars}{$currvar}{dec} = $text;
+        }
+        if ("@state" eq "questestinterop section item resprocessing itemproc_extension webct:x_webct_v01_autocalculate webct:x_webct_v01_formula") {
+            $$settings{$id}{$numid}{formula} = $text;
+        }
+        if ("@state" eq "questestinterop section item resprocessing respcondition conditionvar varequal") {
+            if ($$settings{$id}{class} eq 'string') {
+                unless (grep/^$text$/,@{$$settings{$id}{strings}{$label}}) {
+                    push(@{$$settings{$id}{strings}{$label}},$text);
+                }
+                unless (grep/^$text$/,@{$$settings{$id}{boxes}[$boxnum]}) {
+                    push(@{$$settings{$id}{boxes}[$boxnum]},$text);
+                }
+            } else {
+                $answer_id = $text;
+            }
+        }
+        if ("@state" eq "questestinterop section item resprocessing respcondition conditionvar varsubset") { # String
+            unless (grep/^$text$/,@{$$settings{$id}{strings}{$label}}) {
+                push(@{$$settings{$id}{strings}{$label}},$text);
+            }
+            unless (grep/^$text$/,@{$$settings{$id}{boxes}[$boxnum]}) {
+                push(@{$$settings{$id}{boxes}[$boxnum]},$text);
+            }
+        }
+        if ("@state" eq "questestinterop section item resprocessing respcondition setvar") {
+            if ($setvar{varname} eq "answerValue") { # Multiple Choice
+                if ($text =~ m/^\d+$/) {
+                    if ($text > 0) {
+                        push(@{$$settings{$id}{$list}{correctanswer}},$answer_id);   
+                    }
+                }
+            }
+        }
+        if ("@state" eq "questestinterop section item resprocessing itemproc_extension webct:x_webct_v01_autocalculate webct:x_webct_v01_anstolerance") {
+            $$settings{$id}{$numid}{tolerance} = $text;
+        }
+        if ("@state" eq "questestinterop section item resprocessing itemproc_extension webct:x_webct_v01_autocalculate webct:x_webct_v01_unit") {
+            $$settings{$id}{$numid}{$unitid}{text} = $text;
+        }
+
+        if ("@state" eq "questestinterop section item itemfeedback material mattext") {
+            $$settings{$id}{$fdbk}{text} = $text;
         }
       }, "dtext"],
      end_h =>
@@ -1591,186 +2256,480 @@ sub process_assessment {
     $p->unbroken_text(1);
     $p->parse_file($xmlfile);
     $p->eof;
+    my $boxcount;
+    foreach my $id (keys %{$settings}) {
+        if ($$settings{$id}{class} eq 'string') {
+            $boxcount = 0;
+            if (@{$$settings{$id}{boxes}} > 1) {
+                foreach my $str_id (@{$$settings{$id}{str}}) {
+                    foreach my $label (@{$$settings{$id}{$str_id}{labels}}) {
+                        @{$$settings{$id}{strings}{$label}} = @{$$settings{$id}{boxes}[$boxcount]};
+                        $boxcount ++;
+                    }
+                }
+            }
+        }
+    }
+}
 
-    my $dirtitle = $$settings{'title'};
-    $dirtitle =~ s/\W//g;
-    $dirtitle .= '_'.$res;
-    if (!-e "$destdir/problems/$dirtitle") {
-        mkdir("$destdir/problems/$dirtitle",0755);
+sub process_assessment {
+    my ($cms,$context,$res,$docroot,$container,$dirname,$destdir,$settings,$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,$dbparse,$resources,$items,$catinfo,$qzdbsettings,$hrefs) = @_;
+    my @allids = ();
+    my %allanswers = ();
+    my %allchoices = ();
+    my %qzparams = ();
+    my @allquestids = ();
+    my %alldbanswers = ();
+    my %alldbchoices = ();
+    my @alldbquestids = ();
+    my $containerdir;
+    my $newdir;
+    my $randompickflag = 0;
+    my ($cid,$cdom,$cnum);
+    if ($context eq 'DOCS') {
+        $cid = $env{'request.course.id'};
+        ($cdom,$cnum) = split/_/,$cid;
+    }
+    my $destresdir = $destdir;
+    if ($context eq 'CSTR') {
+        $destresdir =~ s|/home/$uname/public_html/|/res/$udom/$uname/|;
+    } elsif ($context eq 'DOCS') {
+        $destresdir =~ s|^/home/httpd/html/userfiles|/uploaded|;
+    }
+    if ($cms eq 'bb5') {
+        &parse_bb5_assessment($res,$docroot,$container,$settings,\%allanswers,\%allchoices,\@allids);
+    } elsif ($cms eq 'bb6') {
+        &parse_bb6_assessment($res,$docroot,$container,$settings,\%allanswers,\%allchoices,\@allids);
+    } elsif ($cms eq 'webct4') {
+        unless($$dbparse) {
+            &parse_webct4_questionDB($docroot,$$resources{$res}{file},$catinfo,$qzdbsettings,\%alldbanswers,\%alldbchoices,\@alldbquestids);
+            if (!-e "$destdir/sequences") {
+                mkdir("$destdir/sequences",0755);
+            }
+            my $numcats = scalar(keys %{$catinfo});
+            my $curr_id = 0;
+            my $next_id = 1;
+            my $fh;
+            open($fh,">$destdir/sequences/question_database.sequence");
+            push @{$sequencesfiles},'question_database.sequence';
+            foreach my $category (sort keys %{$catinfo}) {
+                my $seqname = $$catinfo{$category}{title}.'_'.$category;
+                $seqname =~ s/\s/_/g;
+                $seqname =~ s/\W//g;
+                push(@{$sequencesfiles},$seqname.'.sequence');
+                my $catsrc = "$destresdir/sequences/$seqname.sequence";
+                if ($curr_id == 0) {
+                    print $fh qq|<resource id="1" src="$catsrc" type="start" title="$$catinfo{$category}{title}"></resource>|;
+                }
+                if ($numcats == 1) {
+                    print $fh qq|
+<link from="1" to="2" index="1"></link>
+<resource id="2" src="" type="finish">\n|;
+                } else {
+                    $curr_id = $next_id;
+                    $next_id = $curr_id + 1;
+                    $catsrc = "$destresdir/sequences/$seqname.sequence";
+                    print $fh qq|
+<link from="$curr_id" to="$next_id" index="$curr_id"></link>
+<resource id="$next_id" src="$catsrc" title="$$catinfo{$category}{title}"|;
+                    if ($next_id == $numcats) {
+                        print $fh qq| type="finish"></resource>\n|;
+                    } else {
+                        print $fh qq|></resource>\n|;
+                    }
+                }
+                print $fh qq|</map>|;
+                if (!-e "$destdir/problems") {
+                    mkdir("$destdir/problems",0755);
+                }
+                if (!-e "$destdir/problems/$seqname") {
+                    mkdir("$destdir/problems/$seqname",0755);
+                }
+                $newdir = "$destdir/problems/$seqname";
+                my $dbcontainerdir;
+                &build_problem_container($cms,$seqname,$destdir,'database',$seqname,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@{$$catinfo{$category}{contents}},$udom,$uname,$dirname,\$dbcontainerdir,$cid,$cdom,$cnum,$catinfo,$qzdbsettings);
+            }
+            close($fh);
+            &write_webct4_questions(\@alldbquestids,$context,$qzdbsettings,$dirname,\%alldbanswers,\%alldbchoices,$total,$cid,$cdom,$cnum,$destdir,$catinfo);
+            $$dbparse = 1;
+        }
+        &parse_webct4_assessment($res,$docroot,$$resources{$res}{file},$container,\@allids);
+        &parse_webct4_quizprops($res,$docroot,$$hrefs{$$items{$$resources{$res}{revitm}}{properties}}[0],$container,\%qzparams);
+        if (exists($qzparams{$res}{numpick})) { 
+            if ($qzparams{$res}{numpick} < @allids) {
+                $$randompicks{$$resources{$res}{revitm}} = $qzparams{$res}{numpick};
+                $randompickflag = 1;
+            }
+        }
     }
-    my $newdir = "$destdir/problems/$dirtitle";
+    my $dirtitle;
+    unless ($cms eq 'webct4') {
+        $dirtitle = $$settings{'title'};
+        $dirtitle =~ s/\W//g;
+        $dirtitle .= '_'.$res;
+        if (!-e "$destdir/problems") {
+            mkdir("$destdir/problems",0755);
+        }
+        if (!-e "$destdir/problems/$dirtitle") {
+            mkdir("$destdir/problems/$dirtitle",0755);
+        }
+        $newdir = "$destdir/problems/$dirtitle";
+    }
+
+    if ($cms eq 'webct4') {
+        &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);
+    }
+    if ($cms eq 'bb5') {
+        &write_bb5_questions(\@allids,$containerdir,$context,$settings,$dirname,$destdir,$res,\%allanswers,\%allchoices,$total,$newdir,$cid,$cdom,$cnum,$docroot);
+    } elsif ($cms eq 'bb6') {
+        &write_bb6_questions(\@allids,$containerdir,$context,$settings,$dirname,$destdir,$res,\%allanswers,\%allchoices,$total,$newdir,$cid,$cdom,$cnum);
+    }
+}
+
+sub build_problem_container {
+    my ($cms,$dirtitle,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,$allids,$udom,$uname,$dirname,$containerdir,$cid,$cdom,$cnum,$catinfo,$settings) = @_;
+    my $seqdir = "$destdir/sequences";
     my $pagedir = "$destdir/pages";
     my $curr_id = 0;
     my $next_id = 1;
-    unless ($container eq 'pool') {
-        open(PAGEFILE,">$pagedir/$res.page");
-        print PAGEFILE qq|<map>
-|;
-        $$total{page} ++; 
-        print PAGEFILE qq|<resource id="1" src="/res/$udom/$uname/$resdir/problems/$dirtitle/$allids[0].problem" type="start"></resource>|;
-        if (@allids == 1) {
-            print PAGEFILE qq|
+    my $fh;
+    if ($container eq 'pool' || $randompickflag || $container eq 'database') {
+        $$containerdir = $seqdir.'/'.$res.'.sequence';
+        if (!-e "$seqdir") {
+            mkdir("$seqdir",0770);
+        }
+        open($fh,">$$containerdir");
+        $$total{seq} ++;
+        push @{$sequencesfiles},$res.'.sequence';
+    } else {
+        $$containerdir = $pagedir.'/'.$res.'.page';
+        if (!-e "$destdir/pages") {
+            mkdir("$destdir/pages",0770);
+        }
+        open($fh,">$$containerdir");
+        $$total{page} ++;
+        push @{$pagesfiles},$res.'.page';
+    }
+    print $fh qq|<map>
+|;
+    my %probtitle = ();
+    my $probsrc = "/res/lib/templates/simpleproblem.problem";
+    if ($context eq 'CSTR') {
+        foreach my $id (@{$allids}) {
+            if ($cms eq 'webct4') {
+                $probtitle{$id} = $$settings{$id}{title};
+            } else {
+                $probtitle{$id} = $$settings{title};
+            }
+            $probtitle{$id} =~ s/\s/_/g;
+            $probtitle{$id} =~ s/\W//g;
+            $probtitle{$id} .= '_'.$id;
+        }
+        if ($cms eq 'webct4' && $container ne 'database') {
+            my $catid = $$settings{$$allids[0]}{category};
+            my $probdir = $$catinfo{$catid}{title}.'_'.$catid;
+            $probdir =~ s/\s/_/g;
+            $probdir =~ s/\W//g;
+            $probsrc = "$dirname/problems/$probdir/$probtitle{$$allids[0]}.problem";
+        } else {
+            $probsrc="$dirname/problems/$dirtitle/$probtitle{$$allids[0]}.problem";
+        }
+    }
+    print $fh qq|<resource id="1" src="$probsrc" type="start" title="question_0001"></resource>|;
+    if (@{$allids} == 1) {
+        print $fh qq|
 <link from="1" to="2" index="1"></link>
 <resource id="2" src="" type="finish">\n|;
-        } else {
-            for (my $j=1; $j<@allids; $j++) {
-                $curr_id = $j;
-                $next_id = $curr_id + 1;
-                print PAGEFILE qq|
-<link from="$curr_id" to="$next_id" index="$curr_id"></link>
-<resource id="$next_id" src="/res/$udom/$uname/$resdir/problems/$dirtitle/$allids[$j].problem"|;
-                if ($next_id == @allids) {
-                    print PAGEFILE qq| type="finish"></resource>\n|;
+    } else {
+        for (my $j=1; $j<@{$allids}; $j++) {
+            my $qntitle = $j+1;
+            while (length($qntitle) <4) {
+                $qntitle = '0'.$qntitle;
+            }
+            $curr_id = $j;
+            $next_id = $curr_id + 1;
+            if ($context eq 'CSTR') {
+                if ($cms eq 'webct4' && $container ne 'database') {
+                    my $catid = $$settings{$$allids[$j]}{category};
+                    my $probdir = $$catinfo{$catid}{title}.'_'.$catid;
+                    $probdir =~ s/\s/_/g;
+                    $probdir =~ s/\W//g;
+                    $probsrc = "$dirname/problems/$probdir/$probtitle{$$allids[$j]}.problem";
                 } else {
-                    print PAGEFILE qq|></resource>|;
+                    $probsrc = "$dirname/problems/$dirtitle/$probtitle{$$allids[$j]}.problem";
                 }
             }
+            print $fh qq|
+<link from="$curr_id" to="$next_id" index="$curr_id"></link>
+<resource id="$next_id" src="$probsrc" title="question_$qntitle"|;
+            if ($next_id == @{$allids}) {
+                print $fh qq| type="finish"></resource>\n|;
+            } else {
+                print $fh qq|></resource>|;
+            }
         }
-        print PAGEFILE qq|</map>|;
-        close(PAGEFILE);
     }
-    foreach my $id (@allids) {
-        my $output = qq|<problem>
+    print $fh qq|</map>|;
+    close($fh);
+}
+
+sub write_bb5_questions {
+    my ($allids,$containerdir,$context,$settings,$dirname,$destdir,$res,$allanswers,$allchoices,$total,$newdir,$cid,$cdom,$cnum,$docroot) = @_;
+    my $qnum = 0;
+    foreach my $id (@{$allids}) {
+        if ($$settings{$id}{ishtml} eq 'true') {
+            $$settings{$id}{text} = &HTML::Entities::decode($$settings{$id}{text});
+        }
+        if ($$settings{$id}{text} =~ m#<img src=['"]?(https?://[^\s]+/)([^/\s\'"]+)['"]?[^>]*>#) {
+            if (&retrieve_image($context,$res,$dirname,$cdom,$cnum,$docroot,$destdir,$1,$2) eq 'ok') {
+                $$settings{$id}{text} =~ s#(<img src=['"]?)(https?://[^\s]+/)([^/\s'"]+)(['"]?[^>]*>)#$1../../resfiles/$res/webimages/$3$4#g;
+            }
+        }
+        $$settings{$id}{text} =~ s#(<img src=[^>]+)/*>#$1 />#gi;
+        $$settings{$id}{text} =~ s#<br>#<br />#g;
+        $qnum ++;
+        my $output;
+        my $permcontainer = $containerdir;
+        $permcontainer =~ s#/home/httpd/html/userfiles#uploaded#;
+        my $symb = $cid.'.'.$permcontainer.'___'.$qnum.'___lib/templates/simpleproblem.problem.0.';
+        my %resourcedata = ();
+        for (my $i=0; $i<10; $i++) {
+            my $iter = $i+1;
+            $resourcedata{$symb.'text'.$iter} = "";
+            $resourcedata{$symb.'value'.$iter} = "unused";
+            $resourcedata{$symb.'position'.$iter} = "random";
+        }
+        $resourcedata{$symb.'randomize'} = 'yes';
+        $resourcedata{$symb.'maxfoils'} = 10;
+        if ($context eq 'CSTR') {
+            $output = qq|<problem>
 |;
+        }
         $$total{prob} ++;
         if ($$settings{$id}{class} eq "QUESTION_ESSAY") {
-            $output .= qq|<startouttext />$$settings{$id}{text}<endouttext />
+            if ($context eq 'CSTR') {
+                $output .= qq|<startouttext />$$settings{$id}{text}<endouttext />
  <essayresponse>
  <textfield></textfield>
  </essayresponse>
  <postanswerdate>
- $$settings{$id}{feedbackcorr}
+  $$settings{$id}{feedbackcorr} 
  </postanswerdate>
 |;
+             } else {
+		 $resourcedata{$symb.'questiontext'} = $$settings{$id}{text};
+                 $resourcedata{$symb.'hiddenparts'} = '!essay';
+                 $resourcedata{$symb.'questiontype'} = 'essay';
+             }
         } else {
-            $output .= qq|<startouttext />$$settings{$id}{text}\n|;
-            if ( defined($$settings{$id}{image}) ) { 
+            if ($context eq 'CSTR') {
+                $output .= qq|<startouttext />$$settings{$id}{text}\n|;
+            } else {
+                $resourcedata{$symb.'questiontext'} = $$settings{$id}{text};
+            }
+            my ($image,$imglink,$url);
+            if ( defined($$settings{$id}{image}) ) {
                 if ( $$settings{$id}{style} eq 'embed' ) {
-                    $output .= qq|<br /><img src="$dirname/resfiles/$res/$$settings{$id}{image}" /><br />|;
+                    $image = qq|<br /><img src="$dirname/resfiles/$res/$$settings{$id}{image}" /><br />|;
                 } else {
-                    $output .= qq|<br /><a href="$dirname/resfiles/$res/$$settings{$id}{image}">Link to file</a><br />|;
+                    $imglink = qq|<br /><a href="$dirname/resfiles/$res/$$settings{$id}{image}">Link to file</a><br />|;
                 }
             }
             if ( defined($$settings{$id}{url}) ) {
-                $output .= qq|<br /><a href="$$settings{$id}{url}">$$settings{$id}{name}</a><br />|;
+                $url = qq|<br /><a href="$$settings{$id}{url}">$$settings{$id}{name}</a><br />|;
+            }
+            if ($context eq 'CSTR') {
+                $output .= $image.$imglink.$url.'
+<endouttext />';
+            } else {
+                $resourcedata{$symb.'questiontext'} .= $image.$imglink.$url;
             }
-            $output .= qq|
-<endouttext />|;
             if ($$settings{$id}{class} eq 'QUESTION_MULTIPLECHOICE') {
-                my $numfoils = @{$allanswers{$id}};
-                $output .= qq|
+                my $numfoils = @{$$allanswers{$id}};
+                if ($context eq 'CSTR') {
+                    $output .= qq|
  <radiobuttonresponse max="$numfoils" randomize="yes">
   <foilgroup>
 |;
-                for (my $k=0; $k<@{$allanswers{$id}}; $k++) {
+                } else {
+                    $resourcedata{$symb.'hiddenparts'} = '!radio';
+                    $resourcedata{$symb.'questiontype'} = 'radio';
+                    $resourcedata{$symb.'maxfoils'} = $numfoils;
+                }
+                for (my $k=0; $k<@{$$allanswers{$id}}; $k++) {
+                    my $iter = $k+1;
                     $output .= "   <foil name=\"foil".$k."\" value=\"";
-                    if (grep/^$allanswers{$id}[$k]$/,@{$$settings{$id}{correctanswer}}) {
+                    if (grep/^$$allanswers{$id}[$k]$/,@{$$settings{$id}{correctanswer}}) {
                         $output .= "true\" location=\"";
+                        $resourcedata{$symb.'value'.$iter} = "true";
                     } else {
                         $output .= "false\" location=\"";
+                        $resourcedata{$symb.'value'.$iter} = "false";
                     }
-                    if (lc ($allanswers{$id}[$k]) =~ m/^\s?([Aa]ll)|([Nn]one)\sof\sthe\sabove\.?/) {
+                    if (lc ($$allanswers{$id}[$k]) =~ m/^\s?([Aa]ll)|([Nn]one)\s(of\s)?the\sabove\.?/) {
                         $output .= "bottom\"";
+                        $resourcedata{$symb.'position'.$iter} = "bottom";
                     } else {
                         $output .= "random\"";
                     }
-                    $output .= "\><startouttext />".$$settings{$id}{$allanswers{$id}[$k]}{text};
-                    if ( defined($$settings{$id}{$allanswers{$id}[$k]}{image}) ) {
-                        if ( $$settings{$id}{$allanswers{$id}[$k]}{style} eq 'embed' ) {
-                            $output .= qq|<br /><img src="$dirname/resfiles/$res/$$settings{$id}{$allanswers{$id}[$k]}{image}" /><br />|;
+                    $output .= "\><startouttext />".$$settings{$id}{$$allanswers{$id}[$k]}{text};
+                    $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$$allanswers{$id}[$k]}{text};
+                    my ($ans_image,$ans_link);
+                    if ( defined($$settings{$id}{$$allanswers{$id}[$k]}{image}) ) {
+                        if ( $$settings{$id}{$$allanswers{$id}[$k]}{style} eq 'embed' ) {
+                            $ans_image .= qq|<br /><img src="$dirname/resfiles/$res/$$settings{$id}{$$allanswers{$id}[$k]}{image}" /><br />|;
                         } else {
-                            $output .= qq|<br /><a href="$dirname/resfiles/$res/$$settings{$id}{$allanswers{$id}[$k]}{image}" />Link to file</a><br/>|;
+                            $ans_link .= qq|<br /><a href="$dirname/resfiles/$res/$$settings{$id}{$$allanswers{$id}[$k]}{image}" />Link to file</a><br/>|;
                         }
                     }
-                    $output .= qq|<endouttext /></foil>\n|;
+                    $output .= $ans_image.$ans_link.'<endouttext /></foil>'."\n";
+                    $resourcedata{$symb.'text'.$iter} .= $ans_image.$ans_link;
                 }
-                chomp($output);
-                $output .= qq|
+                if ($context eq 'CSTR') {
+                    chomp($output);
+                    $output .= qq|
   </foilgroup>
  </radiobuttonresponse>
 |;
+                }
             } elsif ($$settings{$id}{class} eq 'QUESTION_TRUEFALSE') {
-                my $numfoils = @{$allanswers{$id}};
-                $output .= qq|
+                my $numfoils = @{$$allanswers{$id}};
+                if ($context eq 'CSTR') {
+                    $output .= qq|
    <radiobuttonresponse max="$numfoils" randomize="yes">
     <foilgroup>
 |;
-                for (my $k=0; $k<@{$allanswers{$id}}; $k++) {
+                } else {
+                    $resourcedata{$symb.'maxfoils'} = $numfoils;
+                    $resourcedata{$symb.'hiddenparts'} = '!radio';
+                    $resourcedata{$symb.'questiontype'} = 'radio';
+                }
+                for (my $k=0; $k<@{$$allanswers{$id}}; $k++) {
+                    my $iter = $k+1;
                     $output .= "   <foil name=\"foil".$k."\" value=\"";
-                    if (grep/^$allanswers{$id}[$k]$/,@{$$settings{$id}{correctanswer}}) {
+                    if (grep/^$$allanswers{$id}[$k]$/,@{$$settings{$id}{correctanswer}}) {
                         $output .= "true\" location=\"random\"";
+                        $resourcedata{$symb.'value'.$iter} = "true";
                     } else {
                         $output .= "false\" location=\"random\"";
+                        $resourcedata{$symb.'value'.$iter} = "false";
                     }
-                    $output .= "\><startouttext />".$$settings{$id}{$allanswers{$id}[$k]}{text}."<endouttext /></foil>\n";
+                    $output .= "\><startouttext />".$$settings{$id}{$$allanswers{$id}[$k]}{text}."<endouttext /></foil>\n";
+                    $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$$allanswers{$id}[$k]}{text};
                 }
-                chomp($output);
-                $output .= qq|
+                if ($context eq 'CSTR') {
+                    chomp($output);
+                    $output .= qq|
     </foilgroup>
    </radiobuttonresponse>
 |;
+                }
             } elsif ($$settings{$id}{class} eq 'QUESTION_MULTIPLEANSWER') {
-                my $numfoils = @{$allanswers{$id}};
-                $output .= qq|
+                my $numfoils = @{$$allanswers{$id}};
+                if ($context eq 'CSTR') {
+                    $output .= qq|
    <optionresponse max="$numfoils" randomize="yes">
     <foilgroup options="('True','False')">
 |;
-                for (my $k=0; $k<@{$allanswers{$id}}; $k++) {
+                } else {
+                    $resourcedata{$symb.'newopt'} = '';
+                    $resourcedata{$symb.'delopt'} = '';
+                    $resourcedata{$symb.'options'} = "('True','False')";
+                    $resourcedata{$symb.'hiddenparts'} = '!option';
+                    $resourcedata{$symb.'questiontype'} = 'option';
+                    $resourcedata{$symb.'maxfoils'} = $numfoils;
+                }
+                for (my $k=0; $k<@{$$allanswers{$id}}; $k++) {
+                    my $iter = $k+1;
                     $output .= "   <foil name=\"foil".$k."\" value=\"";
-                    if (grep/^$allanswers{$id}[$k]$/,@{$$settings{$id}{correctanswer}}) {
+                    if (grep/^$$allanswers{$id}[$k]$/,@{$$settings{$id}{correctanswer}}) {
                         $output .= "True\"";
+                        $resourcedata{$symb.'value'.$iter} = "True";
                     } else {
                         $output .= "False\"";
+                        $resourcedata{$symb.'value'.$iter} = "False";
                     }
-                    $output .= "\><startouttext />".$$settings{$id}{$allanswers{$id}[$k]}{text}."<endouttext /></foil>\n";
+                    $output .= "\><startouttext />".$$settings{$id}{$$allanswers{$id}[$k]}{text}."<endouttext /></foil>\n";
+                    $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$$allanswers{$id}[$k]}{text};
                 }
-                chomp($output);
-                $output .= qq|
+                if ($context eq 'CSTR') {  
+                    chomp($output);
+                    $output .= qq|
     </foilgroup>
    </optionresponse>
 |;
+                }
             } elsif ($$settings{$id}{class} eq 'QUESTION_ORDER') {
-                my $numfoils = @{$allanswers{$id}};
-                $output .= qq|
+                my $numfoils = @{$$allanswers{$id}};
+                my @allorder = ();
+                if ($context eq 'CSTR') {
+                    $output .= qq|
    <rankresponse max="$numfoils" randomize="yes">
     <foilgroup>
 |;
-                for (my $k=0; $k<@{$allanswers{$id}}; $k++) {
-                    $output .= "   <foil location=\"random\" name=\"foil".$k."\" value=\"".$$settings{$id}{$allanswers{$id}[$k]}{order}."\"><startouttext />".$$settings{$id}{$allanswers{$id}[$k]}{text}."<endouttext /></foil>\n";
+                } else {
+                    $resourcedata{$symb.'newopt'} = '';
+                    $resourcedata{$symb.'delopt'} = '';
+                    $resourcedata{$symb.'hiddenparts'} = '!option';
+                    $resourcedata{$symb.'questiontype'} = 'option';
+                    $resourcedata{$symb.'maxfoils'} = $numfoils;
+                }
+                for (my $k=0; $k<@{$$allanswers{$id}}; $k++) {
+                    if ($context eq 'CSTR') {
+                        $output .= "   <foil location=\"random\" name=\"foil".$k."\" value=\"".$$settings{$id}{$$allanswers{$id}[$k]}{order}."\"><startouttext />".$$settings{$id}{$$allanswers{$id}[$k]}{text}."<endouttext /></foil>\n";
+                    } else {
+                        my $iter = $k+1;
+                        $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$$allanswers{$id}[$k]}{text};
+                        if (!grep/^$$settings{$id}{$$allanswers{$id}[$k]}{order}$/,@allorder) {
+                            push @allorder, $$settings{$id}{$$allanswers{$id}[$k]}{order};
+                        }
+                    }
                 }
-                chomp($output);
-                $output .= qq|
+                if ($context eq 'CSTR') {
+                    chomp($output);
+                    $output .= qq|
     </foilgroup>
    </rankresponse>
 |;
+                } else {
+                    @allorder = sort {$a <=> $b} @allorder;
+                    $resourcedata{$symb.'options'} = "('".join("','",@allorder)."')";
+                }
             } elsif ($$settings{$id}{class} eq 'QUESTION_FILLINBLANK') {
                 my $numerical = 1;
-                for (my $k=0; $k<@{$allanswers{$id}}; $k++) {
-                    if ($$settings{$id}{$allanswers{$id}[$k]}{text} =~ m/([^\d\.]|\.\.)/) {
-                        $numerical = 0;
+                if ($context eq 'DOCS') {
+                    $numerical = 0;
+                } else {
+                    for (my $k=0; $k<@{$$allanswers{$id}}; $k++) {
+                        if ($$settings{$id}{$$allanswers{$id}[$k]}{text} =~ m/([^\d\.]|\.\.)/) {
+                            $numerical = 0;
+                        }
                     }
                 }
                 if ($numerical) {
                     my $numans;
                     my $tol;
-                    if (@{$allanswers{$id}} == 1) {
+                    if (@{$$allanswers{$id}} == 1) {
                         $tol = 5;
-                        $numans = $$settings{$id}{$allanswers{$id}[0]}{text};
+                        $numans = $$settings{$id}{$$allanswers{$id}[0]}{text};
                     } else {
-                        my $min = $$settings{$id}{$allanswers{$id}[0]}{text};
-                        my $max = $$settings{$id}{$allanswers{$id}[0]}{text};
-                        for (my $k=1; $k<@{$allanswers{$id}}; $k++) {
-                            if ($$settings{$id}{$allanswers{$id}[$k]}{text} <= $min) {
-                                $min = $$settings{$id}{$allanswers{$id}[$k]}{text};
+                        my $min = $$settings{$id}{$$allanswers{$id}[0]}{text};
+                        my $max = $$settings{$id}{$$allanswers{$id}[0]}{text};
+                        for (my $k=1; $k<@{$$allanswers{$id}}; $k++) {
+                            if ($$settings{$id}{$$allanswers{$id}[$k]}{text} <= $min) {
+                                $min = $$settings{$id}{$$allanswers{$id}[$k]}{text};
                             }
-                            if ($$settings{$id}{$allanswers{$id}[$k]}{text} >= $max) {
-                                $max = $$settings{$id}{$allanswers{$id}[$k]}{text};
+                            if ($$settings{$id}{$$allanswers{$id}[$k]}{text} >= $max) {
+                                $max = $$settings{$id}{$$allanswers{$id}[$k]}{text};
                             }
                         }
                         $numans = ($max + $min)/2;
                         $tol = 100*($max - $min)/($numans*2);
                     }
-                    $output .= qq|
+                    if ($context eq 'CSTR') {
+                        $output .= qq|
 <numericalresponse answer="$numans">
         <responseparam type="tolerance" default="$tol%" name="tol" description="Numerical Tolerance" />
         <responseparam name="sig" type="int_range,0-16" default="0,15" description="Significant Figures"
@@ -1778,64 +2737,691 @@ sub process_assessment {
         <textline />
 </numericalresponse>
 |;
+                    }
                 } else {
-                    if (@{$allanswers{$id}} == 1) {
-                        $output .= qq|
-<stringresponse answer="$$settings{$id}{$allanswers{$id}[0]}{text}" type="ci">
+                    if ($context eq 'DOCS') {
+                        $resourcedata{$symb.'hiddenparts'} = '!string';
+                        $resourcedata{$symb.'questiontype'} = 'string';
+                        $resourcedata{$symb.'maxfoils'} = @{$$allanswers{$id}};
+                        $resourcedata{$symb.'hiddenparts'} = '!string';
+                        $resourcedata{$symb.'stringtype'} = 'ci';
+                        $resourcedata{$symb.'stringanswer'} = $$settings{$id}{$$allanswers{$id}[0]}{text};
+                    } else {
+                        if (@{$$allanswers{$id}} == 1) {
+                            $output .= qq|
+<stringresponse answer="$$settings{$id}{$$allanswers{$id}[0]}{text}" type="ci">
 <textline>
 </textline>
 </stringresponse>
 |;
-                    } else {
-                        my @answertext = ();
-                        for (my $k=0; $k<@{$allanswers{$id}}; $k++) {
-                            $$settings{$id}{$allanswers{$id}[$k]}{text} =~ s/\|/\|/g;
-                            push @answertext, $$settings{$id}{$allanswers{$id}[$k]}{text};
-                        }
-                        my $regexpans = join('|',@answertext);
-                        $regexpans = '/^('.$regexpans.')\b/';
-                        $output .= qq|
+                        } else {
+                            my @answertext = ();
+                            for (my $k=0; $k<@{$$allanswers{$id}}; $k++) {
+                                $$settings{$id}{$$allanswers{$id}[$k]}{text} =~ s/\|/\|/g;
+                                push @answertext, $$settings{$id}{$$allanswers{$id}[$k]}{text};
+                            }
+                            my $regexpans = join('|',@answertext);
+                            $regexpans = '/^('.$regexpans.')\b/';
+                            $output .= qq|
 <stringresponse answer="$regexpans" type="re">
 <textline>
 </textline>
 </stringresponse>
 |;
-                    }
+                        }
+                    } 
                 }
             } elsif ($$settings{$id}{class} eq "QUESTION_MATCH") {
-                $output .= qq|
+                my @allmatchers = ();
+                my %matchtext = ();
+                if ($context eq 'CSTR') {
+                    $output .= qq|
 <matchresponse max="10" randomize="yes">
     <foilgroup>
         <itemgroup>
 |;
-                for (my $k=0; $k<@{$allchoices{$id}}; $k++) {
-                    $output .= qq|
-<item name="$allchoices{$id}[$k]">
-<startouttext />$$settings{$id}{$allchoices{$id}[$k]}{text}<endouttext />
+                } else {
+                    $resourcedata{$symb.'newopt'} = '';
+                    $resourcedata{$symb.'delopt'} = '';
+                    $resourcedata{$symb.'hiddenparts'} = '!option';
+                    $resourcedata{$symb.'questiontype'} = 'option';
+                    $resourcedata{$symb.'maxfoils'} =  @{$$allanswers{$id}};
+                }
+                for (my $k=0; $k<@{$$allchoices{$id}}; $k++) {
+                    if ($context eq 'CSTR') {
+                        $output .= qq|
+<item name="$$allchoices{$id}[$k]">
+<startouttext />$$settings{$id}{$$allchoices{$id}[$k]}{text}<endouttext />
 </item>
                     |;
+                    } else {
+                        if (!grep/^$$settings{$id}{$$allchoices{$id}[$k]}{text}$/,@allmatchers) {
+                            push @allmatchers, $$settings{$id}{$$allchoices{$id}[$k]}{text};
+                            $matchtext{$$allchoices{$id}[$k]} = $$settings{$id}{$$allchoices{$id}[$k]}{text};
+                        }
+                    }
                 }
-                $output .= qq|
+                if ($context eq 'CSTR') {
+                    $output .= qq|
         </itemgroup>
 |;
-                for (my $k=0; $k<@{$allanswers{$id}}; $k++) {
-                    $output .= qq|
-        <foil location="random" value="$$settings{$id}{$allanswers{$id}[$k]}{choice_id}" name="$allanswers{$id}[$k]">
-         <startouttext />$$settings{$id}{$allanswers{$id}[$k]}{text}<endouttext />
+                }
+                for (my $k=0; $k<@{$$allanswers{$id}}; $k++) {
+                    if ($context eq 'CSTR') {
+                        $output .= qq|
+        <foil location="random" value="$$settings{$id}{$$allanswers{$id}[$k]}{choice_id}" name="$$allanswers{$id}[$k]">
+         <startouttext />$$settings{$id}{$$allanswers{$id}[$k]}{text}<endouttext />
         </foil>
 |;
+                    } else {
+                        my $iter = $k+1;
+                        $resourcedata{$symb.'value'.$iter} = $matchtext{$$settings{$id}{$$allanswers{$id}[$k]}{choice_id}};
+                        $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$$allanswers{$id}[$k]}{text};
+                    }
                 }
-                $output .= qq|
+                if ($context eq 'CSTR') {
+                    $output .= qq|
     </foilgroup>
 </matchresponse>
 |;
+                } else {
+                    $resourcedata{$symb.'options'} = "('".join("','",@allmatchers)."')";
+                }
             }
         }
-        $output .= qq|</problem>
+        if ($context eq 'CSTR') {
+            $output .= qq|</problem>
 |;
-        open(PROB,">$newdir/$id.problem");
-        print PROB $output;
-        close PROB;
+            my $title = $$settings{title};
+            $title =~ s/\s/_/g;
+            $title =~ s/\W//g;
+            $title .= '_'.$id;
+            open(PROB,">:utf8", "$newdir/$title.problem");
+            print PROB $output;
+            close PROB;
+        } else {
+# put %resourcedata;
+            my $reply=&Apache::lonnet::cput
+                ('resourcedata',\%resourcedata,$cdom,$cnum);
+        }
+    }
+}
+
+sub write_webct4_questions {
+    my ($alldbquestids,$context,$settings,$dirname,$allanswers,$allchoices,$total,$cid,$cdom,$cnum,$destdir,$catinfo) = @_;
+    my $qnum = 0;
+    foreach my $id (@{$alldbquestids}) {
+        $qnum ++;
+        my $output;
+        my $permcontainer = $destdir.'/sequences/'.$id.'.sequence';
+        my $allfeedback;
+        my $questionimage;
+        foreach my $fdbk (@{$$settings{$id}{feedback}}) {
+            my $feedback =  $$settings{$id}{$fdbk}{text};
+            if ($$settings{$id}{$fdbk}{texttype} eq 'text/html') {
+                $feedback = &HTML::Entities::decode($feedback);
+            }
+            $allfeedback .= $feedback;
+        }
+        if ($$settings{$id}{texttype} eq 'text/html') {
+            $$settings{$id}{text} = &HTML::Entities::decode($$settings{$id}{text});
+            $$settings{$id}{text} = &Apache::loncleanup::htmlclean($$settings{$id}{text});
+            $$settings{$id}{text} =~ s#(<img src=["']?)([^>]+)(/?>)#$1../../resfiles/$2 />#gi;
+            $$settings{$id}{text} =~ s#<([bh])r>#<$1r />#g;
+#            $$settings{$id}{text} =~ s#<p>#</p><p>#g;
+#            $$settings{$id}{text} =~ s#</p></p>#</p>#;
+#            $$settings{$id}{text} =~ s#<p></p>##g;
+            $$settings{$id}{text} =~ s#<p>#<br /><br />#g;
+            $$settings{$id}{text} =~ s#</p>##g;
+        }
+        if ($$settings{$id}{class} eq 'numerical') {
+            foreach my $numid (@{$$settings{$id}{numids}}) {
+                foreach my $var (keys %{$$settings{$id}{$numid}{vars}}) {
+                    $$settings{$id}{text} =~ s/{($var)}/\$$1 /g;
+                }
+            }
+        }
+        $permcontainer =~ s#/home/httpd/html/userfiles#uploaded#;
+        my $symb = $cid.'.'.$permcontainer.'___'.$qnum.'___lib/templates/simpleproblem.problem.0.';
+        my %resourcedata = ();
+        for (my $i=0; $i<10; $i++) {
+            my $iter = $i+1;
+            $resourcedata{$symb.'text'.$iter} = "";
+            $resourcedata{$symb.'value'.$iter} = "unused";
+            $resourcedata{$symb.'position'.$iter} = "random";
+        }
+        $resourcedata{$symb.'randomize'} = 'yes';
+        $resourcedata{$symb.'maxfoils'} = 10;
+        if ($context eq 'CSTR') {
+            unless ($$settings{$id}{class} eq 'numerical') {
+                $output = qq|<problem>
+|;
+            }
+        }
+        $$total{prob} ++;
+        if (exists($$settings{$id}{uri})) {
+            if ($$settings{$id}{imagtype} =~ /^image\//) {
+                $questionimage = '<p><img src="../../resfiles/'.$$settings{$id}{uri}.'" /></p>'."\n";
+            }
+        }
+        if ($$settings{$id}{class} eq "paragraph") {
+            if ($context eq 'CSTR') {
+                $output .= qq|<startouttext /><p>$$settings{$id}{text}</p>$questionimage<endouttext />
+ <essayresponse>
+ <textfield></textfield>
+ </essayresponse>
+ <postanswerdate>
+  $allfeedback
+ </postanswerdate>
+|;
+            } else {
+                $resourcedata{$symb.'questiontext'} = '<p>'.$$settings{$id}{text}.'</p>'.$questionimage;
+                $resourcedata{$symb.'hiddenparts'} = '!essay';
+                $resourcedata{$symb.'questiontype'} = 'essay';
+            }
+        } else {
+            if ($context eq 'CSTR') {
+                $output .= qq|<startouttext /><p>$$settings{$id}{text}</p>$questionimage<endouttext />\n|;
+            } else {
+                $resourcedata{$symb.'questiontext'} = '<p>'.$$settings{$id}{text}.'</p>'.$questionimage;
+            }
+            if ($$settings{$id}{class} eq 'multiplechoice') {
+                foreach my $list (@{$$settings{$id}{lists}}) {
+                    my $numfoils = @{$$allanswers{$id}{$list}};
+                    if ($$settings{$id}{$list}{rcardinality} eq 'Single') {
+                        if ($context eq 'CSTR') {
+                            $output .= qq|
+ <radiobuttonresponse max="$numfoils" randomize="$$settings{$id}{$list}{randomize}">
+  <foilgroup>
+|;
+                        } else {
+                            $resourcedata{$symb.'hiddenparts'} = '!radio';
+                            $resourcedata{$symb.'questiontype'} = 'radio';
+                            $resourcedata{$symb.'maxfoils'} = $numfoils;
+                        }
+                        for (my $k=0; $k<@{$$allanswers{$id}{$list}}; $k++) {
+                            my $iter = $k+1;
+                            $output .= "   <foil name=\"foil".$k."\" value=\"";
+                            if (grep/^$$allanswers{$id}{$list}[$k]$/,@{$$settings{$id}{$list}{correctanswer}}) {
+                                $output .= "true\" location=\"";
+                                $resourcedata{$symb.'value'.$iter} = "true";
+                            } else {
+                                $output .= "false\" location=\"";
+                                $resourcedata{$symb.'value'.$iter} = "false";
+                            }
+                            if (lc ($$allanswers{$id}{$list}[$k]) =~ m/^\s?([Aa]ll)|([Nn]one)\s(of\s)?the\sabove\.?/) {
+                                $output .= "bottom\"";
+                                $resourcedata{$symb.'position'.$iter} = "bottom";
+                            } else {
+                                $output .= "random\"";
+                            }
+                            if ($$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{texttype} eq 'text/html') {
+                                $$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text} = &HTML::Entities::decode($$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text});
+                                $$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text} = &Apache::loncleanup::htmlclean($$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text});
+                                $$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text} =~  s#(<img src=")([^>]+)>#$1../../resfiles/$2 />#gi;
+                                $$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text} =~  s#</?p>##g;
+
+                            }
+                            $output .= "\><startouttext />".$$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text};
+                            $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text};
+                            $output .= '<endouttext /></foil>'."\n";
+                        }
+                        if ($context eq 'CSTR') {
+                            chomp($output);
+                            $output .= qq|
+  </foilgroup>
+ </radiobuttonresponse>
+|;
+                        }
+                    } else {
+                        if ($context eq 'CSTR') {
+                            $output .= qq|
+   <optionresponse max="$numfoils" randomize="yes">
+    <foilgroup options="('True','False')">
+|;
+                        } else {
+                            $resourcedata{$symb.'newopt'} = '';
+                            $resourcedata{$symb.'delopt'} = '';
+                            $resourcedata{$symb.'options'} = "('True','False')";
+                            $resourcedata{$symb.'hiddenparts'} = '!option';
+                            $resourcedata{$symb.'questiontype'} = 'option';
+                            $resourcedata{$symb.'maxfoils'} = $numfoils;
+                        }
+                        for (my $k=0; $k<@{$$allanswers{$id}{$list}}; $k++) {
+                            my $iter = $k+1;
+                            $output .= "   <foil name=\"foil".$k."\" value=\"";
+                            if (grep/^$$allanswers{$id}{$list}[$k]$/,@{$$settings{$id}{$list}{correctanswer}}) {
+                                $output .= "True\"";
+                                $resourcedata{$symb.'value'.$iter} = "True";
+                            } else {
+                                $output .= "False\"";
+                                $resourcedata{$symb.'value'.$iter} = "False";
+                            }
+                            if ($$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{texttype} eq 'text/html') {
+                                $$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text} = &HTML::Entities::decode($$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text});
+                                $$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text} = &Apache::loncleanup::htmlclean($$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text});
+
+                                $$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text} =~  s#(<img src=")([^>]+)>#$1../../resfiles/$2 />#gi;
+                                $$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text} =~  s#</?p>##g;
+                            }
+                            $output .= "\><startouttext />".$$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text}."<br /><endouttext /></foil>\n";
+                            $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text};
+                        }
+                        if ($context eq 'CSTR') {
+                            chomp($output);
+                            $output .= qq|
+    </foilgroup>
+   </optionresponse>
+|;
+                        }
+                    }
+                }
+            } elsif ($$settings{$id}{class} eq 'match') {
+                my %allmatchers = ();
+                my @allmatch = ();
+                my %matchtext = ();
+                my $anscount = 0;
+                my %ansnum = ();
+                my $maxfoils = 0;
+                my $test_for_html = 0; 
+                foreach my $grp (@{$$allchoices{$id}}) {
+                    $maxfoils += @{$$settings{$id}{$grp}{correctanswer}};
+                    foreach my $answer_id (@{$$allanswers{$id}{$grp}}) {
+                        if ($$settings{$id}{$grp}{$answer_id}{texttype} eq '/text/html') {
+                             
+                            $$settings{$id}{$grp}{$answer_id}{text} = &HTML::Entities::decode($$settings{$id}{$grp}{$answer_id}{text});
+                            $test_for_html = &test_for_html($$settings{$id}{$grp}{$answer_id}{text});
+                            $$settings{$id}{$grp}{$answer_id}{text} = &Apache::loncleanup::htmlclean($$settings{$id}{$grp}{$answer_id}{text});
+                            $$settings{$id}{$grp}{$answer_id}{text} =~  s#(<img src=")([^>]+)>#$1../../resfiles/$2 />#gi;
+                            $$settings{$id}{$grp}{$answer_id}{text} =~  s#</?p>##g;
+                        }
+                        unless (exists($allmatchers{$$settings{$id}{$grp}{$answer_id}{text}})) {
+                            $allmatchers{$$settings{$id}{$grp}{$answer_id}{text}} = $anscount;
+                            $allmatch[$anscount] = $$settings{$id}{$grp}{$answer_id}{text};
+                            $anscount ++;
+                            
+                        }
+                        if (grep/^$answer_id$/,@{$$settings{$id}{$grp}{correctanswer}}) {
+                            push(@{$ansnum{$grp}},$allmatchers{$$settings{$id}{$grp}{$answer_id}{text}});
+                        }
+                    }
+                    if ($context eq 'DOCS') {
+                        $matchtext{$ansnum{$grp}[0]} = $allmatch[$ansnum{$grp}[0]-1];
+                    }
+                }
+                my $allmatchlist = "('".join("','",@allmatch)."')";
+                if ($context eq 'CSTR') {
+                    if ($test_for_html) {
+                        $output .= qq|
+<matchresponse max="$maxfoils" randomize="yes">
+    <foilgroup>
+        <itemgroup>
+|;
+                    } else {
+                        $output .= qq|
+<optionresponse max="10" randomize="yes">
+    <foilgroup options=$allmatchlist>
+|;
+                    }
+                } else {
+                    $resourcedata{$symb.'newopt'} = '';
+                    $resourcedata{$symb.'delopt'} = '';
+                    $resourcedata{$symb.'hiddenparts'} = '!option';
+                    $resourcedata{$symb.'questiontype'} = 'option';
+                    $resourcedata{$symb.'maxfoils'} =  $maxfoils;
+                }
+                my $iter = 0;
+                foreach my $match (@allmatch) {  
+                    $iter ++;
+                    if ($context eq 'CSTR') {
+                        if ($test_for_html) {
+                            $output .= qq|
+<item name="ans_$iter">
+<startouttext />$match<endouttext />
+</item>
+|;
+                        }
+                    }
+                }
+                if ($context eq 'CSTR') {
+                    if ($test_for_html) {
+                        $output .= qq|
+        </itemgroup>
+|;
+                    }
+                }
+                $iter = 0;
+                for (my $k=0; $k<@{$$allchoices{$id}}; $k++) {
+                    if ($$settings{$id}{$$allchoices{$id}[$k]}{texttype} eq 'text/html') {
+                        $$settings{$id}{$$allchoices{$id}[$k]}{text} = &HTML::Entities::decode($$settings{$id}{$$allchoices{$id}[$k]}{text});
+                        $$settings{$id}{$$allchoices{$id}[$k]}{text} = &Apache::loncleanup::htmlclean($$settings{$id}{$$allchoices{$id}[$k]}{text});
+                        $$settings{$id}{$$allchoices{$id}[$k]}{text} =~  s#(<img src=")([^>]+)>#$1../../resfiles/$2 />#gi;
+                        $$settings{$id}{$$allchoices{$id}[$k]}{text} =~  s#</?p>##g;
+                    }
+                    foreach my $ans (@{$ansnum{$$allchoices{$id}[$k]}}) {
+                        $iter ++;
+                        my $ans_id = $ans + 1;
+                        if ($context eq 'CSTR') {
+                            my $value;
+                            if ($test_for_html) {
+                                $value = 'ans_'.$ans_id;
+                            } else {
+                                $value = $allmatch[$ans];
+                            }
+                            $output .= qq|
+        <foil location="random" value="$value" name="foil_$iter">
+         <startouttext />$$settings{$id}{$$allchoices{$id}[$k]}{text}<endouttext />
+        </foil>
+                           
+|;
+                        }
+                    }
+                    if ($context eq 'DOCS') {
+                        $resourcedata{$symb.'value'.$iter} = $matchtext{$ansnum{$$allchoices{$id}[$k]}[0]};
+                        $resourcedata{$symb.'text'.$iter} = $$settings{$id}{$$allchoices{$id}[0]}{text};
+                    }
+                }
+                if ($context eq 'CSTR') {
+                    $output .= qq|
+    </foilgroup>
+|;
+                    if ($test_for_html) {
+                        $output .= qq|
+</matchresponse>
+|;
+                    } else {
+                        $output .= qq|
+</optionresponse>
+|;
+                    }
+                } else {
+                    $resourcedata{$symb.'options'} = "('".join("','",@allmatch)."')";
+                }
+            } elsif ($$settings{$id}{class} eq 'string') {
+                my $labelnum = 0;
+                foreach my $str_id (@{$$settings{$id}{str}}) {
+                    foreach my $label (@{$$settings{$id}{$str_id}{labels}}) {
+                        $labelnum ++;
+                        my $numerical = 1;
+                        if ($context eq 'DOCS') {
+                            $numerical = 0;
+                        } else {
+                            for (my $i=0; $i<@{$$settings{$id}{strings}{$label}}; $i++) {
+                                $$settings{$id}{strings}{$label}[$i] =~ s/^\s+//;
+                                $$settings{$id}{strings}{$label}[$i] =~ s/\s+$//; 
+                                if ($$settings{$id}{strings}{$label}[$i] =~ m/([^-\d\.]|\.\.)/) {
+                                    $numerical = 0;
+                                }
+                            }
+                        }
+                        if ($numerical) {
+                            my $numans;
+                            my $tol;
+                            if (@{$$settings{$id}{strings}{$label}} == 1) {
+                                $tol = '5%';
+                                $numans = $$settings{$id}{strings}{$label}[0];
+                            } else {
+                                my $min = $$settings{$id}{strings}{$label}[0];
+                                my $max = $$settings{$id}{strings}{$label}[0];
+                                for (my $k=1; $k<@{$$settings{$id}{strings}{$label}}; $k++) {
+                                    if ($$settings{$id}{strings}{$label}[$k] <= $min) {
+                                        $min = $$settings{$id}{strings}{$label}[$k];
+                                    }
+                                    if ($$settings{$id}{strings}{$label}[$k] >= $max) {
+                                        $max = $$settings{$id}{strings}{$label}[$k];
+                                    }
+                                }
+                                $numans = ($max + $min)/2;
+                                if ($numans == 0) {
+                                    my $dev = abs($max - $numans);
+                                    if (abs($numans - $min) > $dev) {
+                                        $dev = abs($numans - $min);
+                                    }
+                                    $tol = $dev;
+                                } else {
+                                    $tol = 100*($max - $min)/($numans*2);
+                                    $tol .= '%';
+                                }
+                            }
+                            if ($context eq 'CSTR') {
+                                if (@{$$settings{$id}{str}} > 1) {
+                                    $output .= qq|
+<startouttext />$labelnum.<endouttext />
+|;
+                                }
+                                $output .= qq|
+<numericalresponse answer="$numans">
+        <responseparam type="tolerance" default="$tol" name="tol" description="Numerical Tolerance" />
+        <responseparam name="sig" type="int_range,0-16" default="0,15" description="Significant Figures"
+/>
+        <textline />
+</numericalresponse>
+<startouttext /><br /><endouttext />
+|;
+                            }
+                        } else {
+                            if ($context eq 'DOCS') {
+                                $resourcedata{$symb.'hiddenparts'} = '!string';
+                                $resourcedata{$symb.'questiontype'} = 'string';
+                                $resourcedata{$symb.'maxfoils'} = @{$$allanswers{$id}{strings}{$label}};
+                                $resourcedata{$symb.'hiddenparts'} = '!string';
+                                if ($$settings{$id}{$label}{case} eq "No") {
+                                    $resourcedata{$symb.'stringtype'} = 'ci';
+                                } elsif ($$settings{$id}{$label}{case} eq "Yes") {
+                                    $resourcedata{$symb.'stringtype'} = 'cs';
+                                }
+                                $resourcedata{$symb.'stringanswer'} = $$settings{$id}{strings}{$label}[0];
+                            } else {
+                                if (@{$$settings{$id}{str}} > 1) {                                    $output .= qq|
+<startouttext />$labelnum.<endouttext />
+|;
+                                }
+                                if (@{$$settings{$id}{strings}{$label}} == 1) {
+                                    my $casetype;
+                                    if ($$settings{$id}{$label}{case} eq "No") {
+                                        $casetype = 'ci';
+                                    } elsif ($$settings{$id}{$label}{case} eq "Yes") {
+                                        $casetype = 'cs';
+                                    }
+                                    $output .= qq|
+<stringresponse answer="$$settings{$id}{strings}{$label}[0]" type="$casetype">
+<textline>
+</textline>
+</stringresponse>
+<startouttext /><br /><endouttext />
+|;
+                                } else {
+                                    my @answertext = ();
+                                    for (my $k=0; $k<@{$$settings{$id}{strings}{$label}}; $k++) {
+                                        $$settings{$id}{strings}{$label}[$k] =~ s/\|/\|/g;
+                                        push @answertext, $$settings{$id}{strings}{$label}[$k];
+                                    }
+                                    my $regexpans = join('|',@answertext);
+                                    $regexpans = '/^('.$regexpans.')\b/';
+                                    $output .= qq|
+<stringresponse answer="$regexpans" type="re">
+<textline>
+</textline>
+</stringresponse>
+<startouttext /><br /><endouttext />
+|;
+                                }
+                            }
+                        }
+                    }
+                }
+            } elsif ($$settings{$id}{class} eq 'numerical') {
+                my %mathfns = (
+                    'abs' => 'abs',
+                    'acos' => 'acos',
+                    'asin' => 'asin',
+                    'atan' => 'atan',
+                    'ceil' => 'ceil',
+                    'cos' => 'cos',
+                    'exp' => 'exp',
+                    'fact' => 'factorial',
+                    'floor' => 'floor',
+                    'int' => 'int',
+                    'ln' => 'log',
+                    'log' => 'log',
+                    'max' => 'max',
+                    'min' => 'min',
+                    'round' => 'roundto',
+                    'sin' => 'sin',
+                    'sqrt' => 'sqrt',
+                    'tan' => 'tan',
+                );
+
+                my $scriptblock = qq|
+<script type="loncapa/perl">
+|;
+                foreach my $numid (@{$$settings{$id}{numids}}) {
+                    my $formula = $$settings{$id}{$numid}{formula};
+                    my $pattern = join('|',(sort (keys (%mathfns))));
+                    $formula =~ s/($pattern)/\&$mathfns{$1}/g;
+                    foreach my $var (keys %{$$settings{$id}{$numid}{vars}}) {
+                        my $decnum = $$settings{$id}{$numid}{vars}{$var}{dec};
+                        my $increment = '0.';
+                        if ($decnum == 0) {
+                            $increment = 1; 
+                        } else {
+                            my $deccount = $decnum;
+                            while ($deccount > 1) {
+                                $increment.= '0';
+                                $deccount --;
+                            }
+                            $increment .= '1';
+                        } 
+                        $formula =~ s/{($var)}/(\$$1)/g;
+                        $scriptblock .= qq|
+\$$var=&random($$settings{$id}{$numid}{vars}{$var}{min},$$settings{$id}{$numid}{vars}{$var}{max},$increment);
+|;
+                    }
+                    $scriptblock .= qq|
+\$answervar = $formula;
+</script>
+|;
+                    if ($context eq 'CSTR') {
+                        $output = "<problem>\n".$scriptblock.$output;
+                        my $ansformat = '';
+                        my $sigfig = '0,15';
+                        if ($$settings{$id}{$numid}{format} eq 'sig') {
+                            $sigfig = $$settings{$id}{$numid}{digits}.','.$$settings{$id}{$numid}{digits};
+                        } elsif ($$settings{$id}{$numid}{format} eq 'dec') {
+                            $ansformat = $$settings{$id}{$numid}{digits}.'f';
+                        }
+                        if ($ansformat) {
+                            $ansformat = 'format="'.$ansformat.'"';
+                        }
+                        my $tolerance = $$settings{$id}{$numid}{tolerance};
+                        if ($$settings{$id}{$numid}{toltype} eq 'percent') {
+                            $tolerance .= '%';
+                        }
+                        my $unit = '';
+                        foreach my $unitid (@{$$settings{$id}{$numid}{units}}) {
+                            $unit .=  $$settings{$id}{$numid}{$unitid}{text};
+                        }
+                        my $unitentry = '';
+                        if ($unit ne '') {
+                            $unitentry =  'unit='.$unit;
+                        }
+                        $output .= qq|
+<numericalresponse $unitentry $ansformat  answer="\$answervar">
+        <responseparam type="tolerance" default="$tolerance" name="tol" description="Numerical Tolerance" />
+        <responseparam name="sig" type="int_range" default="$sigfig" description="Significant Figures"
+/>
+        <textline />
+</numericalresponse>
+|;
+                    }
+                }
+            }
+        }
+        if ($context eq 'CSTR') {
+            my $catid = $$settings{$id}{category};
+            my $probdir = $$catinfo{$catid}{title}.'_'.$catid;
+            $probdir =~ s/\s/_/g;
+            $probdir =~ s/\W//g;
+            if (!-e "$destdir/problems/$probdir") {
+                mkdir("$destdir/problems/$probdir",0755);
+            }
+            $output .= qq|</problem>
+|;
+            my $title = $$settings{$id}{title};
+            $title =~ s/\s/_/g;
+            $title =~ s/\W//g;
+            $title .= '_'.$id; 
+            open(PROB,">:utf8", "$destdir/problems/$probdir/$title.problem");
+            print PROB $output;
+            close PROB;
+        } else {
+# put %resourcedata;
+            my $reply=&Apache::lonnet::cput
+                ('resourcedata',\%resourcedata,$cdom,$cnum);
+        }
+    }
+}
+
+sub test_for_html {
+    my ($source) = @_; 
+    my @tags = ();
+    my $p = HTML::Parser->new
+    (
+     xml_mode => 1,
+     start_h =>
+     [sub {
+        my ($tagname) = @_;
+        push @tags, $tagname;
+     }, "tagname"],
+    );
+    $p->parse($source);
+    $p->eof;
+    return length(@tags); 
+} 
+
+sub write_bb6_questions {
+    my ($allids,$containerdir,$context,$settings,$dirname,$destdir,$res,$allanswers,$allchoices) = @_;
+}
+
+sub retrieve_image {
+    my ($context,$res,$dirname,$cdom,$cname,$docroot,$destdir,$urlpath,$filename) = @_;
+    my $contents;
+    my $url = $urlpath.$filename;
+    my $ua=new LWP::UserAgent;
+    my $request=new HTTP::Request('GET',$url);
+    my $response=$ua->request($request);
+    if ($response->is_success) { 
+        $contents = $response->content;
+        if (!-e "$docroot/$res") {
+            mkdir("$docroot/$res",0755);
+        }
+        if (!-e "$docroot/$res/webimages") {
+            mkdir("$docroot/$res/webimages",0755);
+        }
+        open(my $fh,">$docroot/$res/webimages/$filename");
+        print $fh $contents;
+        close($fh);
+        if ($context eq 'DOCS') {
+            my $chome = &Apache::lonnet::homeserver($cname,$cdom);
+            my $copyfile = $dirname.'/'.$filename;
+            my $source = "$docroot/$res/webimages/$filename";
+            my $fileresult;
+            if (-e $source) {
+                $fileresult = &Apache::lonnet::process_coursefile('copy',$cname,$cdom,$chome,$copyfile,$source);
+            }
+            return $fileresult;
+        } elsif ($context eq 'CSTR') {
+            if (!-e "$destdir/resfiles/$res") {
+                mkdir("$destdir/resfiles/$res",0755);
+            }
+            if (!-e "$destdir/resfiles/$res/webimages") {
+                mkdir("$destdir/resfiles/$res/webimages",0755);
+            }
+            rename("$docroot/$res/webimages/$filename","$destdir/resfiles/$res/webimages/$filename");
+            return 'ok';
+        }
+    } else {
+        return -1;
     }
 }
 
@@ -1856,7 +3442,7 @@ sub process_announce {
         if ("@state" eq "ANNOUNCEMENT TITLE") {
             $$settings{title} = $attr->{value};
             $$settings{startassessment} = ();
-        } elsif (@state eq "ANNOUNCEMENT DESCRIPTION FLAGS ISHTML") {  
+        } elsif ("@state" eq "ANNOUNCEMENT DESCRIPTION FLAGS ISHTML") {  
             $$settings{ishtml} = $attr->{value};          
         } elsif ("@state" eq "ANNOUNCEMENT DESCRIPTION FLAGS ISNEWLINELITERAL" ) {
             $$settings{isnewline} = $attr->{value};
@@ -1929,10 +3515,20 @@ $$settings{text}
 
 # ---------------------------------------------------------------- Process Blackboard Content
 sub process_content {
-    my ($res,$docroot,$destdir,$settings,$dom,$user,$resrcfiles) = @_;
+    my ($cms,$res,$context,$docroot,$destdir,$settings,$dom,$user,$resrcfiles,$packages,$hrefs) = @_;
     my $xmlfile = $docroot.'/'.$res.".dat";
     my $destresdir = $destdir;
-    $destresdir =~ s|/home/$user/public_html/|/res/$dom/$user/|;
+    if ($context eq 'CSTR') {
+        $destresdir =~ s|/home/$user/public_html/|/res/$dom/$user/|;
+    } elsif ($context eq 'DOCS') {
+        $destresdir =~ s|^/home/httpd/html/userfiles|/uploaded|;
+    }
+    my $filetag = '';
+    if ($cms eq 'bb5') {
+        $filetag = 'FILEREF';
+    } elsif ($cms eq 'bb6') {
+        $filetag = 'FILE';
+    }
     my $filecount = 0;
     my @allrelfiles = ();
     my @state;
@@ -1944,37 +3540,41 @@ sub process_content {
       [sub {
         my ($tagname, $attr) = @_;
         push @state, $tagname;
-        if (@state eq "CONTENT MAINDATA") {
+        if ("@state" eq "CONTENT ") {
             %{$$settings{maindata}} = ();
-        } elsif (@state eq "CONTENT MAINDATA TEXTCOLOR") {
+        } elsif ("@state" eq "CONTENT TITLECOLOR") {
+            $$settings{titlecolor} =  $attr->{value};
+        } elsif ("@state" eq "CONTENT MAINDATA TEXTCOLOR") {
             $$settings{maindata}{color} = $attr->{value};
-        } elsif (@state eq "CONTENT MAINDATA FLAGS ISHTML") {  
+        } elsif ("@state" eq "CONTENT MAINDATA FLAGS ISHTML") {  
             $$settings{maindata}{ishtml} = $attr->{value}; 
-        } elsif (@state eq "CONTENT MAINDATA FLAGS ISNEWLINELITERAL") {  
+        } elsif ("@state" eq "CONTENT MAINDATA FLAGS ISNEWLINELITERAL") {  
             $$settings{maindata}{isnewline} = $attr->{value};
+        } elsif ("@state" eq "CONTENT BODY TYPE") {
+            $$settings{maindata}{bodytype} =  $attr->{value};
         } elsif ("@state" eq "CONTENT FLAGS ISAVAILABLE" ) {
             $$settings{isavailable} = $attr->{value};
         } elsif ("@state" eq "CONTENT FLAGS ISFOLDER" ) {
             $$settings{isfolder} = $attr->{value};
         } elsif ("@state" eq "CONTENT FLAGS LAUNCHINNEWWINDOW" ) {
             $$settings{newwindow} = $attr->{value};
-        } elsif ("@state" eq "CONTENT FILES FILEREF") {
+        } elsif ("@state" eq "CONTENT FILES $filetag") {
             %{$$settings{files}[$filecount]} = ();
             %{$$settings{files}[$filecount]{registry}} = (); 
         } elsif ("@state" eq "CONTENT FILES FILEREF RELFILE" ) {
             $$settings{files}[$filecount]{'relfile'} = $attr->{value};
             push @allrelfiles, $attr->{value};
-        } elsif ("@state" eq "CONTENT FILES FILEREF MIMETYPE") {
+        } elsif ("@state" eq "CONTENT FILES $filetag MIMETYPE") {
             $$settings{files}[$filecount]{mimetype} = $attr->{value};
-        } elsif ("@state" eq "CONTENT FILES FILEREF CONTENTTYPE") {
+        } elsif ("@state" eq "CONTENT FILES $filetag CONTENTTYPE") {
             $$settings{files}[$filecount]{contenttype} = $attr->{value};
-        } elsif ("@state" eq "CONTENT FILES FILEREF FILEACTION") {
+        } elsif ("@state" eq "CONTENT FILES $filetag FILEACTION") {
             $$settings{files}[$filecount]{fileaction} = $attr->{value};
-        } elsif ("@state" eq "CONTENT FILES FILEREF PACKAGEPARENT") {
+        } elsif ("@state" eq "CONTENT FILES $filetag PACKAGEPARENT") {
             $$settings{files}[$filecount]{packageparent} = $attr->{value};
-        } elsif ("@state" eq "CONTENT FILES FILEREF LINKNAME") {
+        } elsif ("@state" eq "CONTENT FILES $filetag LINKNAME") {
             $$settings{files}[$filecount]{linkname} = $attr->{value};
-        } elsif ("@state" eq "CONTENT FILES FILEREF REGISTRY REGISTRYENTRY") {
+        } elsif ("@state" eq "CONTENT FILES $filetag REGISTRY REGISTRYENTRY") {
             my $key = $attr->{key};
             $$settings{files}[$filecount]{registry}{$key} = $attr->{value};
         }
@@ -1984,16 +3584,19 @@ sub process_content {
         my ($text) = @_;
         if ("@state" eq "CONTENT TITLE") {
             $$settings{title} = $text;
-        } elsif ("@state" eq "CONTENT MAINDATA TEXT") {
+        } elsif ( ("@state" eq "CONTENT MAINDATA TEXT") || ("@state" eq "CONTENT BODY TEXT") ) {
             $$settings{maindata}{text} = $text;
-        }  elsif ("@state" eq "CONTENT FILES FILEREF REFTEXT") {
+        }  elsif ("@state" eq "CONTENT FILES $filetag REFTEXT") {
             $$settings{files}[$filecount]{reftext} = $text;
+        } elsif ("@state" eq "CONTENT FILES FILE NAME" ) {
+            $$settings{files}[$filecount]{'relfile'} = $text;
+            push @allrelfiles, $text;
         }
        }, "dtext"],
       end_h =>
       [sub {
         my ($tagname) = @_;
-        if ("@state" eq "CONTENT FILES FILEREF") {
+        if ("@state" eq "CONTENT FILES $filetag") {
             $filecount ++;
         }
         pop @state;
@@ -2039,10 +3642,8 @@ sub process_content {
                     }
                 } else {
                     my $filename=$$settings{files}[$filecount]{'relfile'};
-#                  print "File is $filename\n";
                     my $newfilename="$destresdir/resfiles/$res/$$settings{files}[$filecount]{relfile}";
-#                  print "New filename is $newfilename\n";
-                    $$settings{maindata}{text} =~ s#(src|SRC|value)="$filename"#$1="$newfilename"#g;
+                    $$settings{maindata}{text} =~ s#(src|SRC|value)=("|&quot;)$filename("|&quot;)#$1="$newfilename"#g;
                 }
             } elsif ($$settings{files}[$filecount]{fileaction} eq 'link') {
                 unless (($$settings{files}[$filecount]{packageparent} ne '') && (grep/^$$settings{files}[$filecount]{packageparent}$/,@{$$settings{files}}) ) {
@@ -2055,8 +3656,28 @@ sub process_content {
                     }
                       $linktag .= qq|>$$settings{files}[$filecount]{linkname}</a><br/>\n|;
                 }
-            } elsif ($$settings{files}[$filecount]{fileaction} eq 'package') {
-#              print "Found a package\n";
+            } elsif ( ($$settings{files}[$filecount]{fileaction} eq 'PACKAGE') || ($$settings{files}[$filecount]{fileaction} eq 'package') ) {
+               my $open_package = '';
+               if ($$settings{files}[$filecount]{'relfile'} =~ m|\.zip$|i) {
+                   $open_package = &expand_zip("$docroot/$res",$$settings{files}[$filecount]{'relfile'});
+               }
+               if ($open_package eq 'ok') {
+                   opendir(DIR,"$docroot/$res");
+                   my @dircontents = grep(!/^\./,readdir(DIR));
+                   closedir(DIR);
+                   push @{$resrcfiles}, @dircontents;
+                   @{$$hrefs{$res}} = @dircontents;
+                   push @{$packages}, $res;
+               }
+            } elsif ( ($$settings{files}[$filecount]{fileaction} eq 'BROKEN_IMAGE') && ($cms eq 'bb6') ) {
+                my $filename=$$settings{files}[$filecount]{'relfile'};
+                my $newfilename="$destresdir/resfiles/$res/$$settings{files}[$filecount]{relfile}";
+                $$settings{maindata}{text} =~ s#(src|SRC|value)=("|&quot;)$filename("|&quot;)#$1="$newfilename"#g;
+            } elsif ( ($$settings{files}[$filecount]{fileaction} eq 'LINK') && ($cms eq 'bb6') ) {
+                my $filename=$$settings{files}[$filecount]{'relfile'};
+                my $newfilename="$destresdir/resfiles/$res/$$settings{files}[$filecount]{relfile}";
+                my $filetitle = $$settings{files}[$filecount]{'linkname'};
+                $$settings{maindata}{text} = '<a href="'.$newfilename.'">'.$filetitle.'</a><br /><br />'. $$settings{maindata}{text};
             }
         }
     }
@@ -2064,37 +3685,52 @@ sub process_content {
         $fontcol =  qq|<font color="$$settings{maindata}{textcolor}">|;
     }
     if (defined($$settings{maindata}{text})) {
+        if ($$settings{maindata}{bodytype} eq "S") {
+            $$settings{maindata}{text} =~ s#\n#<br/>#g;
+        }
         if ($$settings{maindata}{ishtml} eq "false") {
             if ($$settings{maindata}{isnewline} eq "true") {
                 $$settings{maindata}{text} =~ s#\n#<br/>#g;
             }
         } else {
-            $$settings{maindata}{text} = &HTML::Entities::decode($$settings{maindata}{text});
+#            $$settings{maindata}{text} = &HTML::Entities::decode($$settings{maindata}{text});
         }
     }
 
-    open(FILE,">$destdir/resfiles/$res.html");
-    push @{$resrcfiles}, "$res.html";
-    print FILE qq|<html>
+    if (!open(FILE,">$destdir/resfiles/$res.html")) {
+        &Apache::lonnet::logthis("IMS import error: Cannot open file - $destdir/resfiles/$res.html - $!");
+    } else {
+        push @{$resrcfiles}, "$res.html";
+        my $htmldoc = 0;
+#        if ($$settings{maindata}{text} =~ m-&lt;(html|HTML)>.+&lt;\\(html|HTML)-) {
+        if ($$settings{maindata}{text} =~ m-<(html|HTML)>-) {
+            $htmldoc = 1;
+        }
+        unless ($htmldoc) {
+            print FILE qq|<html>
 <head>
 <title>$$settings{title}</title>
 </head>
 <body bgcolor='#ffffff'>
 $fontcol
 |;
-    unless ($$settings{title} eq '') { 
-        print FILE qq|$$settings{title}<br/><br/>\n|;
-    }
-    print FILE qq|
+        }
+        unless ($$settings{title} eq '') { 
+            print FILE qq|$$settings{title}<br/><br/>\n|;
+        }
+        print FILE qq|
 $$settings{maindata}{text}
 $linktag|;
-    if (defined($$settings{maindata}{textcolor})) {
-        print FILE qq|</font>|;
-    }
-    print FILE qq|
+        unless ($htmldoc) {
+            if (defined($$settings{maindata}{textcolor})) {
+                print FILE qq|</font>|;
+            }
+            print FILE qq|
   </body>
  </html>|;
-    close(FILE);
+        }
+        close(FILE);
+    }
 }
 
 
@@ -2139,7 +3775,6 @@ sub process_angelboards {
         my $msgcount = 0; 
                                                                                                      
         my $putresult = &Apache::lonnet::put($boardname,\%boardinfo,$cdom,$crs);
-#        print STDERR "putresult is $putresult for $boardname $cdom $crs\n";
         if ($db_handling eq 'importall') {
             foreach my $msg_id (@{$$messages{$$boards[$i]}}) {
                 $msgcount ++;
@@ -2304,5 +3939,33 @@ sub angel_content {
     close(FILE);
 }
 
+# ---------------------------------------------------------------- WebCT content
+sub webct4_content {
+    my ($res,$docroot,$destdir,$settings,$dom,$user,$type,$title,$resrcfiles) = @_;
+    if (!open(FILE,">$destdir/resfiles/$res.html")) {
+        &Apache::lonnet::logthis("IMS import error: Cannot open file - $destdir/resfiles/$res.html - $!");
+    } else {
+        push(@{$resrcfiles}, "$res.html");
+        my $linktag = '';
+        if (defined($$settings{url})) {
+            $linktag = qq|<a href="$$settings{url}"|;
+            if ($title ne '') {
+                $linktag .= qq|>$title</a>|;
+            } else {
+                $linktag .= qq|>$$settings{url}|;
+            }
+        }
+        print FILE qq|<html>
+<head>
+<title>$title</title>
+</head>
+<body bgcolor='#ffffff'>
+$linktag
+</body>
+</html>|;
+        close(FILE);
+    }
+}
+
 1;
 __END__