--- loncom/imspackages/imsprocessor.pm	2005/02/21 23:47:46	1.15
+++ loncom/imspackages/imsprocessor.pm	2005/07/20 05:13:46	1.27
@@ -24,6 +24,9 @@
 package Apache::imsprocessor;
 
 use Apache::lonnet;
+use Apache::loncleanup;
+use LWP::UserAgent;
+use HTTP::Request::Common;
 use LONCAPA::Configuration;
 use strict;
 
@@ -95,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
@@ -107,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/\/([^\/]+)$/) {
@@ -128,14 +131,8 @@ sub expand_zip {
         return 'no zip';
     }
     if ($filename =~ m|\.zip$|i) {
-    # unzip can cause an sh launch which can pass along all of %ENV
-    # which can be too large for /bin/sh to handle
-        my %oldENV=%ENV;
-        undef(%ENV);
         open(OUTPUT, "unzip -o $zipfile -d $tempdir  2> /dev/null |");
         close(OUTPUT);
-        %ENV=%oldENV;
-        undef(%oldENV);
     } else {
         return 'nozip';
     }
@@ -177,7 +174,7 @@ sub process_manifest {
 
     unless (-e "$tempdir/imsmanifest.xml") {
         return 'nomanifest';
-    } 
+    }
 
     my $xmlfile = $tempdir.'/imsmanifest.xml';
     my $p = HTML::Parser->new
@@ -187,23 +184,14 @@ 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)) {
+                    if ($state[-1] eq 'item') {
                         $itm = $attr->{identifier};
-                        if ($$includeditems{$itm} || $phase ne 'build') {              
+                        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') {
@@ -258,12 +246,20 @@ sub process_manifest {
                             $lastitem = $itm;
                         }
                     }
+                    if ($cms eq 'webct4') {
+                        if (($state[-1] eq "webct:properties") && (@state > 4)) {
+                            $$items{$itm}{properties} = $attr->{identifierref};
+                        }
+                    }
                 } elsif ("@state" eq "manifest resources resource" ) {
                     $identifier = $attr->{identifier};
                     if ($$includedres{$identifier} || $phase ne 'build') { 
-                        if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webct4') {
+                        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/(.+)$-) {
@@ -379,11 +375,11 @@ sub copy_resources {
                     $file =~ s-\\-/-g;
                     my $copyfile = $file;
                     if ($cms eq 'webct4') {
-                        if ($file =~ m-/([^/]+)$-) {
+                        if ($file =~ m-/my_files/(.+)$-) {
                             $copyfile = $1;
                         }
                     }
-                    unless (($cms eq 'webct4') && ($copyfile eq 'questionDB.xml' || $copyfile =~ m/^quiz_QIZ_\d+\.xml$/)) {
+                    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) {
@@ -422,14 +418,24 @@ sub copy_resources {
                             rename("$tempdir/$key/$file","$destdir/resfiles/$key/$file");
                         }
                     } elsif ($cms eq 'webct4') {
-                        if (!-e "$destdir/resfiles/$key") {
-                            mkdir("$destdir/resfiles/$key",0770);
-                        }
-                        if ($file =~ m-/([^/]+)$-) {
+                        if ($file =~ m-/my_files/(.+)$-) {
                             my $copyfile = $1;
-                            unless ($copyfile eq 'questionDB.xml' || $copyfile =~ m/^quiz_QIZ_\d+\.xml$/) { 
-                                rename("$tempdir/$file","$destdir/resfiles/$key/$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");
                         }
                     }
                 }
@@ -445,6 +451,8 @@ sub process_resinfo {
     my $dbparse = 0;
     my $announce_handling = 'include';
     my $longcrs = '';
+    my %qzdbsettings = ();
+    my %catinfo = ();
     if ($crs =~ m/^(\d)(\d)(\d)/) {
         $longcrs = $1.'/'.$2.'/'.$3.'/'.$crs;
     }
@@ -508,15 +516,15 @@ sub process_resinfo {
                 }
             } elsif ($$resources{$key}{type} eq "assessment/x-bb-pool") {
                 %{$$resinfo{$key}} = ();
-                &process_assessment($cms,$context,$key,$docroot,'pool',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse);
+                &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($cms,$context,$key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse);
+                &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($cms,$context,$key,$docroot,'survey',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse);
+                &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}} = ();
@@ -556,11 +564,9 @@ sub process_resinfo {
             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);
+                    &webct4_content($key,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$$resources{$key}{type},$$items{$$resources{$key}{revitm}}{title},$resrcfiles);
                 } elsif ($$resources{$key}{type} eq "webctquiz") {
-#                    &webct4_assessment($key,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$$resources{$key}{type},$$items{$$resources{$key}{revitm}}{title},$resrcfiles);
-                    &process_assessment($cms,$context,$key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse);
-
+                    &process_assessment($cms,$context,$key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs);
                 }
             }
         }
@@ -634,7 +640,6 @@ sub build_structure {
         my $type = $$resources{$resnum}{type};
         my $contentscount = $$items{$key}{'contentscount'}; 
         if (($cms eq 'angel' && $type eq "FOLDER") || (($cms eq 'bb5' || $cms eq 'bb6') && $$resinfo{$resnum}{'isfolder'} eq "true") && (($type eq "resource/x-bb-document") || ($type eq "resource/x-bb-staffinfo") || ($type eq "resource/x-bb-externallink")) || ($cms eq 'webct4' &&  $contentscount > 0)) {
-            print STDERR "$key is identified as a folder has $contentscount\n";
             unless (($cms eq 'bb5') && $key eq 'Top') {
                 $seqtext{$key} = "<map>\n";
             }
@@ -651,22 +656,32 @@ sub build_structure {
 <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 $contitemcount = $$items{$contitem}{contentscount}; 
-                my ($res,$itm,$type);
+                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};
                 my $packageflag = 0;
                 if (grep/^$res$/,@{$packages}) {
                     $packageflag = 1;
                 }
-                $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount);
+                $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;
@@ -695,16 +710,21 @@ sub build_structure {
                             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,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount);
-
+                            $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 ++;
@@ -722,12 +742,13 @@ sub build_structure {
                     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,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount);
+                    $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$$randompicks{$contitem});
 
                     if ($flag{$key}{page}) {
                         if ($count{$key}{seq} + $count{$key}{page} + $count{$key}{board} + $count{$key}{file} +1 == 1) {
@@ -737,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;
@@ -849,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,$contcount,$packageflag,$contitemcount) = @_;
+    my ($cms,$key,$srcstem,$flag,$count,$timestamp,$boardnum,$hrefs,$pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$randompick) = @_;
     my $src ='';
     if (($cms eq 'angel' && $type eq 'FOLDER') || (($cms eq 'bb5' || $cms eq 'bb6') && (($$resinfo{$res}{'isfolder'} eq 'true') || $key eq 'Top')) || ($cms eq 'webct4' && $contitemcount > 0)) {
         $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;
@@ -872,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;
             }
@@ -900,13 +931,25 @@ sub make_structure {
             $$flag{$key}{seq} = 0;
         }
     } elsif ($cms eq 'webct4') {
-        unless ($type eq 'webctquiz') {
-            foreach my $file (@{$$hrefs{$res}}) {
+        if ($type eq 'webctquiz') {
+            $src =  $srcstem.'/pages/'.$res.'.page';
+            $$count{$key}{page} ++;
+            $$flag{$key}{seq} = 0;
+        } else {
+            if (grep/^$file$/,@{$$hrefs{$res}}) {
                 my $filename;
                 if ($file =~ m-/([^/]+)$-) {
                     $filename = $1;
                 }
-                $src = $srcstem.'/resfiles/'.$res.'/'.$filename;
+                $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;
@@ -1626,7 +1669,6 @@ sub addposting {
 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 $id; # the current question ID
     my $answer_id; # the current answer ID
@@ -1685,7 +1727,7 @@ sub parse_bb5_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};
             }
@@ -1741,6 +1783,8 @@ sub parse_bb5_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;
@@ -1748,16 +1792,26 @@ sub parse_bb5_assessment {
                 $$settings{instructions}{text} = $text;
             }
         }
-        if ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "BODY") && ($state[3] eq "TEXT") ) {
-            $$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;       
+        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 =>
@@ -1767,6 +1821,7 @@ sub parse_bb5_assessment {
      }, "tagname"],
     );
     $p->unbroken_text(1);
+    $p->marked_sections(1);
     $p->parse_file($xmlfile);
     $p->eof;
 }
@@ -1777,9 +1832,8 @@ sub parse_bb6_assessment {
 }
 
 sub parse_webct4_assessment {
-    my ($res,$docroot,$container,$allids) = @_;
-    my $xmlfile = $docroot.'/quiz'.$res.".xml"; #quiz file
-    print STDERR "XML file is $xmlfile\n";
+    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
@@ -1791,7 +1845,6 @@ sub parse_webct4_assessment {
         push @state, $tagname;
         my $depth = 0;
         my @seq = ();
-        my $class;
         if ("@state" eq "questestinterop assessment section itemref") {
             $id = $attr->{linkrefid}; 
             push(@{$allids},$id);
@@ -1812,10 +1865,9 @@ sub parse_webct4_assessment {
     $p->eof;
 }
 
-sub parse_webct_quizprops {
-    my ($res,$docroot,$container,$qzparams) = @_;
-    my $xmlfile = $docroot.'/quiz'.$res.".xml"; #quiz file
-    print STDERR "XML file is $xmlfile\n";
+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
@@ -1825,34 +1877,32 @@ sub parse_webct_quizprops {
      [sub {
         my ($tagname, $attr) = @_;
         push @state, $tagname;
-        my $depth = 0;
-        my @seq = ();
-        my $class;
-        if ($state[0] eq 'properties' && $state[1] eq 'processing')  {
-            if ($state[2] eq 'scores' && $state[3] eq 'score') {
-                $$qzparams{$res}{weight} = $attr->{linkrefid};
-            } elsif ($state[2] eq 'selection' && $state[3] eq 'select') {
-                $$qzparams{$res}{numpick} = $attr->{linkrefid};      
-            }
-        }
      }, "tagname, attr"],
      text_h =>
      [sub {
         my ($text) = @_;
         if ($state[0] eq 'properties' && $state[1] eq 'delivery')  {
-             if ($state[2] eq 'time_available') {
+            if ($state[2] eq 'time_available') {
                 $$qzparams{$res}{opendate} = $text;
-             } elsif ($state[2] eq 'time_due') {
-                $$qzparams{$res}{opendate} = $text;
-             } elsif ($state[3] eq 'max_attempt') {
+            } 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') {
+            } 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}{answerdate} = $text;
-             }
+            if ($state[2] eq 'display_answer') {
+                $$qzparams{$res}{showanswer} = $text;
+            }
         } 
       }, "dtext"],
      end_h =>
@@ -1867,9 +1917,9 @@ sub parse_webct_quizprops {
 }
 
 sub parse_webct4_questionDB {
-    my ($docroot,$catinfo,$settings,$allanswers,$allchoices,$allids) = @_;
-    my $xmlfile = $docroot.'/questionDB.xml'; #quizDB file
-    print STDERR "XML file is $xmlfile\n";
+    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
@@ -1881,15 +1931,16 @@ sub parse_webct4_questionDB {
     my $unitid; # the current unit ID for numerical questions
     my $answer_id; # the current answer ID
     my $fdbk; # the current feedback ID
-    my $maxvar; # the current max variable for numerical problems
-    my $minvar; # the current min variable for numerical problems
-    my $stepvar; # the current step variable for numerical problems
-    my $fibtype; # the current fill-in-blank type fro numerical or string
-    my $prompt; 
+    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,
@@ -1907,45 +1958,59 @@ sub parse_webct4_questionDB {
             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}} = ();
-            @{$$allanswers{$id}{strings}} = ();
             $$settings{$id}{title} = $attr->{title};
+            $$settings{$id}{category} = $category;
+            $boxnum = 0;
         }
 
-# Matching
         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} = 'QUESTION_MATCH';        
+            $$settings{$id}{class} = 'match';
             $grp = $attr->{ident};
             push(@{$$settings{$id}{grps}},$grp);
             %{$$settings{$id}{$grp}} = ();
-            @{$$allanswers{$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} = 'QUESTION_MULTIPLEANSWER';
+            $$settings{$id}{class} = 'multiplechoice';
             $list = $attr->{ident};
             push(@{$$settings{$id}{lists}},$list);
             %{$$settings{$id}{$list}} = ();
@@ -1963,29 +2028,32 @@ sub parse_webct4_questionDB {
         }
         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} = 'QUESTION_NUMERICAL';
+            $$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") {            
-            $minvar = $attr->{name};
-            $$settings{$id}{$numid}{minvar} = $minvar;
+            $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_minvalue webct:x_webct_v01_variable") {
-            $maxvar = $attr->{name};
-            $$settings{$id}{$numid}{maxvar} = $maxvar;
+        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") {
-            $stepvar = $attr->{name};
-            $$settings{$id}{$numid}{stepvar} = $stepvar;
+            $currvar = $attr->{name};
         }
         if ("@state" eq "questestinterop section item presentation response_num render_fib") {
             $fibtype = $attr->{fibtype};
@@ -1999,29 +2067,26 @@ sub parse_webct4_questionDB {
         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};
-            %{$$settings{$id}{$str_id}{$label}} = ();
-            push(@{$$allanswers{$id}{strings}},$label);
+            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 presentation response_str render_fib") {
-            $fibtype = $attr->{fibtype};
-            $prompt = $attr->{prompt};
-        }
-        if ("@state" eq "questestinterop section item resprocessing itemproc_extension webct:x_webct_v01_autocalculate webct:x_webct_v01_formula") {
-            $$settings{$id}{$numid}{formula} = $attr->{ident};
-        }
         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};
@@ -2030,8 +2095,9 @@ sub parse_webct4_questionDB {
             $$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};
+            $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};
@@ -2039,23 +2105,35 @@ sub parse_webct4_questionDB {
 
 # Matching 
         if ("@state" eq "questestinterop section item resprocessing respcondition conditionvar varequal") {
-            $grp = $attr->{respident};
+            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 conditionvar setvar") {
+        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 
+# 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} = 'QUESTION_FILLINBLANK';
-            $answer_id = $attr->{respident};
-            $$settings{$id}{class} = '';
+            $$settings{$id}{class} = 'string';
+            $label = $attr->{respident};
         }
         if ("@state" eq "questestinterop section item resprocessing respcondition conditionvar not") {
-            $$settings{$id}{class} = 'QUESTION_ESSAY';
+            $$settings{$id}{class} = 'paragraph';
         }
  
 
@@ -2073,22 +2151,31 @@ sub parse_webct4_questionDB {
         }
         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';
+            }
         }
 
-#Matching
-
         if ("@state" eq "questestinterop section item presentation material mattext") {
             $$settings{$id}{text} = $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;
@@ -2109,31 +2196,49 @@ sub parse_webct4_questionDB {
             $$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}{$minvar}{min} = $text;
+             $$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}{$maxvar}{max} = $text;
+             $$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}{$stepvar}{step} = $text;
+             $$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") {
-            $answer_id = $text;
+            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
-            push(@{$$settings{$id}{strings}{$answer_id}},$text);
+            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 conditionvar setvar") {
+        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;   
+                        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;
         }
@@ -2151,17 +2256,29 @@ sub parse_webct4_questionDB {
     $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 ++;
+                    }
+                }
+            }
+        }
+    }
 }
 
 sub process_assessment {
-    my ($cms,$context,$res,$docroot,$container,$dirname,$destdir,$settings,$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,$dbparse) = @_;
+    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 %catinfo = ();
-    my %qzdbsettings = ();
     my %alldbanswers = ();
     my %alldbchoices = ();
     my @alldbquestids = ();
@@ -2170,7 +2287,7 @@ sub process_assessment {
     my $randompickflag = 0;
     my ($cid,$cdom,$cnum);
     if ($context eq 'DOCS') {
-        $cid = $ENV{'request.course.id'};
+        $cid = $env{'request.course.id'};
         ($cdom,$cnum) = split/_/,$cid;
     }
     my $destresdir = $destdir;
@@ -2185,24 +2302,24 @@ sub process_assessment {
         &parse_bb6_assessment($res,$docroot,$container,$settings,\%allanswers,\%allchoices,\@allids);
     } elsif ($cms eq 'webct4') {
         unless($$dbparse) {
-            &parse_webct4_questionDB($docroot,\%catinfo,\%qzdbsettings,\%alldbanswers,\%alldbchoices,\@alldbquestids);
+            &parse_webct4_questionDB($docroot,$$resources{$res}{file},$catinfo,$qzdbsettings,\%alldbanswers,\%alldbchoices,\@alldbquestids);
             if (!-e "$destdir/sequences") {
                 mkdir("$destdir/sequences",0755);
             }
-            my $numcats = keys %catinfo;
+            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;
+            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>|;
+                    print $fh qq|<resource id="1" src="$catsrc" type="start" title="$$catinfo{$category}{title}"></resource>|;
                 }
                 if ($numcats == 1) {
                     print $fh qq|
@@ -2214,7 +2331,7 @@ sub process_assessment {
                     $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}"|;
+<resource id="$next_id" src="$catsrc" title="$$catinfo{$category}{title}"|;
                     if ($next_id == $numcats) {
                         print $fh qq| type="finish"></resource>\n|;
                     } else {
@@ -2228,46 +2345,51 @@ sub process_assessment {
                 if (!-e "$destdir/problems/$seqname") {
                     mkdir("$destdir/problems/$seqname",0755);
                 }
-                my $newdir = "$destdir/problems/$seqname";
+                $newdir = "$destdir/problems/$seqname";
                 my $dbcontainerdir;
-                &build_problem_container($seqname,$newdir,$destdir,'database',$seqname,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@{$catinfo{$category}{contents}},$udom,$uname,$dirname,\$dbcontainerdir,\$newdir,$cid,$cdom,$cnum);
+                &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,$settings,$dirname,\%alldbanswers,\%alldbchoices,$total,$cid,$cdom,$cnum);
+            &write_webct4_questions(\@alldbquestids,$context,$qzdbsettings,$dirname,\%alldbanswers,\%alldbchoices,$total,$cid,$cdom,$cnum,$destdir,$catinfo);
             $$dbparse = 1;
         }
-        &parse_webct4_quizprops($res,$docroot,$container,\%qzparams);
-        foreach (sort keys %qzparams) {
-            if (exists($qzparams{$res}{numpick})) { 
-                if ($qzparams{$res}{numpick} < @allids) {
-                    $$randompicks{$res} = $qzparams{$res}{numpick};
-                    $randompickflag = 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;
             }
         }
-        &parse_webct4_assessment($res,$docroot,$container,\@allids);
-    }
-    my $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);
+    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";
     }
-    my $newdir = "$destdir/problems/$dirtitle";
 
-    &build_problem_container($dirtitle,$newdir,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@allids,$udom,$uname,$dirname,\$containerdir,\$newdir,$cid,$cdom,$cnum);
+    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,$res,\%allanswers,\%allchoices,$total,$newdir,$cid,$cdom,$cnum);
+        &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,$res,\%allanswers,\%allchoices,$total,$newdir,$cid,$cdom,$cnum);
+        &write_bb6_questions(\@allids,$containerdir,$context,$settings,$dirname,$destdir,$res,\%allanswers,\%allchoices,$total,$newdir,$cid,$cdom,$cnum);
     }
 }
 
 sub build_problem_container {
-    my ($dirtitle,$newdir,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,$allids,$udom,$uname,$dirname,$containerdir,$newdir,$cid,$cdom,$cnum) = @_;
+    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;
@@ -2292,9 +2414,28 @@ sub build_problem_container {
     }
     print $fh qq|<map>
 |;
+    my %probtitle = ();
     my $probsrc = "/res/lib/templates/simpleproblem.problem";
     if ($context eq 'CSTR') {
-        $probsrc="/res/$udom/$uname/$dirname/problems/$dirtitle/$$allids[0].problem";
+        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) {
@@ -2310,7 +2451,15 @@ sub build_problem_container {
             $curr_id = $j;
             $next_id = $curr_id + 1;
             if ($context eq 'CSTR') {
-                $probsrc = "/res/$udom/$uname/$dirname/problems/$dirtitle/$$allids[$j].problem";
+                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 {
+                    $probsrc = "$dirname/problems/$dirtitle/$probtitle{$$allids[$j]}.problem";
+                }
             }
             print $fh qq|
 <link from="$curr_id" to="$next_id" index="$curr_id"></link>
@@ -2327,9 +2476,19 @@ sub build_problem_container {
 }
 
 sub write_bb5_questions {
-    my ($allids,$containerdir,$context,$settings,$dirname,$res,$allanswers,$allchoices,$total,$newdir,$cid,$cdom,$cnum) = @_;
+    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;
@@ -2409,7 +2568,7 @@ sub write_bb5_questions {
                         $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 {
@@ -2673,7 +2832,11 @@ sub write_bb5_questions {
         if ($context eq 'CSTR') {
             $output .= qq|</problem>
 |;
-            open(PROB,">$newdir/$id.problem");
+            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 {
@@ -2685,11 +2848,578 @@ sub write_bb5_questions {
 }
 
 sub write_webct4_questions {
-    my ($alldbquestids,$context,$settings,$dirname,$alldbanswers,$alldbchoices,$total,$cid,$cdom,$cnum) = @_;
+    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} =~ s/(\&)(nbsp|gt|lt)(?!;)/$1$2;$3/gi;
+            $$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>#<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,$res,$allanswers,$allchoices) = @_;
+    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;
+    }
 }
 
 # ---------------------------------------------------------------- Process Blackboard Announcements
@@ -3234,11 +3964,5 @@ $linktag
     }
 }
 
-# ---------------------------------------------------------------- WebCT assessments
-sub webct4_assessment {
-    my ($res,$docroot,$destdir,$settings,$dom,$user,$type,$title,$resrcfiles) = @_;
-    print STDERR "webct assessment detected - $res, $docroot, $destdir, $type,$title\n";
-}
-
 1;
 __END__