--- loncom/imspackages/imsprocessor.pm 2004/08/04 17:34:29 1.9
+++ loncom/imspackages/imsprocessor.pm 2005/10/14 22:28:56 1.29
@@ -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,15 +127,12 @@ sub uploadzip {
sub expand_zip {
my ($tempdir,$filename) = @_;
my $zipfile = "$tempdir/$filename";
+ if (!-e "$zipfile") {
+ 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';
}
@@ -118,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 = ();
@@ -139,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
@@ -156,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"],
@@ -273,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}) {
@@ -291,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') {
@@ -299,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);
+ }
+ }
}
}
}
@@ -309,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");
}
}
}
@@ -338,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,$context,$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;
@@ -404,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,$context,$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}} = ();
@@ -429,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}} = ();
@@ -454,6 +542,7 @@ sub process_resinfo {
&process_announce($key,$docroot,$destdir,\%{$$resinfo{$key}},$resinfo,$seqstem,$resrcfiles);
}
}
+ }
}
if (@{$announcements}) {
$$items{'Top'}{'contentscount'} ++;
@@ -466,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);
@@ -513,6 +617,7 @@ sub build_structure {
}
foreach my $key (sort keys %{$items}) {
+ if ($$includeditems{$key}) {
%{$flag{$key}} = (
page => 0,
seq => 0,
@@ -533,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} = "\n";
open(TOPFILE,">$destdir/sequences/Top.sequence");
print TOPFILE $seqtext{'Top'};
@@ -662,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|";
close(PAGEFILE);
@@ -689,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;
@@ -712,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;
}
@@ -722,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;
@@ -753,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 ++;
@@ -800,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";
}
@@ -1164,7 +1391,7 @@ sub process_link {
} elsif ("@state" eq "EXTERNALLINK TEXTCOLOR") {
$$settings{textcolor} = $attr->{value};
} elsif ("@state" eq "EXTERNALLINK DESCRIPTION FLAGS ISHTML") {
- $$settings{ishtml} = $attr->{value};
+ $$settings{ishtml} = $attr->{value};
} elsif ("@state" eq "EXTERNALLINK FLAGS ISAVAILABLE" ) {
$$settings{isavailable} = $attr->{value};
} elsif ("@state" eq "EXTERNALLINK FLAGS LAUNCHINNEWWINDOW" ) {
@@ -1438,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',
@@ -1496,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};
@@ -1510,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};
}
@@ -1522,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') {
@@ -1531,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};
@@ -1566,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;
@@ -1573,16 +1792,631 @@ 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) = @_;
+ my $xmlfile = $docroot.'/'.$res.".dat";
+ my @state = ();
+ my $id; # the current question ID
+ my $list; # the current list ID for multiple choice questions
+ my $response; # the current response ID
+ my $currtexttype;
+ my @curr_block = ();
+ my $curr_shuffle;
+ my $curr_class;
+ my $curr_matchitem;
+ my $curr_block_type;
+ my $curr_feedback_type;
+ my $p = HTML::Parser->new
+ (
+ xml_mode => 1,
+ start_h =>
+ [sub {
+ my ($tagname, $attr) = @_;
+ push @state, $tagname;
+ if ("@state" eq "questestinterop assessment") {
+ $$settings{title} = $attr->{title};
+ }
+ if ("@state" eq "questestinterop assessment rubric flow_mat material mat_extension mat_formattedtext") {
+ $currtexttype = $attr->{type};
+ }
+ if ("@state" eq "questestinterop section item presentation flow") {
+ $curr_block[0] = $attr->{class};
+ if ($curr_block[0] eq 'RESPONSE_BLOCK') {
+ $curr_block_type = 'response';
+ } elsif ($curr_block[0] eq 'RIGHT_MATCH_BLOCK') {
+ $curr_block_type = 'rightmatch';
+ }
+ }
+ if ("@state" eq "questestinterop section item presentation flow flow") {
+ $curr_block[1] = $attr->{class};
+ if ($curr_block[1] eq 'QUESTION_BLOCK') {
+ $curr_block_type = 'question';
+ }
+ }
+ if ("@state" eq "questestinterop section item presentation flow flow flow") {
+ $curr_block[2] = $attr->{class};
+ }
+ if ("@state" eq "questestinterop section item presentation flow flow flow material mat_extension mat_formatted_text") {
+ $$settings{$id}{$curr_block_type}{texttype} = $attr->{texttype};
+ $currtexttype = $attr->{texttype};
+ }
+ if ("@state" eq "questestinterop section item presentation flow flow flow material matapplication") {
+ $$settings{$id}{$curr_block_type}{image} = $attr->{uri};
+ $$settings{$id}{$curr_block_type}{style} = $attr->{embedded};
+ $$settings{$id}{$curr_block_type}{label} = $attr->{label};
+ }
+ if ("@state" eq "questestinterop section item presentation flow flow flow material mattext") {
+ $$settings{$id}{$curr_block_type}{link} = $attr->{uri};
+ }
+ if ("@state" eq "questestinterop section item presentation flow response_lid render_choice") {
+ $curr_shuffle = $attr->{shuffle};
+ }
+ if ("@state" eq "questestinterop section item presentation flow response_lid") { $response = $attr->{ident};
+ if ($curr_class eq 'Matching') {
+ %{$$settings{$id}{$response}} = ();
+ foreach my $key (keys(%{$$settings{$id}{$curr_block_type}})) {
+ $$settings{$id}{$response}{$key} = $$settings{$id}{$curr_block_type}{$key};
+ }
+ %{$$settings{$id}{$curr_block_type}} = ();
+ }
+ }
+ if ("@state" eq "questestinterop section item presentation flow response_lid render_choice flow response_label") {
+ if (($curr_class eq 'Multiple Choice') || ($curr_class eq 'Multiple Answer') || ($curr_class eq 'Order')) {
+ $list = $attr->{ident};
+ push(@{$$settings{$id}{lists}},$list);
+ $$settings{$id}{$list}{randomize} = $curr_shuffle;
+ %{$$settings{$id}{$list}} = ();
+ @{$$allanswers{$id}{$list}} = ();
+ @{$$settings{$id}{$list}{correctanswer}} = ();
+ } elsif ($curr_class eq 'Matching') {
+ push(@{$$settings{$id}{$response}{items}},$list);
+ }
+ }
+ if ("@state" eq "questestinterop section item presentation flow response_lid render_choice flow response_label flow_mat material matapplication") {
+ $$settings{$id}{$list}{filetype} = $attr->{embedded};
+ $$settings{$id}{$list}{label} = $attr->{label};
+ $$settings{$id}{$list}{uri} = $attr->{uri};
+ }
+ if ("@state" eq "questestinterop section item presentation flow response_lid render_choice flow response_label flow_mat material mattext") {
+ $$settings{$id}{$list}{link} = $attr->{uri};
+ }
+ if ("@state" eq "questestinterop section item resprocessing respcondition conditionvar varequal") {
+ if ($curr_class eq 'Matching') {
+ $curr_matchitem = $attr->{respident};
+ }
+ }
+ if ("@state" eq "questestinterop section item itemfeedback") {
+ $curr_feedback_type = $attr->{ident};
+ }
+ if ("@state" eq "questestinterop section item itemfeedback flow_mat flow_mat material matapplication") {
+ $$settings{$id}{$curr_feedback_type.'feedback'}{filetype} = $attr->{'embedded'};
+ $$settings{$id}{$curr_feedback_type.'feedback'}{label} = $attr->{label};
+ $$settings{$id}{$curr_feedback_type.'feedback'}{uri} = $attr->{uri};
+ }
+ if ("@state" eq "questestinterop section item itemfeedback flow_mat flow_mat material mattext") {
+ $$settings{$id}{$curr_feedback_type.'feedback'}{link} = $attr->{uri};
+ }
+ }, "tagname, attr"],
+ text_h =>
+ [sub {
+ my ($text) = @_;
+ $text =~ s/^\s+//g;
+ $text =~ s/\s+$//g;
+ if ("@state" eq "questestinterop assessment rubric flow_mat material mat_extension mat_formattedtext") {
+ $$settings{description} = $text;
+ } elsif ("@state" eq "questestinterop assessment presentation_material flow_mat material mat_extension mat_formattedtext") {
+ $$settings{instructions}{text} = $text;
+ }
+ if ("@state" eq "questestinterop assessment section item itemmetadata bbmd_asi_object_id") {
+ $id = $text;
+ push @{$allids}, $id;
+ %{$$settings{$id}} = ();
+ @{$$settings{$id}{lists}} = ();
+ %{$$settings{$id}{question}} = ();
+ %{$$settings{$id}{correctfeedback}} = ();
+ %{$$settings{$id}{incorrectfeedback}} = ();
+ %{$$settings{$id}{solutionfeedback}} = ();
+ %{$$settings{$id}{question}} = ();
+ %{$$settings{$id}{response}} = ();
+ }
+ if ("@state" eq "questestinterop assessment section item itemmetadata bbmd_questiontype") {
+ $$settings{$id}{class} = $text;
+ $curr_class = $text;
+ }
+ if ("@state" eq "questestinterop assessment section item presentation flow flow flow material mat_extension mat_formatted_text") {
+ $$settings{$id}{$curr_block_type}{text} = $text;
+ }
+ if ("@state" eq "questestinterop section item presentation flow flow flow material mattext") {
+ $$settings{$id}{$curr_block_type}{linktext} = $text;
+ }
+ if ("@state" eq "questestinterop section item presentation flow response_lid render_choice flow response_label flow_mat material mat_extension mat_formatted_text") {
+ $$settings{$id}{$list}{text} = $text;
+ }
+ if ("@state" eq "questestinterop section item presentation flow response_lid render_choice flow response_label flow_mat material mattext") {
+ $$settings{$id}{$list}{linktext} = $text;
+ }
+ if ("@state" eq "questestinterop section item resprocessing respcondition conditionvar varequal") {
+ if ($curr_class eq 'Multiple Choice') {
+ $$settings{$id}{$list}{correctanswer}[0] = $text;
+ } elsif ($curr_class eq 'True/False') {
+ $$settings{$id}{correctanswer} = $text;
+ } elsif ($curr_class eq 'Matching') {
+ $$settings{$id}{$curr_matchitem}{correctanswer} = $text;
+ } elsif ($curr_class eq 'Fill in the Blank') {
+ push(@{$$settings{$id}{$list}{correctanswer}},$text);
+ }
+ }
+ if ("@state" eq "questestinterop section item resprocessing respcondition conditionvar and varequal") {
+ push(@{$$settings{$id}{$list}{correctanswer}},$text);
+ }
+ if ("@state" eq "questestinterop section item itemfeedback flow_mat flow_mat material mat_extension mat_formattedtext") {
+ $$settings{$id}{$curr_feedback_type.'feedback'}{text} = $text;
+ }
+ if ("@state" eq "questestinterop section item itemfeedback flow_mat flow_mat material mattext") {
+ $$settings{$id}{$curr_feedback_type.'feedback'}{linkname} = $text;
+ }
+ }, "dtext"],
+ end_h =>
+ [sub {
+ my ($tagname) = @_;
+ pop @state;
+ }, "tagname"],
+ );
+ $p->unbroken_text(1);
+ $p->marked_sections(1);
+ $p->parse_file($xmlfile);
+ $p->eof;
+ 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") {
+ $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#(<img\ssrc=")([^"]+)">#$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 =>
@@ -1594,186 +2428,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 $newdir = "$destdir/problems/$dirtitle";
+ 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|
#
#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|
|;
+ $image = qq|
|;
} else {
- $output .= qq|
Link to file
|;
+ $imglink = qq|
Link to file
|;
}
}
if ( defined($$settings{$id}{url}) ) {
- $output .= qq|
$$settings{$id}{name}
|;
+ $url = qq|
$$settings{$id}{name}
|;
+ }
+ if ($context eq 'CSTR') {
+ $output .= $image.$imglink.$url.'
+
|;
+ $output .= "\>
|;
} else {
- $output .= qq|
Link to file
|;
+ $ans_link .= qq|
Link to file
|;
}
}
- $output .= qq|
#
#g;
+ $$settings{$id}{text} =~ s#
$$settings{$id}{text}
$questionimage'.$$settings{$id}{text}.'
'.$questionimage; + $resourcedata{$symb.'hiddenparts'} = '!essay'; + $resourcedata{$symb.'questiontype'} = 'essay'; + } + } else { + if ($context eq 'CSTR') { + $output .= qq|$$settings{$id}{text}
$questionimage'.$$settings{$id}{text}.'
'.$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| +