--- loncom/imspackages/imsprocessor.pm 2006/03/24 17:16:07 1.33
+++ loncom/imspackages/imsprocessor.pm 2011/11/03 17:54:53 1.50
@@ -1,3 +1,8 @@
+# The LearningOnline Network with CAPA
+# Processor for IMS Packages
+#
+# $Id: imsprocessor.pm,v 1.50 2011/11/03 17:54:53 raeburn Exp $
+#
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -25,6 +30,7 @@ package Apache::imsprocessor;
use Apache::lonnet;
use Apache::loncleanup;
+use Apache::lonlocal;
use LWP::UserAgent;
use HTTP::Request::Common;
use LONCAPA::Configuration;
@@ -32,7 +38,7 @@ use strict;
sub ims_config {
my ($areas,$cmsmap,$areaname) = @_;
- @{$areas} = ("doc","extlink","announce","staff","board","quiz","survey","pool","users");
+ @{$areas} = ("doc","extlink","announce","staff","board","quiz","survey","pool","users","question");
%{$$cmsmap{bb5}} = (
announce => 'resource/x-bb-announcement',
board => 'resource/x-bb-discussionboard',
@@ -56,26 +62,33 @@ sub ims_config {
users => 'course/x-bb-user',
);
$$cmsmap{bb6}{conference} = 'resource/x-bb-conference';
- %{$$cmsmap{angel}} = (
+ %{$$cmsmap{angel5}} = (
board => 'BOARD',
extlink => 'LINK',
msg => 'MESSAGE',
quiz => 'QUIZ',
survey => 'FORM',
);
- @{$$cmsmap{angel}{doc}} = ('FILE','PAGE');
- %{$$cmsmap{webct4}} = (
+ @{$$cmsmap{angel5}{doc}} = ('FILE','PAGE');
+ %{$$cmsmap{webctce4}} = (
quiz => 'webctquiz',
survey => 'webctsurvey',
doc => 'webcontent'
);
- %{$areaname} = (
+ %{$$cmsmap{webctvista4}} = (
+ question => 'webct.question',
+ quiz => 'webct.assessment',
+ survey => 'webctsurvey',
+ doc => 'webcontent'
+ );
+ %{$areaname} = &Apache::lonlocal::texthash (
announce => 'Announcements',
board => 'Discussion Boards',
doc => 'Documents, pages, and folders',
extlink => 'Links to external sites',
pool => 'Question pools',
quiz => 'Quizzes',
+ question => 'Assessment Questions',
staff => 'Staff information',
survey => 'Surveys',
users => 'Enrollment',
@@ -157,15 +170,11 @@ sub process_manifest {
my %toc = (
bb6 => 'organization',
bb5 => 'tableofcontents',
- angel => 'organization',
- webct4 => 'organization',
+ angel5 => 'organization',
+ webctce4 => 'organization',
+ webctvista4 => 'organization'
);
- my %contents = ();
- my @state = ();
- my $itm = '';
- my $identifier = '';
my @seq = "Top";
- my $lastitem;
%{$$items{'Top'}} = (
contentscount => 0,
resnum => 'toplevel',
@@ -174,7 +183,7 @@ sub process_manifest {
revitm => 'Top'
);
- if ($cms eq 'angel') {
+ if ($cms eq 'angel5') {
$$resources{'toplevel'}{type} = "FOLDER";
} elsif ($cms eq 'bb5' || $cms eq 'bb6') {
$$resources{'toplevel'}{type} = 'resource/x-bb-document';
@@ -187,6 +196,20 @@ sub process_manifest {
}
my $xmlfile = $tempdir.'/imsmanifest.xml';
+ &parse_manifest($cms,$phase,$tempdir,$xmlfile,\%toc,$includedres,
+ $includeditems,$items,$resources,$resinfo,$hrefs,\@seq);
+ return 'ok' ;
+}
+
+sub parse_manifest {
+ my ($cms,$phase,$tempdir,$xmlfile,$toc,$includedres,$includeditems,$items,
+ $resources,$resinfo,$hrefs,$seq) = @_;
+ my @state = ();
+ my $itm = '';
+ my %contents = ();
+ my $identifier = '';
+ my @allidentifiers = ();
+ my $lastitem;
my $p = HTML::Parser->new
(
xml_mode => 1,
@@ -195,19 +218,19 @@ sub process_manifest {
my ($tagname, $attr) = @_;
push @state, $tagname;
my $start = @state - 3;
- if ( ($state[0] eq "manifest") && ($state[1] eq "organizations") && ($state[2] eq $toc{$cms}) ) {
+ if ( ($state[0] eq "manifest") && ($state[1] eq "organizations") && ($state[2] eq $$toc{$cms}) ) {
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') {
+ if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webctce4' || $cms eq 'webctvista4') {
$$items{$itm}{resnum} = $attr->{identifierref};
if ($cms eq 'bb5') {
$$items{$itm}{title} = $attr->{title};
}
- } elsif ($cms eq 'angel') {
+ } elsif ($cms eq 'angel5') {
if ($attr->{identifierref} =~ m/^res(.+)$/) {
$$items{$itm}{resnum} = $1;
}
@@ -216,32 +239,32 @@ sub process_manifest {
%{$$resources{$$items{$itm}{resnum}}} = ();
}
$$resources{$$items{$itm}{resnum}}{revitm} = $itm;
- if ($start > @seq) {
+ if ($start > @{$seq}) {
unless ($lastitem eq '') {
- push @seq, $lastitem;
- unless ( defined($contents{$seq[-1]}) ) {
- @{$contents{$seq[-1]}} = ();
+ push @{$seq}, $lastitem;
+ unless ( defined($contents{$$seq[-1]}) ) {
+ @{$contents{$$seq[-1]}} = ();
}
- push @{$contents{$seq[-1]}},$itm;
- $$items{$itm}{parentseq} = $seq[-1];
+ push @{$contents{$$seq[-1]}},$itm;
+ $$items{$itm}{parentseq} = $$seq[-1];
}
- } elsif ($start < @seq) {
- my $diff = @seq - $start;
+ } elsif ($start < @{$seq}) {
+ my $diff = @{$seq} - $start;
while ($diff > 0) {
- pop @seq;
+ pop @{$seq};
$diff --;
}
- if (@seq) {
- push @{$contents{$seq[-1]}}, $itm;
+ if (@{$seq}) {
+ push @{$contents{$$seq[-1]}}, $itm;
}
} else {
- push @{$contents{$seq[-1]}}, $itm;
+ push @{$contents{$$seq[-1]}}, $itm;
}
my $path;
- if (@seq > 1) {
- $path = join(',',@seq);
- } elsif (@seq > 0) {
- $path = $seq[0];
+ if (@{$seq} > 1) {
+ $path = join(',',@{$seq});
+ } elsif (@{$seq} > 0) {
+ $path = $$seq[0];
}
$$items{$itm}{filepath} = $path;
if ($cms eq 'bb5' || $cms eq 'bb6') {
@@ -252,25 +275,30 @@ sub process_manifest {
$$resinfo{$$items{$itm}{resnum}}{'isfolder'} = 'true';
}
}
- $$items{$seq[-1]}{contentscount} ++;
+ $$items{$$seq[-1]}{contentscount} ++;
+ $$resources{$$items{$itm}{resnum}}{seqref} = $seq;
$lastitem = $itm;
}
}
- if ($cms eq 'webct4') {
+ if ($cms eq 'webctce4') {
if (($state[-1] eq "webct:properties") && (@state > 4)) {
$$items{$itm}{properties} = $attr->{identifierref};
}
}
} elsif ("@state" eq "manifest resources resource" ) {
$identifier = $attr->{identifier};
+ push(@allidentifiers,$identifier);
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') {
+ } elsif ($cms eq 'webctce4') {
$$resources{$identifier}{type} = $attr->{type};
$$resources{$identifier}{file} = $attr->{href};
- } elsif ($cms eq 'angel') {
+ } elsif ($cms eq 'webctvista4') {
+ $$resources{$identifier}{type} = $attr->{type};
+ $$resources{$identifier}{'webct:coType'} = $attr->{'webct:coType'};
+ } elsif ($cms eq 'angel5') {
$identifier = substr($identifier,3);
if ($attr->{href} =~ m-^_assoc/$identifier/(.+)$-) {
$$resources{$identifier}{file} = $1;
@@ -280,14 +308,37 @@ sub process_manifest {
}
} elsif ("@state" eq "manifest resources resource file") {
if ($$includedres{$identifier} || $phase ne 'build') {
- if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webct4') {
+ if ($cms eq 'webctvista4') {
+ $$resources{$identifier}{file} = $attr->{href};
+ }
+ if ($cms eq 'bb5' || $cms eq 'bb6' ||
+ $cms eq 'webctce4' || $cms eq 'webctvista4') {
push @{$$hrefs{$identifier}},$attr->{href};
- } elsif ($cms eq 'angel') {
+ if ($$resources{$identifier}{type} eq
+ 'webct.manifest') {
+ my $manifestfile = $tempdir.'/'.$attr->{href};
+ my $currseqref = [];
+ if ($itm) {
+ $currseqref =
+ $$resources{$$items{$itm}{resnum}}{seqref};
+ }
+ &parse_manifest($cms,$phase,$tempdir,$manifestfile,
+ $toc,$includedres,$includeditems,
+ $items,$resources,$resinfo,
+ $hrefs,$currseqref);
+ }
+ } elsif ($cms eq 'angel5') {
if ($attr->{href} =~ m/^_assoc\\$identifier\\(.+)$/) {
push @{$$hrefs{$identifier}},$1;
} elsif ($attr->{href} =~ m/^Icons\\icon(\w+)\.gif/) {
$$resources{$identifier}{type} = $1;
}
+ }
+ }
+ } elsif ("@state" eq "manifest webct:ContentObject") {
+ foreach my $ident (@allidentifiers) {
+ if ($$resources{$ident}{type} eq 'ims_qtiasiv1p2') {
+ $$resources{$ident}{type} = $attr->{'webct:coType'};
}
}
}
@@ -298,12 +349,12 @@ sub process_manifest {
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 ($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') {
+ if ($cms eq 'angel5' || $cms eq 'bb6' || $cms eq 'webctvista4') {
$$items{$itm}{title} = $text;
}
- if ($cms eq 'webct4') {
+ if ($cms eq 'webctce4') {
$$items{$itm}{title} = $text;
$$items{$itm}{title} =~ s/(<[^>]*>)//g;
}
@@ -318,11 +369,9 @@ sub process_manifest {
);
$p->parse_file($xmlfile);
$p->eof;
-
foreach my $itm (keys %contents) {
@{$$items{$itm}{contents}} = @{$contents{$itm}};
}
- return 'ok' ;
}
sub get_imports {
@@ -365,31 +414,31 @@ sub target_resources {
}
sub copy_resources {
- my ($context,$cms,$hrefs,$tempdir,$targets,$url,$crs,$cdom,$destdir,$timenow) = @_;
+ my ($context,$cms,$hrefs,$tempdir,$targets,$url,$crs,$cdom,$destdir,$timenow,$assessmentfiles,$total) = @_;
if ($context eq 'DOCS') {
foreach my $key (sort keys %{$hrefs}) {
if (grep/^$key$/,@{$targets}) {
%{$$url{$key}} = ();
foreach my $file (@{$$hrefs{$key}}) {
my $source = $tempdir.'/'.$key.'/'.$file;
- if ($cms eq 'webct4') {
+ if ($cms eq 'webctce4' || $cms eq 'webctvista4') {
$source = $tempdir.'/'.$file;
}
my $filename = '';
my $fpath = $timenow.'/resfiles/'.$key.'/';
- if ($cms eq 'angel') {
+ if ($cms eq 'angel5') {
if ($file eq 'pg'.$key.'.htm') {
next;
}
}
$file =~ s-\\-/-g;
my $copyfile = $file;
- if ($cms eq 'webct4') {
+ if ($cms eq 'webctce4' || $cms eq 'webctvista4') {
if ($file =~ m-/my_files/(.+)$-) {
$copyfile = $1;
}
}
- unless (($cms eq 'webct4') && ($copyfile =~ m/questionDB\.xml$/ || $copyfile =~ m/quiz_QIZ_\d+\.xml$/ || $copyfile =~ m/properties_QIZ_\d+\.xml$/)) {
+ unless ((($cms eq 'webctce4') && ($copyfile =~ m/questionDB\.xml$/ || $copyfile =~ m/quiz_QIZ_\d+\.xml$/ || $copyfile =~ m/properties_QIZ_\d+\.xml$/)) || (($cms eq 'webctvista4') && (grep/^$key$/,@{$assessmentfiles}) && $file =~ /\.xml$/)) {
$copyfile = $fpath.$copyfile;
my $fileresult;
if (-e $source) {
@@ -407,7 +456,7 @@ sub copy_resources {
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 ( ($cms eq 'angel5' && $file ne 'pg'.$key.'.htm') || ($cms eq 'bb5') || ($cms eq 'bb6')) {
if (!-e "$destdir/resfiles/$key") {
mkdir("$destdir/resfiles/$key",0770);
}
@@ -422,12 +471,20 @@ sub copy_resources {
mkdir("$fulldir",0770);
}
}
- if ($cms eq 'angel') {
- rename("$tempdir/_assoc/$key/$file","$destdir/resfiles/$key/$file");
+ my $renameres;
+ if ($cms eq 'angel5') {
+ $renameres = rename("$tempdir/_assoc/$key/$file","$destdir/resfiles/$key/$file");
} elsif ($cms eq 'bb5' || $cms eq 'bb6') {
- rename("$tempdir/$key/$file","$destdir/resfiles/$key/$file");
+ $renameres = rename("$tempdir/$key/$file","$destdir/resfiles/$key/$file");
+ }
+ if ($renameres) {
+ if (ref($total) eq 'HASH') {
+ $$total{'file'} ++;
+ }
+ } else {
+ &Apache::lonnet::logthis("IMS import error: $cms - renaming failed for file $file");
}
- } elsif ($cms eq 'webct4') {
+ } elsif ($cms eq 'webctce4') {
if ($file =~ m-/my_files/(.+)$-) {
my $copyfile = $1;
if ($copyfile =~ m-^[^/]+/[^/]+-) {
@@ -442,7 +499,14 @@ sub copy_resources {
}
}
if (-e "$tempdir/$file") {
- rename("$tempdir/$file","$destdir/resfiles/$copyfile");
+ my $renameres = rename("$tempdir/$file","$destdir/resfiles/$copyfile");
+ if ($renameres) {
+ if (ref($total) eq 'HASH') {
+ $$total{'file'} ++;
+ }
+ } else {
+ &Apache::lonnet::logthis("IMS import error: WebCT4 - renaming failed for file $file");
+ }
}
} elsif ($file !~ m-/data/(.+)$-) {
&Apache::lonnet::logthis("IMS import error: WebCT4 - file $file is in unexpected location");
@@ -461,6 +525,8 @@ sub process_resinfo {
my $dbparse = 0;
my $announce_handling = 'include';
my $longcrs = '';
+ my %allassessments = ();
+ my %allquestions = ();
my %qzdbsettings = ();
my %catinfo = ();
if ($crs =~ m/^(\d)(\d)(\d)/) {
@@ -471,7 +537,7 @@ sub process_resinfo {
mkdir("$destdir/resfiles",0770);
}
}
- if ($cms eq 'angel') {
+ if ($cms eq 'angel5') {
my $currboard = '';
foreach my $key (sort keys %{$resources}) {
if (grep/^$key$/,@{$targets}) {
@@ -526,15 +592,15 @@ sub process_resinfo {
}
} elsif ($$resources{$key}{type} =~/assessment\/x\-bb\-(qti\-)?pool/) {
%{$$resinfo{$key}} = ();
- &process_assessment($cms,$context,$key,$docroot,'pool',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs);
+ &process_assessment($cms,$context,$key,$docroot,'pool',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs,\%allquestions);
push @{$pools}, $key;
} elsif ($$resources{$key}{type} =~ /assessment\/x\-bb\-(qti\-)?quiz/) {
%{$$resinfo{$key}} = ();
- &process_assessment($cms,$context,$key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs);
+ &process_assessment($cms,$context,$key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs,\%allquestions);
push @{$quizzes}, $key;
} elsif ($$resources{$key}{type} =~ /assessment\/x\-bb\-(qti\-)?survey/) {
%{$$resinfo{$key}} = ();
- &process_assessment($cms,$context,$key,$docroot,'survey',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs);
+ &process_assessment($cms,$context,$key,$docroot,'survey',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs,\%allquestions);
push @{$surveys}, $key;
} elsif ($$resources{$key}{type} eq "assessment/x-bb-group") {
%{$$resinfo{$key}} = ();
@@ -569,17 +635,63 @@ sub process_resinfo {
if (@{$pools}) {
$$items{'Top'}{'contentscount'} ++;
}
- } elsif ($cms eq 'webct4') {
+ } elsif ($cms eq 'webctce4') {
foreach my $key (sort keys %{$resources}) {
if (grep/^$key$/,@{$targets}) {
if ($$resources{$key}{type} eq "webcontent") {
%{$$resinfo{$key}} = ();
- &webct4_content($key,$docroot,$destdir,\%{$$resinfo{$key}},$udom,$uname,$$resources{$key}{type},$$items{$$resources{$key}{revitm}}{title},$resrcfiles);
+ if ($$resources{$key}{file} eq 'questiondb.xml') {
+ &process_assessment($cms,$context,$key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs,\%allquestions);
+ } else {
+ &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);
+ &process_assessment($cms,$context,$key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs,\%allquestions);
}
}
}
+ } elsif ($cms eq 'webctvista4') {
+ foreach my $key (sort keys %{$resources}) {
+ if (grep/^$key$/,@{$targets}) {
+ %{$$resinfo{$key}} = ();
+ if ($$resources{$key}{type} eq 'webct.question') {
+ $allquestions{$key} = 1;
+ } elsif ($$resources{$key}{type} eq 'webct.assessment') {
+ $allassessments{$key} = 1;
+ }
+ }
+ }
+ if (keys(%allassessments) > 0) {
+ foreach my $key (sort(keys(%allassessments))) {
+ &process_assessment($cms,$context,$key,$docroot,'quiz',$dirname,$destdir,\%{$$resinfo{$key}},$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,\$dbparse,$resources,$items,\%catinfo,\%qzdbsettings,$hrefs,\%allquestions);
+ }
+ } elsif (keys(%allquestions) > 0) {
+ my %catinfo = ();
+ my @allids = ();
+ my @allquestids = ();
+ my %allanswers = ();
+ my %allchoices = ();
+ my $containerdir;
+ my $newdir;
+ my $cid;
+ my $randompickflag = 0;
+ if ($context eq 'DOCS') {
+ $cid = $env{'request.course.id'};
+ }
+ my $destresdir = $destdir;
+ my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+ if ($context eq 'CSTR') {
+ $destresdir =~ s{^\Q$londocroot/priv/\E}{/res/};
+ } elsif ($context eq 'DOCS') {
+ $destresdir =~ s{^\Q$londocroot/userfiles\E}{/uploaded};
+ }
+ foreach my $res (sort(keys(%allquestions))) {
+ my $parent = $allquestions{$res};
+ &parse_webctvista4_question($res,$docroot,$resources,$hrefs,\%qzdbsettings,\@allquestids,\%allanswers,\%allchoices,$parent,\%catinfo);
+ }
+ &build_category_sequences($destdir,\%catinfo,$sequencesfiles,$pagesfiles,$destresdir,$newdir,$cms,$total,$randompickflag,$context,$udom,$uname,$dirname,$cid,$cdom,$crs,\%qzdbsettings);
+ &write_webct4_questions($cms,\@allquestids,$context,\%qzdbsettings,$dirname,\%allanswers,\%allchoices,$total,$cid,$cdom,$crs,$destdir,\%catinfo);
+ }
}
$$total{'board'} = $board_count;
@@ -648,8 +760,12 @@ sub build_structure {
my $curr_id = 1;
my $resnum = $$items{$key}{resnum};
my $type = $$resources{$resnum}{type};
- my $contentscount = $$items{$key}{'contentscount'};
- if (($cms eq 'angel' && $type eq "FOLDER") || (($cms eq 'bb5' || $cms eq 'bb6') && $$resinfo{$resnum}{'isfolder'} eq "true") && (($type eq "resource/x-bb-document") || ($type eq "resource/x-bb-staffinfo") || ($type eq "resource/x-bb-externallink")) || ($cms eq 'webct4' && $contentscount > 0)) {
+ my $contentscount = $$items{$key}{'contentscount'};
+ my $seqtitle = $$items{$key}{'title'};
+ $seqtitle =~ s|/+|_|g;
+ $seqtitle =~ s/\s+/_/g;
+ $seqtitle .= '_'.$key;
+ if (($cms eq 'angel5' && $type eq "FOLDER") || (($cms eq 'bb5' || $cms eq 'bb6') && $$resinfo{$resnum}{'isfolder'} eq "true") && (($type eq "resource/x-bb-document") || ($type eq "resource/x-bb-staffinfo") || ($type eq "resource/x-bb-externallink")) || ($cms eq 'webctce4' && $contentscount > 0)) {
unless (($cms eq 'bb5') && $key eq 'Top') {
$seqtext{$key} = "<map>\n";
}
@@ -686,7 +802,7 @@ sub build_structure {
if (grep/^$res$/,@{$packages}) {
$packageflag = 1;
}
- $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$$randompicks{$contitem});
+ $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$$randompicks{$contitem},$title);
unless ($flag{$key}{page} == 1) {
if ($$randompicks{$contitem}) {
$seqtext{$key} .= qq|
@@ -726,7 +842,7 @@ sub build_structure {
if (grep/^$res$/,@{$packages}) {
$packageflag = 1;
}
- $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$$randompicks{$contitem});
+ $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$$randompicks{$contitem},$title);
unless ($flag{$key}{page} == 1) {
$seqtext{$key} .= qq|></resource>
<link from="$curr_id" to="$next_id" index="$curr_id"></link>\n|;
@@ -758,7 +874,7 @@ sub build_structure {
if (grep/^$res$/,@{$packages}) {
$packageflag = 1;
}
- $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$$randompicks{$contitem});
+ $src = &make_structure($cms,$key,$srcstem,\%flag,\%count,$timestamp,$boardnum,$hrefs,\%pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$$randompicks{$contitem},$title);
if ($flag{$key}{page}) {
if ($count{$key}{seq} + $count{$key}{page} + $count{$key}{board} + $count{$key}{file} +1 == 1) {
@@ -792,10 +908,15 @@ sub build_structure {
}
unless (($cms eq 'bb5') && $key eq 'Top') {
$seqtext{$key} .= "</map>\n";
- open(LOCFILE,">$destdir/sequences/$key.sequence");
+ if ($cms eq 'webctce4' && $key ne 'Top') {
+ push @{$seqfiles}, "$seqtitle.sequence";
+ open(LOCFILE,">$destdir/sequences/$seqtitle.sequence");
+ } else {
+ push @{$seqfiles}, "$key.sequence";
+ open(LOCFILE,">$destdir/sequences/$key.sequence");
+ }
print LOCFILE $seqtext{$key};
close(LOCFILE);
- push @{$seqfiles}, "$key.sequence";
}
$count{$key}{page} ++;
$$total{page} += $count{$key}{page};
@@ -885,24 +1006,30 @@ sub build_structure {
}
sub make_structure {
- my ($cms,$key,$srcstem,$flag,$count,$timestamp,$boardnum,$hrefs,$pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$randompick) = @_;
+ my ($cms,$key,$srcstem,$flag,$count,$timestamp,$boardnum,$hrefs,$pagecontents,$res,$type,$file,$resinfo,$contitem,$uname,$cdom,$contcount,$packageflag,$contitemcount,$randompick,$title) = @_;
my $src ='';
- if (($cms eq 'angel' && $type eq 'FOLDER') || (($cms eq 'bb5' || $cms eq 'bb6') && (($$resinfo{$res}{'isfolder'} eq 'true') || $key eq 'Top')) || ($cms eq 'webct4' && $contitemcount > 0)) {
+ if (($cms eq 'angel5' && $type eq 'FOLDER') || (($cms eq 'bb5' || $cms eq 'bb6') && (($$resinfo{$res}{'isfolder'} eq 'true') || $key eq 'Top')) || ($cms eq 'webctce4' && $contitemcount > 0)) {
$src = $srcstem.'/sequences/'.$contitem.'.sequence';
+ if ($cms eq 'webctce4') {
+ $title =~ s|/+|_|g;
+ $title =~ s/\s+/_/g;
+ $title .= '_'.$contitem;
+ $src = $srcstem.'/sequences/'.$title.'.sequence';
+ }
$$flag{$key}{page} = 0;
$$flag{$key}{seq} = 1;
$$count{$key}{seq} ++;
- } elsif ($cms eq 'webct4' && $randompick) {
+ } elsif ($cms eq 'webctce4' && $randompick) {
$src = $srcstem.'/sequences/'.$res.'.sequence';
$$flag{$key}{page} = 0;
$$flag{$key}{seq} = 1;
$$count{$key}{seq} ++;
- } elsif ($cms eq 'angel' && $type eq 'BOARD') {
+ } elsif ($cms eq 'angel5' && $type eq 'BOARD') {
$src = '/adm/'.$cdom.'/'.$uname.'/'.$$timestamp[$$boardnum{$res}].'/bulletinboard';
$$flag{$key}{page} = 0;
$$flag{$key}{board} = 1;
$$count{$key}{board} ++;
- } elsif ($cms eq 'angel' && $type eq "FILE") {
+ } elsif ($cms eq 'angel5' && $type eq "FILE") {
foreach my $file (@{$$hrefs{$res}}) {
unless ($file eq 'pg'.$res.'.htm') {
$src = $srcstem.'/resfiles/'.$res.'/'.$file;
@@ -910,7 +1037,7 @@ sub make_structure {
}
$$flag{$key}{page} = 0;
$$flag{$key}{file} = 1;
- } elsif ($cms eq 'angel' && (($type eq "PAGE") || ($type eq "LINK")) ) {
+ } elsif ($cms eq 'angel5' && (($type eq "PAGE") || ($type eq "LINK")) ) {
if ($$flag{$key}{page}) {
if ($$count{$key}{page} == -1) {
&Apache::lonnet::logthis("IMS Angel import error in array index for page: value = -1, resource is $key, type is $type.");
@@ -940,7 +1067,7 @@ sub make_structure {
}
$$flag{$key}{seq} = 0;
}
- } elsif ($cms eq 'webct4') {
+ } elsif ($cms eq 'webctce4') {
if ($type eq 'webctquiz') {
$src = $srcstem.'/pages/'.$res.'.page';
$$count{$key}{page} ++;
@@ -951,14 +1078,16 @@ sub make_structure {
if ($file =~ m-/([^/]+)$-) {
$filename = $1;
}
- $src = $srcstem.'/resfiles/'.$res.'/'.$filename;
+ $src = $srcstem.'/resfiles/'.$filename;
} else {
foreach my $file (@{$$hrefs{$res}}) {
my $filename;
- if ($file =~ m-/([^/]+)$-) {
+ if ($file =~ m-/my_files/(.+)$-) {
+ $filename = $1;
+ } elsif ($file =~ m-/([^/]+)$-) {
$filename = $1;
}
- $src = $srcstem.'/resfiles/'.$res.'/'.$filename;
+ $src = $srcstem.'/resfiles/'.$filename;
}
}
$$flag{$key}{page} = 0;
@@ -989,7 +1118,7 @@ sub process_specials {
pools => 'pools'
);
my %seqtitles = (
- boards => 'Course Bulletin Boards',
+ boards => 'Course Discussion Boards',
quizzes => 'Course Quizzes',
surveys => 'Course Surveys',
announcements => 'Course Announcements',
@@ -1330,7 +1459,7 @@ sub process_staff {
<font face="arial" size="2"><b>Office Hours:</b></font>
</td>
<td>
- <font face=arial size=2>$$settings{office}{hours}</font>
+ <font face="arial" size="2">$$settings{office}{hours}</font>
</td>
</tr>
|;
@@ -1652,7 +1781,7 @@ sub process_db {
}
}
-# ---------------------------------------------------------------- Add Posting to Bulletin Board
+# ---------------------------------------------------------------- Add Posting to Discussion Board
sub addposting {
my ($symb,$contrib,$cdom,$crs)=@_;
my $status='';
@@ -2071,6 +2200,504 @@ sub parse_bb6_assessment {
return;
}
+sub parse_webctvista4_assessment {
+ my ($res,$docroot,$href,$allids,$qzparams) = @_;
+ my $xmlfile = $docroot.'/'.$href; #assessment file
+ my @state = ();
+ my $id; # the current question ID
+ my $fieldlabel; # the current qti metadata field label
+ my $outcome_id; # the current question ID for outcomes conditions
+ my $pname; # the current outcomes parameter name
+ my $numids = 0;
+ %{$$qzparams{$res}} = ();
+ %{$$qzparams{$res}{weight}} = ();
+
+ my $p = HTML::Parser->new
+ (
+ xml_mode => 1,
+ start_h =>
+ [sub {
+ my ($tagname, $attr) = @_;
+ push @state, $tagname;
+ my @seq = ();
+ if ("@state" eq "questestinterop assessment") {
+ $$qzparams{$res}{id} = $attr->{'ident'};
+ $$qzparams{$res}{title} = $attr->{'title'};
+ }
+ if ("@state" eq "questestinterop assessment section itemref") {
+ $id = $attr->{linkrefid};
+ push(@{$allids},$id);
+ $numids ++;
+ }
+ if ("@state" eq "questestinterop assessment section selection_ordering order") {
+ $$qzparams{$res}{order_type} = $attr->{order_type};
+ }
+ }, "tagname, attr"],
+ text_h =>
+ [sub {
+ my ($text) = @_;
+ if ("@state" eq "questestinterop assessment qtimetadata qtimetadatafield fieldlabel") {
+ $fieldlabel = $text;
+ }
+ if ("@state" eq "questestinterop assessment qtimetadata qtimetadatafield fieldentry") {
+ $$qzparams{$res}{$fieldlabel} = $text;
+ }
+ if ("@state" eq "questestinterop assessment section outcomes_processing objects_condition outcomes_metadata") {
+ $outcome_id = $text;
+ }
+ if ("@state" eq "questestinterop assessment section outcomes_processing objects_condition objects_parameter") {
+ if ($pname eq 'qmd_weighting') {
+ $$qzparams{$res}{weight}{$outcome_id} = $text;
+ }
+ }
+ if ("@state" eq "questestinterop assessment section selection_ordering selection selection_number") {
+ $$qzparams{$res}{numpick} = $text;
+ }
+ }, "dtext"],
+ end_h =>
+ [sub {
+ my ($tagname) = @_;
+ pop @state;
+ }, "tagname"],
+ );
+ $p->unbroken_text(1);
+ $p->parse_file($xmlfile);
+ $p->eof;
+ unless(defined($$qzparams{$res}{numpick})) {
+ $$qzparams{$res}{numpick} = $numids;
+ }
+}
+
+sub parse_webctvista4_question {
+ my ($res,$docroot,$resources,$hrefs,$settings,$allquestids,$allanswers,$allchoices,$parent,$catinfo) = @_;
+ my $xmlfile = $docroot.'/'.$$resources{$res}{file};
+ my %classtypes = (
+ WCT_Calculated => 'numerical',
+ WCT_TrueFalse => 'multiplechoice',
+ WCT_ShortAnswer => 'shortanswer',
+ WCT_Paragraph => 'paragraph',
+ WCT_MultipleChoice => 'multiplechoice',
+ WCT_Matching => 'match',
+ WCT_JumbledSentence => 'jumbled',
+ WCT_FillInTheBlank => 'string',
+ WCT_Combination => 'combination'
+ );
+ my @state = ();
+ my $fieldlabel;
+ my %questiondata;
+ 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 $rows;
+ my $columns;
+ my $maxchars;
+ my %setvar = (
+ varname => '',
+ action => '',
+ );
+ my $currtexttype;
+ my $jumble_item;
+ my $numbox = 0;
+ my %str_answers = ();
+ my $textlabel;
+ my $currindex;
+ my %varinfo = ();
+ my $formula;
+ my $jumbnum = 0;
+ my $p = HTML::Parser->new
+ (
+ xml_mode => 1,
+ start_h =>
+ [sub {
+ my ($tagname, $attr) = @_;
+ push @state, $tagname;
+ if ("@state" eq "questestinterop item") {
+ $id = $attr->{ident};
+ push(@{$allquestids},$id);
+ %{$$settings{$id}} = ();
+ %{$varinfo{$id}} = ();
+ @{$$allchoices{$id}} = ();
+ @{$$settings{$id}{grps}} = ();
+ @{$$settings{$id}{lists}} = ();
+ @{$$settings{$id}{feedback}} = ();
+ @{$$settings{$id}{str}} = ();
+ %{$$settings{$id}{strings}} = ();
+ @{$$settings{$id}{numids}} = ();
+ %{$$allanswers{$id}} = ();
+ $$settings{$id}{title} = $attr->{title};
+ }
+ if ("@state" eq "questestinterop item presentation flow material mat_extension webct:calculated webct:var") {
+ $currvar = $attr->{'webct:name'};
+ %{$varinfo{$id}{$currvar}} = ();
+ $varinfo{$id}{$currvar}{min} = $attr->{'webct:min'};
+ $varinfo{$id}{$currvar}{max} = $attr->{'webct:max'};
+ $varinfo{$id}{$currvar}{precision} = $attr->{'webct:precision'};
+ }
+ if ("@state" eq "questestinterop item presentation flow response_num") {
+ $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};
+ $$settings{$id}{$numid}{formula} = $formula;
+ foreach my $var (keys(%{$varinfo{$id}})) {
+ %{$$settings{$id}{$numid}{vars}{$var}} = %{$varinfo{$id}{$var}};
+ }
+ }
+ if ("@state" eq "questestinterop item presentation flow material mat_extension webct:variable") {
+ $$settings{$id}{text} .= '['.$attr->{'webct:name'}.']';
+ }
+ if ("@state" eq "questestinterop item presentation flow material matimage") {
+ $$settings{$id}{image} = $attr->{uri};
+ }
+
+ if ("@state" eq "questestinterop item presentation flow material mattext") {
+ $currtexttype = lc($attr->{texttype});
+ $$settings{$id}{texttype} = $currtexttype;
+ if ($$settings{$id}{class} eq 'combination') {
+ if (exists($attr->{label})) {
+ $textlabel = $attr->{label};
+ } else {
+ $textlabel = '';
+ }
+ }
+ }
+ if ("@state" eq "questestinterop item presentation flow response_lid") {
+ $list = $attr->{ident};
+ push(@{$$settings{$id}{lists}},$list);
+ %{$$settings{$id}{$list}} = ();
+ @{$$allanswers{$id}{$list}} = ();
+ @{$$settings{$id}{$list}{correctanswer}} = ();
+ @{$$settings{$id}{$list}{jumbledtext}} = ();
+ @{$$settings{$id}{$list}{jumbledtype}} = ();
+ @{$$settings{$id}{$list}{jumbled}} = ();
+ $$settings{$id}{$list}{rcardinality} = $attr->{rcardinality};
+ }
+# Jumbled sentence
+ if ("@state" eq "questestinterop item presentation flow response_lid render_extension ims_render_object") {
+ $$settings{$id}{$list}{orientation} = $attr->{orientation};
+ }
+ if ("@state" eq "questestinterop item presentation flow response_lid render_extension ims_render_object material mattext") {
+ $currtexttype = lc($attr->{texttype});
+ $$settings{$id}{$list}{texttype} = $currtexttype;
+ }
+ if ("@state" eq "questestinterop item presentation flow response_lid render_extension ims_render_object response_label") {
+ $jumble_item = $attr->{ident};
+ }
+ if ("@state" eq "questestinterop item presentation flow response_lid render_extension ims_render_object response_label material mattext") {
+ $currtexttype = lc($attr->{texttype});
+ $$settings{$id}{$list}{$jumble_item}{texttype} = $currtexttype;
+ }
+ if ("@state" eq "questestinterop item resprocessing respcondition") { # Jumbled
+ if ($$settings{$id}{class} eq 'jumbled') {
+ $jumbnum ++;
+ @{$$settings{$id}{$list}{jumbled}[$jumbnum]} = ();
+ }
+ }
+
+ if ("@state" eq "questestinterop item resprocessing respcondition conditionvar and varequal") { # Jumbled
+ $currindex = $attr->{index};
+ }
+ if ("@state" eq "questestinterop item presentation flow response_lid render_choice") {
+ $$settings{$id}{$list}{randomize} = $attr->{shuffle};
+ }
+# Multiple Choice, True/False and Combination
+ if ("@state" eq "questestinterop 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}} = ();
+ }
+# True/False
+ if ("@state" eq "questestinterop item presentation flow response_lid render_choice flow_label response_label material mat_extension webct:localizable_mattext") {
+ $currtexttype = lc($attr->{texttype});
+ $$settings{$id}{$list}{$answer_id}{texttype} = $currtexttype;
+ }
+
+# Multiple Choice and Combination
+ if ("@state" eq "questestinterop item presentation flow response_lid render_choice flow_label response_label material mattext") {
+ $currtexttype = lc($attr->{texttype});
+ $$settings{$id}{$list}{$answer_id}{texttype} = $currtexttype;
+ }
+
+# String, Shortanswer or Paragraph
+ if (($$settings{$id}{class} eq 'string') ||
+ ($$settings{$id}{class} eq 'shortanswer') ||
+ ($$settings{$id}{class} eq 'paragraph')) {
+ if ("@state" eq "questestinterop item presentation flow response_str") {
+ $str_id = $attr->{ident};
+ %{$$settings{$id}{$str_id}} = ();
+ push(@{$$settings{$id}{str}},$str_id);
+ $$settings{$id}{$str_id}{rcardinality} = $attr->{rcardinality};
+ @{$$settings{$id}{$str_id}{labels}} = ();
+ %{$$settings{$id}{$str_id}{comparison}} = ();
+ }
+ }
+ if ("@state" eq "questestinterop item presentation flow response_str material mattext") { # string
+ $currtexttype = lc($attr->{texttype});
+ $$settings{$id}{$str_id}{texttype} = $currtexttype;
+ }
+ if ("@state" eq "questestinterop item presentation flow response_str render_fib") {
+ $fibtype = $attr->{fibtype};
+ $prompt = $attr->{prompt};
+ $rows = $attr->{rows};
+ $columns = $attr->{columns};
+ $maxchars = $attr->{maxchars};
+ }
+ if ("@state" eq "questestinterop item presentation flow response_str render_fib response_label") {
+ push(@{$$settings{$id}{$str_id}{labels}},$label);
+ @{$$settings{$id}{strings}{$str_id}} = ();
+ %{$$settings{$id}{$str_id}{$label}} = ();
+ $$settings{$id}{$str_id}{$label}{fibtype} = $fibtype;
+ if ($$settings{$id}{class} eq 'string') {
+ $$settings{$id}{text} .= '________';
+ }
+ }
+ if ("@state" eq "questestinterop item presentation flow response_str render_fib response_label material mattext") { # Paragraph
+ $textlabel = $attr->{label};
+ }
+# Matching
+ if ("@state" eq "questestinterop item presentation flow flow response_grp") {
+ $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 item presentation flow flow response_grp material mattext") {
+ $currtexttype = lc($attr->{texttype});
+ $$settings{$id}{$grp}{texttype} = $currtexttype;
+ }
+ if ("@state" eq "questestinterop item presentation flow flow response_grp render_choice flow_label response_label") {
+ $answer_id = $attr->{ident};
+ push(@{$$allanswers{$id}{$grp}},$answer_id);
+ %{$$settings{$id}{$grp}{$answer_id}} = ();
+ $currtexttype = lc($attr->{texttype});
+ $$settings{$id}{$grp}{$answer_id}{texttype} = $currtexttype;
+ }
+# Multiple choice or combination or string or match
+ if ("@state" eq "questestinterop item resprocessing respcondition conditionvar varequal") {
+ if (($$settings{$id}{class} eq 'multiplechoice') ||
+ ($$settings{$id}{class} eq 'combination')) {
+ $list = $attr->{respident};
+ } elsif (($$settings{$id}{class} eq 'string') ||
+ ($$settings{$id}{class} eq 'shortanswer')) {
+ $label = $attr->{respident};
+ $$settings{$id}{$label}{case} = $attr->{'case'};
+ } elsif ($$settings{$id}{class} eq 'match') {
+ $grp = $attr->{respident};
+ }
+ }
+ if ("@state" eq "questestinterop item resprocessing") {
+ if (($$settings{$id}{class} eq 'string') ||
+ ($$settings{$id}{class} eq 'shortanswer')) {
+ foreach my $str_id (@{$$settings{$id}{str}}) {
+ @{$str_answers{$str_id}} = ();
+ }
+ }
+ }
+ if ("@state" eq "questestinterop item resprocessing respcondition") {
+ if (($$settings{$id}{class} eq 'string') ||
+ ($$settings{$id}{class} eq 'shortanswer')) {
+ $numbox ++;
+ }
+ }
+ if ("@state" eq "questestinterop item resprocessing respcondition setvar") {
+ foreach my $key (keys(%{$attr})) {
+ $setvar{$key} = $attr->{$key};
+ }
+ }
+ if (($$settings{$id}{class} eq 'string') ||
+ ($$settings{$id}{class} eq 'shortanswer')) {
+ if (("@state" eq "questestinterop item resprocessing respcondition conditionvar or varsubset") || ("@state" eq "questestinterop item resprocessing respcondition conditionvar varsubset")) {
+ $str_id = $attr->{respident};
+ $$settings{$id}{$str_id}{case} = $attr->{case};
+ }
+ }
+ if ("@state" eq "questestinterop item resprocessing respcondition conditionvar and varsubset") {
+ $list = $attr->{respident};
+ }
+# Numerical
+ if ("@state" eq "questestinterop item resprocessing itemproc_extension webct:calculated_answer") {
+ $numid = $attr->{respident};
+ $$settings{$id}{$numid}{toltype} = $attr->{'webct:toleranceType'};
+ $$settings{$id}{$numid}{tolerance} = $attr->{'webct:tolerance'};
+ }
+ if ("@state" eq "questestinterop item resprocessing itemproc_extension unit_eval conditionvar varequal") {
+ $unitid = $attr->{respident};
+ %{$$settings{$id}{$numid}{$unitid}} = ();
+ push(@{$$settings{$id}{$numid}{units}},$unitid);
+ $$settings{$id}{$numid}{$unitid}{case} = $attr->{case};
+ }
+# Feedback
+ if ("@state" eq "questestinterop item respcondition displayfeedback") {
+ $fdbk = $attr->{linkrefid};
+ push(@{$$settings{$id}{feedback}},$fdbk);
+ $$settings{$id}{$fdbk} = ();
+ $$settings{$id}{$fdbk}{feedbacktype} = $attr->{feedbacktype};
+ }
+ if ("@state" eq "questestinterop item itemfeedback") {
+ $fdbk = $attr->{ident};
+ push(@{$$settings{$id}{feedback}},$fdbk);
+ $$settings{$id}{$fdbk}{view} = $attr->{view};
+ }
+ if ("@state" eq "questestinterop item itemfeedback material mattext") {
+ $currtexttype = lc($attr->{texttype});
+ $$settings{$id}{$fdbk}{texttype} = $currtexttype;
+ }
+ if ("@state" eq "questestinterop item itemfeedback solution solutionmaterial material mattext") {
+ $currtexttype = lc($attr->{texttype});
+ $$settings{$id}{$fdbk}{texttype} = $currtexttype;
+ }
+ }, "tagname, attr"],
+ text_h =>
+ [sub {
+ my ($text) = @_;
+ if ($currtexttype eq '/text/html') {
+ $text =~ s#(<img\ssrc=")([^"]+)">#$1../resfiles/$2#g;
+ }
+ if ("@state" eq "questestinterop item itemmetadata qtimetadata qtimetadatafield fieldlabel") {
+ $fieldlabel = $text;
+ }
+ if ("@state" eq "questestinterop item itemmetadata qtimetadata qtimetadatafield fieldentry") {
+ $questiondata{$fieldlabel} = $text;
+ if ($fieldlabel eq 'wct_questiontype') {
+ $$settings{$id}{class} = $classtypes{$text};
+ } elsif ($fieldlabel eq 'wct_questioncategory') {
+ $$settings{$id}{category} = $text;
+ unless(exists($$catinfo{$text})) {
+ %{$$catinfo{$text}} = ();
+ $$catinfo{$text}{title} = $text;
+ }
+ push(@{$$catinfo{$text}{contents}},$id);
+ }
+ }
+ if ("@state" eq "questestinterop item presentation flow material mat_extension webct:calculated webct:formula") {
+ $formula = $text;
+ }
+ if ("@state" eq "questestinterop item presentation flow response_str material mattext") {
+ $$settings{$id}{$str_id}{text} = $text;
+ }
+ if ("@state" eq "questestinterop item presentation flow response_str render_fib response_label material mattext") { # Paragraph
+ if ($textlabel eq 'PRE_FILL_ANSWER') {
+ $$settings{$id}{$str_id}{$label}{$textlabel} = $text;
+ }
+ }
+# Matching
+ if ("@state" eq "questestinterop item presentation flow response_lid render_choice flow_label response_label material mattext") {
+ $$settings{$id}{$list}{$answer_id}{text} .= $text;
+ }
+# Multiple choice, True/False, Combination
+ if ("@state" eq "questestinterop item presentation flow response_lid render_choice flow_label response_label material mat_extension webct:localizable_mattext") {
+ $$settings{$id}{$list}{$answer_id}{text} = $text;
+ }
+ if ("@state" eq "questestinterop item presentation flow response_lid render_extension ims_render_object material mattext") {
+ push(@{$$settings{$id}{$list}{jumbledtext}},$text);
+ push(@{$$settings{$id}{$list}{jumbledtype}},'No');
+ }
+ if ("@state" eq "questestinterop item presentation flow response_lid render_extension ims_render_object response_label material mattext") {
+ $$settings{$id}{$list}{$jumble_item}{text} = $text;
+ push(@{$$settings{$id}{$list}{jumbledtext}},$text);
+ push(@{$$settings{$id}{$list}{jumbledtype}},'Yes');
+ }
+ if ("@state" eq "questestinterop item presentation flow material mattext") {
+ $$settings{$id}{text} .= $text;
+ if ($$settings{$id}{class} eq 'combination') {
+ if ($textlabel =~ /^wct_question_label_\d+$/) {
+ $$settings{$id}{text} .= '<br />';
+ }
+ if ($textlabel =~ /^wct_cmc_single_answer\d+$/) {
+ $$settings{$id}{text} .= '<br />';
+ }
+ }
+ }
+# Matching
+ if ("@state" eq "questestinterop item presentation flow flow response_grp material mattext") {
+ $$settings{$id}{$grp}{text} = $text;
+ unless ($text eq '') {
+ push(@{$$allchoices{$id}},$grp);
+ }
+ }
+ if ("@state" eq "questestinterop item presentation flow flow response_grp render_choice flow_label response_label material mattext") {
+ $$settings{$id}{$grp}{$answer_id}{text} = $text;
+ }
+# Numerical
+ if ("@state" eq "questestinterop item resprocessing itemproc_extension unit_eval conditionvar varequal") {
+ $$settings{$id}{$numid}{$unitid}{text} = $text;
+ }
+ if ("@state" eq "questestinterop item resprocessing respcondition conditionvar varequal") {
+ if (($$settings{$id}{class} eq 'string') ||
+ ($$settings{$id}{class} eq 'shortanswer')) {
+ unless (grep/^$text$/,@{$str_answers{$str_id}}) {
+ push(@{$str_answers{$str_id}},$text);
+ $$settings{$id}{$str_id}{comparison}{$text} = $questiondata{'wct_comparison_type'.$numbox};
+ }
+ } else {
+ $answer_id = $text;
+ }
+ }
+ if (("@state" eq "questestinterop item resprocessing respcondition conditionvar or varsubset") || ("@state" eq "questestinterop item resprocessing respcondition conditionvar varsubset")) { # string
+ if (($$settings{$id}{class} eq 'string') ||
+ ($$settings{$id}{class} eq 'shortanswer')) {
+ unless (grep/^$text$/,@{$str_answers{$str_id}}) {
+ push(@{$str_answers{$str_id}},$text);
+ $$settings{$id}{$str_id}{comparison}{$text} = $questiondata{'wct_comparison_type'.$numbox};
+ }
+ }
+ }
+
+ if ("@state" eq "questestinterop item resprocessing respcondition conditionvar and varequal") { # Jumbled
+ $$settings{$id}{$list}{jumbled}[$jumbnum][$currindex] = $text;
+ }
+ if ("@state" eq "questestinterop item resprocessing respcondition setvar") {
+ if ($setvar{varname} eq "SCORE") { # Multiple Choice, String or Match
+ if ($text =~ m/^[\d\.]+$/) {
+ if ($text > 0) {
+ if (($$settings{$id}{class} eq 'multiplechoice') ||
+ ($$settings{$id}{class} eq 'combination')) {
+ push(@{$$settings{$id}{$list}{correctanswer}},$answer_id);
+ } elsif (($$settings{$id}{class} eq 'string') ||
+ ($$settings{$id}{class} eq 'shortanswer')) {
+ foreach my $answer (@{$str_answers{$str_id}}) {
+ unless (grep/^$answer$/,@{$$settings{$id}{strings}{$str_id}}) {
+ push(@{$$settings{$id}{strings}{$str_id}},$answer);
+ }
+ }
+ } elsif ($$settings{$id}{class} eq 'match') {
+ push(@{$$settings{$id}{$grp}{correctanswer}},$answer_id);
+ }
+ }
+ }
+ }
+ }
+ if ("@state" eq "questestinterop item itemfeedback material mattext") {
+ $$settings{$id}{$fdbk}{text} = $text;
+ }
+ if ("@state" eq "questestinterop item itemfeedback solution solutionmaterial material mattext") {
+ $$settings{$id}{$fdbk}{text} = $text;
+ }
+ }, "dtext"],
+ end_h =>
+ [sub {
+ my ($tagname) = @_;
+ pop @state;
+ }, "tagname"],
+ );
+ $p->unbroken_text(1);
+ $p->parse_file($xmlfile);
+ $p->eof;
+}
+
sub parse_webct4_assessment {
my ($res,$docroot,$href,$container,$allids) = @_;
my $xmlfile = $docroot.'/'.$href; #quiz file
@@ -2158,8 +2785,13 @@ sub parse_webct4_quizprops {
sub parse_webct4_questionDB {
my ($docroot,$href,$catinfo,$settings,$allanswers,$allchoices,$allids) = @_;
- $href =~ s#[^/]+$##;
- my $xmlfile = $docroot.'/'.$href.'questionDB.xml'; #quizDB file
+ my $xmlfile;
+ if ($href eq 'questiondb.xml') {
+ $xmlfile = $docroot.'/'.$href;
+ } else {
+ $href =~ s#[^/]+$##;
+ $xmlfile = $docroot.'/'.$href.'questionDB.xml'; #quizDB file
+ }
my @state = ();
my $category; # the current category ID
my $id; # the current question ID
@@ -2180,14 +2812,19 @@ sub parse_webct4_questionDB {
action => '',
);
my $currtexttype;
- my $currimagtype;
+ my $currimagtype;
+ my $is_objectbank;
my $p = HTML::Parser->new
(
xml_mode => 1,
start_h =>
[sub {
my ($tagname, $attr) = @_;
- push @state, $tagname;
+ if (("@state" eq "questestinterop") && ($tagname eq 'objectbank')) {
+ $is_objectbank = 1;
+ } else {
+ push @state, $tagname;
+ }
if ("@state" eq "questestinterop section") {
$category = $attr->{ident};
%{$$catinfo{$category}} = ();
@@ -2249,6 +2886,12 @@ sub parse_webct4_questionDB {
$$settings{$id}{texttype} = $attr->{texttype};
$currtexttype = $attr->{texttype};
}
+ if ("@state" eq "questestinterop section item presentation flow material matimage") {
+ $$settings{$id}{imagtype} = $attr->{imagtype};
+ $currimagtype = $attr->{imagtype};
+ $$settings{$id}{uri} = $attr->{uri};
+
+ }
if ("@state" eq "questestinterop section item presentation flow response_lid") {
$$settings{$id}{class} = 'multiplechoice';
$list = $attr->{ident};
@@ -2270,6 +2913,10 @@ sub parse_webct4_questionDB {
$$settings{$id}{$list}{$answer_id}{texttype} = $attr->{texttype};
$currtexttype = $attr->{texttype};
}
+ if ("@state" eq "questestinterop section item presentation flow response_lid render_choice flow_label response_label flow_mat 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") {
@@ -2356,7 +3003,9 @@ sub parse_webct4_questionDB {
}
}
if ("@state" eq "questestinterop section item resprocessing respcondition setvar") {
- $setvar{varname} = $attr->{varname};
+ foreach my $key (keys(%{$attr})) {
+ $setvar{$key} = $attr->{$key};
+ }
if ($setvar{varname} eq 'WebCT_Correct') {
push(@{$$settings{$id}{$grp}{correctanswer}},$answer_id);
}
@@ -2387,6 +3036,7 @@ sub parse_webct4_questionDB {
}
if ("@state" eq "questestinterop section item itemfeedback") {
$fdbk = $attr->{ident};
+ push(@{$$settings{$id}{feedback}},$fdbk);
$$settings{$id}{$fdbk}{view} = $attr->{view};
}
if ("@state" eq "questestinterop section item itemfeedback material mattext") {
@@ -2430,6 +3080,9 @@ 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}{text} = $text;
}
+ if ("@state" eq "questestinterop section item presentation flow response_lid render_choice flow_label response_label flow_mat 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") {
@@ -2468,12 +3121,26 @@ sub parse_webct4_questionDB {
}
}
if ("@state" eq "questestinterop section item resprocessing respcondition setvar") {
- if ($setvar{varname} eq "answerValue") { # Multiple Choice
+ if ($setvar{varname} eq "answerValue") { # Multiple Choice WebCT4.0
if ($text =~ m/^\d+$/) {
if ($text > 0) {
push(@{$$settings{$id}{$list}{correctanswer}},$answer_id);
}
}
+ } elsif ($setvar{varname} eq "que_score") { # Multiple Choice WebCT4.1
+ if ($text =~ m/^\d+$/) {
+ if ($text > 0) {
+ push(@{$$settings{$id}{$list}{correctanswer}},$answer_id);
+ }
+ }
+ } elsif ($is_objectbank) { #Multiple Choice WebCT 4.1 D2L objectbank
+ if ($setvar{action} eq "Set") {
+ if ($text =~ /^\d+\.?\d*$/) {
+ if ($text > 0.000000001) {
+ 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") {
@@ -2490,7 +3157,11 @@ sub parse_webct4_questionDB {
end_h =>
[sub {
my ($tagname) = @_;
- pop @state;
+ if (("@state" eq "questestinterop") && ($tagname eq 'objectbank')) {
+ $is_objectbank = '';
+ } else {
+ pop @state;
+ }
}, "tagname"],
);
$p->unbroken_text(1);
@@ -2508,17 +3179,33 @@ sub parse_webct4_questionDB {
}
}
}
+ } elsif ($$settings{$id}{class} eq 'multiplechoice') {
+ if (ref($$settings{$id}) eq 'HASH') {
+ foreach my $list (keys(%{$$settings{$id}})) {
+ if (ref($$settings{$id}{$list}) eq 'HASH') {
+ if (defined($$settings{$id}{$list}{rcardinality})) {
+ if ($$settings{$id}{$list}{rcardinality} eq 'Multiple') {
+ if (ref($$settings{$id}{$list}{correctanswer}) eq 'ARRAY') {
+ if (@{$$settings{$id}{$list}{correctanswer}} == 1) {
+ $$settings{$id}{$list}{rcardinality} = 'Single';
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
}
}
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 ($cms,$context,$res,$docroot,$container,$dirname,$destdir,$settings,$total,$udom,$uname,$pagesfiles,$sequencesfiles,$randompicks,$dbparse,$resources,$items,$catinfo,$qzdbsettings,$hrefs,$allquestions) = @_;
my @allids = ();
+ my @allquestids = ();
my %allanswers = ();
my %allchoices = ();
my %qzparams = ();
- my @allquestids = ();
my %alldbanswers = ();
my %alldbchoices = ();
my @alldbquestids = ();
@@ -2531,66 +3218,21 @@ sub process_assessment {
($cdom,$cnum) = split/_/,$cid;
}
my $destresdir = $destdir;
+ my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
if ($context eq 'CSTR') {
- $destresdir =~ s|/home/$uname/public_html/|/res/$udom/$uname/|;
+ $destresdir =~ s{^\Q$londocroot/priv/\E}{/res/};
} elsif ($context eq 'DOCS') {
- $destresdir =~ s|^/home/httpd/html/userfiles|/uploaded|;
+ $destresdir =~ s{^\Q$londocroot/userfiles\E}{/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,\@allids);
- } elsif ($cms eq 'webct4') {
+ } elsif ($cms eq 'webctce4') {
unless($$dbparse) {
&parse_webct4_questionDB($docroot,$$resources{$res}{file},$catinfo,$qzdbsettings,\%alldbanswers,\%alldbchoices,\@alldbquestids);
- if (!-e "$destdir/sequences") {
- mkdir("$destdir/sequences",0755);
- }
- my $numcats = scalar(keys %{$catinfo});
- my $curr_id = 0;
- my $next_id = 1;
- my $fh;
- open($fh,">$destdir/sequences/question_database.sequence");
- push @{$sequencesfiles},'question_database.sequence';
- foreach my $category (sort keys %{$catinfo}) {
- my $seqname = $$catinfo{$category}{title}.'_'.$category;
- $seqname =~ s/\s/_/g;
- $seqname =~ s/\W//g;
- push(@{$sequencesfiles},$seqname.'.sequence');
- my $catsrc = "$destresdir/sequences/$seqname.sequence";
- if ($curr_id == 0) {
- print $fh qq|<resource id="1" src="$catsrc" type="start" title="$$catinfo{$category}{title}"></resource>|;
- }
- if ($numcats == 1) {
- print $fh qq|
-<link from="1" to="2" index="1"></link>
-<resource id="2" src="" type="finish">\n|;
- } else {
- $curr_id = $next_id;
- $next_id = $curr_id + 1;
- $catsrc = "$destresdir/sequences/$seqname.sequence";
- print $fh qq|
-<link from="$curr_id" to="$next_id" index="$curr_id"></link>
-<resource id="$next_id" src="$catsrc" title="$$catinfo{$category}{title}"|;
- if ($next_id == $numcats) {
- print $fh qq| type="finish"></resource>\n|;
- } else {
- print $fh qq|></resource>\n|;
- }
- }
- print $fh qq|</map>|;
- if (!-e "$destdir/problems") {
- mkdir("$destdir/problems",0755);
- }
- if (!-e "$destdir/problems/$seqname") {
- mkdir("$destdir/problems/$seqname",0755);
- }
- $newdir = "$destdir/problems/$seqname";
- my $dbcontainerdir;
- &build_problem_container($cms,$seqname,$destdir,'database',$seqname,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@{$$catinfo{$category}{contents}},$udom,$uname,$dirname,\$dbcontainerdir,$cid,$cdom,$cnum,$catinfo,$qzdbsettings);
- }
- close($fh);
- &write_webct4_questions(\@alldbquestids,$context,$qzdbsettings,$dirname,\%alldbanswers,\%alldbchoices,$total,$cid,$cdom,$cnum,$destdir,$catinfo);
+ &build_category_sequences($destdir,$catinfo,$sequencesfiles,$pagesfiles,$destresdir,$newdir,$cms,$total,$randompickflag,$context,$udom,$uname,$dirname,$cid,$cdom,$cnum,$qzdbsettings);
+ &write_webct4_questions($cms,\@alldbquestids,$context,$qzdbsettings,$dirname,\%alldbanswers,\%alldbchoices,$total,$cid,$cdom,$cnum,$destdir,$catinfo);
$$dbparse = 1;
}
&parse_webct4_assessment($res,$docroot,$$resources{$res}{file},$container,\@allids);
@@ -2601,11 +3243,26 @@ sub process_assessment {
$randompickflag = 1;
}
}
+ } elsif ($cms eq 'webctvista4') {
+ unless($$dbparse) {
+ foreach my $res (sort keys %{$allquestions}) {
+ my $parent = $$allquestions{$res};
+ &parse_webctvista4_question($res,$docroot,$resources,$hrefs,$qzdbsettings,\@allquestids,\%allanswers,\%allchoices,$parent,$catinfo);
+ }
+ &build_category_sequences($destdir,$catinfo,$sequencesfiles,$pagesfiles,$destresdir,$newdir,$cms,$total,$randompickflag,$context,$udom,$uname,$dirname,$cid,$cdom,$cnum,$qzdbsettings);
+ $$dbparse = 1;
+ }
+ &parse_webctvista4_assessment($res,$docroot,$$resources{$res}{file},\@allids,\%qzparams);
+ if ($qzparams{$res}{numpick} < @allids) {
+ $$randompicks{$$resources{$res}{revitm}} = $qzparams{$res}{numpick};
+ $randompickflag = 1;
+ }
}
my $dirtitle;
- unless ($cms eq 'webct4') {
+ unless ($cms eq 'webctce4' || $cms eq 'webctvista4') {
$dirtitle = $$settings{'title'};
- $dirtitle =~ s/\W//g;
+ $dirtitle =~ s/\s+/_/g;
+ $dirtitle =~ s/:/_/g;
$dirtitle .= '_'.$res;
if (!-e "$destdir/problems") {
mkdir("$destdir/problems",0755);
@@ -2616,41 +3273,108 @@ sub process_assessment {
$newdir = "$destdir/problems/$dirtitle";
}
- if ($cms eq 'webct4') {
- &build_problem_container($cms,$dirtitle,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@allids,$udom,$uname,$dirname,\$containerdir,$cid,$cdom,$cnum,$catinfo,$qzdbsettings);
+ if ($cms eq 'webctce4') {
+ if (@allids > 0 && $allids[0] ne '') {
+ &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);
+ &build_problem_container($cms,$dirtitle,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@allids,$udom,$uname,$dirname,\$containerdir,$cid,$cdom,$cnum,$catinfo,$qzdbsettings,\%qzparams);
}
if ($cms eq 'bb5') {
&write_bb5_questions(\@allids,$containerdir,$context,$settings,$dirname,$destdir,$res,\%allanswers,\%allchoices,$total,$newdir,$cid,$cdom,$cnum,$docroot);
} elsif ($cms eq 'bb6') {
&write_bb6_questions(\@allids,$containerdir,$context,$settings,$dirname,$destdir,$res,$total,$newdir,$cid,$cdom,$cnum,$docroot);
+ } elsif ($cms eq 'webctvista4') {
+ &write_webct4_questions($cms,\@allquestids,$context,$qzdbsettings,$dirname,\%allanswers,\%allchoices,$total,$cid,$cdom,$cnum,$destdir,$catinfo,$dirtitle);
+ }
+}
+
+sub build_category_sequences {
+ my ($destdir,$catinfo,$sequencesfiles,$pagesfiles,$destresdir,$newdir,$cms,$total,$randompickflag,$context,$udom,$uname,$dirname,$cid,$cdom,$cnum,$qzdbsettings) = @_;
+ 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;
+ if ($cms eq 'webctce4') {
+ $seqname = $$catinfo{$category}{title}.'_'.$category;
+ } else {
+ $seqname = $$catinfo{$category}{title};
+ }
+ $seqname =~ s/\s+/_/g;
+ $seqname =~ s/:/_/g;
+ push(@{$sequencesfiles},$seqname.'.sequence');
+ my $catsrc = "$destresdir/sequences/$seqname.sequence";
+ if ($curr_id == 0) {
+ print $fh qq|<resource id="1" src="$catsrc" type="start" title="$$catinfo{$category}{title}"></resource>|;
+ }
+ if ($numcats == 1) {
+ print $fh qq|
+<link from="1" to="2" index="1"></link>
+<resource id="2" src="" type="finish">\n|;
+ } else {
+ $curr_id = $next_id;
+ $next_id = $curr_id + 1;
+ $catsrc = "$destresdir/sequences/$seqname.sequence";
+ print $fh qq|
+<link from="$curr_id" to="$next_id" index="$curr_id"></link>
+<resource id="$next_id" src="$catsrc" title="$$catinfo{$category}{title}"|;
+ if ($next_id == $numcats) {
+ print $fh qq| type="finish"></resource>\n|;
+ } else {
+ print $fh qq|></resource>\n|;
+ }
+ }
+ print $fh qq|</map>|;
+ if (!-e "$destdir/problems") {
+ mkdir("$destdir/problems",0755);
+ }
+ if (!-e "$destdir/problems/$seqname") {
+ mkdir("$destdir/problems/$seqname",0755);
+ }
+ $$newdir = "$destdir/problems/$seqname";
+ my $dbcontainerdir;
+ &build_problem_container($cms,$seqname,$destdir,'database',$seqname,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@{$$catinfo{$category}{contents}},$udom,$uname,$dirname,\$dbcontainerdir,$cid,$cdom,$cnum,$catinfo,$qzdbsettings);
}
+ close($fh);
}
sub build_problem_container {
- my ($cms,$dirtitle,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,$allids,$udom,$uname,$dirname,$containerdir,$cid,$cdom,$cnum,$catinfo,$settings) = @_;
+ my ($cms,$dirtitle,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,$allids,$udom,$uname,$dirname,$containerdir,$cid,$cdom,$cnum,$catinfo,$settings,$qzparams) = @_;
my $seqdir = "$destdir/sequences";
my $pagedir = "$destdir/pages";
my $curr_id = 0;
my $next_id = 1;
my $fh;
+ my $mapname = $res;
+ if ($cms eq 'webctvista4' && ref($$qzparams{$res}) eq 'HASH') {
+ if ($$qzparams{$res}{title}) {
+ $mapname = $$qzparams{$res}{title};
+ $mapname =~ s/\s+/_/g;
+ }
+ }
if ($container eq 'pool' || $randompickflag || $container eq 'database') {
- $$containerdir = $seqdir.'/'.$res.'.sequence';
+ $$containerdir = $seqdir.'/'.$mapname.'.sequence';
if (!-e "$seqdir") {
mkdir("$seqdir",0770);
}
open($fh,">$$containerdir");
$$total{seq} ++;
- push @{$sequencesfiles},$res.'.sequence';
+ push @{$sequencesfiles},$mapname.'.sequence';
} else {
- $$containerdir = $pagedir.'/'.$res.'.page';
- if (!-e "$destdir/pages") {
- mkdir("$destdir/pages",0770);
+ $$containerdir = $pagedir.'/'.$mapname.'.page';
+ if (!-e "$pagedir") {
+ mkdir("$pagedir",0770);
}
open($fh,">$$containerdir");
$$total{page} ++;
- push @{$pagesfiles},$res.'.page';
+ push @{$pagesfiles},$mapname.'.page';
}
print $fh qq|<map>
|;
@@ -2658,21 +3382,32 @@ sub build_problem_container {
my $probsrc = "/res/lib/templates/simpleproblem.problem";
if ($context eq 'CSTR') {
foreach my $id (@{$allids}) {
- if ($cms eq 'webct4') {
+ if (($cms eq 'webctce4') || ($cms eq 'webctvista4')) {
$probtitle{$id} = $$settings{$id}{title};
} else {
$probtitle{$id} = $$settings{title};
}
- $probtitle{$id} =~ s/\s/_/g;
- $probtitle{$id} =~ s/\W//g;
+ $probtitle{$id} =~ s/\s+/_/g;
+ $probtitle{$id} =~ s/:/_/g;
+ $probtitle{$id} =~ s/\//_/g;
$probtitle{$id} .= '_'.$id;
}
- if ($cms eq 'webct4' && $container ne 'database') {
+ if (($cms eq 'webctce4' && $container ne 'database') ||
+ ($cms eq 'webctvista4')) {
+ my $probdir;
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";
+ if ($catid) {
+ if ($cms eq 'webctce4') {
+ $probdir = $$catinfo{$catid}{title}.'_'.$catid;
+ } else {
+ $probdir = $$catinfo{$catid}{title};
+ }
+ $probdir =~ s/\s+/_/g;
+ $probdir =~ s/:/_/g;
+ $probsrc = "$dirname/problems/$probdir/$probtitle{$$allids[0]}.problem";
+ } else {
+ $probsrc="$dirname/problems/$dirtitle/$probtitle{$$allids[0]}.problem";
+ }
} else {
$probsrc="$dirname/problems/$dirtitle/$probtitle{$$allids[0]}.problem";
}
@@ -2691,12 +3426,22 @@ sub build_problem_container {
$curr_id = $j;
$next_id = $curr_id + 1;
if ($context eq 'CSTR') {
- if ($cms eq 'webct4' && $container ne 'database') {
+ if (($cms eq 'webctce4' && $container ne 'database') ||
+ ($cms eq 'webctvista4')) {
+ my $probdir;
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";
+ if ($catid) {
+ if ($cms eq 'webctce4') {
+ $probdir = $$catinfo{$catid}{title}.'_'.$catid;
+ } else {
+ $probdir = $$catinfo{$catid}{title};
+ }
+ $probdir =~ s/\s/_/g;
+ $probdir =~ s/:/_/g;
+ $probsrc = "$dirname/problems/$probdir/$probtitle{$$allids[$j]}.problem";
+ } else {
+ $probsrc = "$dirname/problems/$dirtitle/$probtitle{$$allids[$j]}.problem";
+ }
} else {
$probsrc = "$dirname/problems/$dirtitle/$probtitle{$$allids[$j]}.problem";
}
@@ -2719,6 +3464,7 @@ sub write_bb5_questions {
my ($allids,$containerdir,$context,$settings,$dirname,$destdir,$res,$allanswers,$allchoices,$total,$newdir,$cid,$cdom,$cnum,$docroot) = @_;
my $qnum = 0;
my $pathstart;
+ my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
if ($context eq 'CSTR') {
$pathstart = '../..';
} else {
@@ -2738,7 +3484,7 @@ sub write_bb5_questions {
$qnum ++;
my $output;
my $permcontainer = $containerdir;
- $permcontainer =~ s#/home/httpd/html/userfiles#uploaded#;
+ $permcontainer =~ s{^\Q$londocroot/userfiles\E}{uploaded};
my $symb = $cid.'.'.$permcontainer.'___'.$qnum.'___lib/templates/simpleproblem.problem.0.';
my %resourcedata = ();
for (my $i=0; $i<10; $i++) {
@@ -3082,7 +3828,7 @@ sub write_bb5_questions {
$title =~ s/\s/_/g;
$title =~ s/\W//g;
$title .= '_'.$id;
- open(PROB,">:utf8", "$newdir/$title.problem");
+ open(PROB,">$newdir/$title.problem");
print PROB $output;
close PROB;
} else {
@@ -3094,7 +3840,8 @@ sub write_bb5_questions {
}
sub write_webct4_questions {
- my ($alldbquestids,$context,$settings,$dirname,$allanswers,$allchoices,$total,$cid,$cdom,$cnum,$destdir,$catinfo) = @_;
+ my ($cms,$alldbquestids,$context,$settings,$dirname,$allanswers,$allchoices,$total,$cid,$cdom,$cnum,$destdir,$catinfo,$dirtitle) = @_;
+ my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
my $qnum = 0;
foreach my $id (@{$alldbquestids}) {
$qnum ++;
@@ -3104,27 +3851,30 @@ sub write_webct4_questions {
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);
+ if ($feedback ne '') {
+ if ($$settings{$id}{$fdbk}{texttype} eq 'text/html') {
+ $feedback = &HTML::Entities::decode($feedback);
+ }
+ $allfeedback .= $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}{text}) {
+ $$settings{$id}{text} = &text_cleanup($$settings{$id}{text});
+ }
+ }
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;
+ if ($cms eq 'webctce4') {
+ $$settings{$id}{text} =~ s/{($var)}/\$$1 /g;
+ } elsif ($cms eq 'webctvista4') {
+ $$settings{$id}{text} =~ s/\[($var)\]/\$$1 /g;
+ }
}
}
}
- $permcontainer =~ s#/home/httpd/html/userfiles#uploaded#;
+ $permcontainer =~ s{\Q$londocroot/userfiles\E}{uploaded};
my $symb = $cid.'.'.$permcontainer.'___'.$qnum.'___lib/templates/simpleproblem.problem.0.';
my %resourcedata = ();
for (my $i=0; $i<10; $i++) {
@@ -3142,33 +3892,100 @@ sub write_webct4_questions {
}
}
$$total{prob} ++;
+
if (exists($$settings{$id}{uri})) {
- if ($$settings{$id}{imagtype} =~ /^image\//) {
- $questionimage = '<p><img src="../../resfiles/'.$$settings{$id}{uri}.'" /></p>'."\n";
+ if ($cms eq 'webctce4') {
+ if ($$settings{$id}{imagtype} =~ /^image\//) {
+ $questionimage = '<p><img src="../../resfiles/'.$$settings{$id}{uri}.'" /></p>'."\n";
+ } else {
+ $questionimage = '<p><img src="../../resfiles/'.$$settings{$id}{uri}.'" /></p>'."\n";
+ }
+ } elsif ($cms eq 'webctvista4') {
+ if ($$settings{$id}{uri} =~ /(gif|jpg|png)$/i) {
+ $questionimage = '<p><img src="../../resfiles/'.$$settings{$id}{uri}.'" /></p>'."\n";
+ $questionimage =~ s#(//+)#/#g;
+ } else {
+ $questionimage = '<a href="'.$$settings{$id}{uri}.'" target="exturi" >'.$$settings{$id}{uri}.'</a>';
+ }
}
}
if ($$settings{$id}{class} eq "paragraph") {
+ my $pre_fill_answer = $$settings{$id}{PARA}{PARA}{PRE_FILL_ANSWER};
if ($context eq 'CSTR') {
$output .= qq|<startouttext /><p>$$settings{$id}{text}</p>$questionimage<endouttext />
<essayresponse>
- <textfield></textfield>
+ <textfield>$pre_fill_answer</textfield>
</essayresponse>
- <postanswerdate>
- $allfeedback
- </postanswerdate>
|;
} else {
$resourcedata{$symb.'questiontext'} = '<p>'.$$settings{$id}{text}.'</p>'.$questionimage;
$resourcedata{$symb.'hiddenparts'} = '!essay';
$resourcedata{$symb.'questiontype'} = 'essay';
}
+ } elsif ($$settings{$id}{class} eq 'jumbled') {
+ if ($context eq 'CSTR') {
+ my %foiloptions = ();
+ foreach my $list (@{$$settings{$id}{lists}}) {
+ @{$foiloptions{$list}} = ();
+ my $numalternates = @{$$settings{$id}{$list}{jumbled}} - 1;
+ my $loopstop = 2; #Hard coded for now, so only one permutation of answers is correct; <or> functionality is needed to support the case where multiple permutations are correct.
+ for (my $i=1; $i<$loopstop; $i++) {
+ $foiloptions{$list}[$i] = '(';
+ for (my $j=@{$$settings{$id}{$list}{jumbled}[$i]}-1; $j>0; $j--) {
+ my $jumble_item = $$settings{$id}{$list}{jumbled}[$i][$j];
+ $foiloptions{$list}[$i] .= "'".$$settings{$id}{$list}{$jumble_item}{text}."',";
+ }
+ $foiloptions{$list}[$i] =~ s/,$//;
+ $foiloptions{$list}[$i] .= ')';
+ my $jnum = 0;
+ for (my $k=0; $k<@{$$settings{$id}{$list}{jumbledtype}}; $k++) {
+ if ($$settings{$id}{$list}{jumbledtype}[$k] eq 'No') {
+ $output .= qq|
+<startouttext />
+$$settings{$id}{$list}{jumbledtext}[$k]
+<endouttext />|;
+ } elsif ($$settings{$id}{$list}{jumbledtype}[$k] eq 'Yes') {
+ $jnum ++;
+ my $jumble_item = $$settings{$id}{$list}{jumbled}[$i][$jnum];
+ $output .= qq|
+<optionresponse max="1" randomize="yes" TeXlayout="horizontal">
+ <foilgroup options="$foiloptions{$list}[$i]">
+ <foil location="random" value="$$settings{$id}{$list}{$jumble_item}{text}" name="$jumble_item"></foil>
+ </foilgroup>
+</optionresponse>
+|;
+ }
+ }
+ }
+ if ($numalternates > 0) { # for now alternates are stored in an instructorcomment. In the future these alternates could be moved into the main response area once <or> functionality is available.
+ $output .= '<instructorcomment>(Not shown to students) '."\n".'The following alternates were imported from the corresponding WebCT Vista 4 jumbled sentence question, but are not included in the LON-CAPA version, because this style of question does not currently support multiple correct solutions.'."\n";
+ for (my $i=2; $i<@{$$settings{$id}{$list}{jumbled}}; $i++) {
+ my $altid = $i-1;
+ my $jnum = 0;
+ $output .= $altid.'. ';
+ for (my $k=0; $k<@{$$settings{$id}{$list}{jumbledtype}}; $k++) {
+ if ($$settings{$id}{$list}{jumbledtype}[$k] eq 'No') {
+ $output .= "$$settings{$id}{$list}{jumbledtext}[$k]" ;
+ } elsif ($$settings{$id}{$list}{jumbledtype}[$k] eq 'Yes') {
+ $jnum ++;
+ my $jumble_item = $$settings{$id}{$list}{jumbled}[$i][$jnum];
+ $output .= '['.$$settings{$id}{$list}{$jumble_item}{text}.']';
+ }
+ }
+ $output .= " \n";
+ }
+ $output .= '</instructorcomment>';
+ }
+ }
+ }
} 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') {
+ if (($$settings{$id}{class} eq 'multiplechoice') ||
+ ($$settings{$id}{class} eq 'combination')) {
foreach my $list (@{$$settings{$id}{lists}}) {
my $numfoils = @{$$allanswers{$id}{$list}};
if ($$settings{$id}{$list}{rcardinality} eq 'Single') {
@@ -3243,7 +4060,6 @@ sub write_webct4_questions {
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;
}
@@ -3380,59 +4196,69 @@ sub write_webct4_questions {
} else {
$resourcedata{$symb.'options'} = "('".join("','",@allmatch)."')";
}
- } elsif ($$settings{$id}{class} eq 'string') {
+ } elsif (($$settings{$id}{class} eq 'string') ||
+ ($$settings{$id}{class} eq 'shortanswer')) {
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;
- }
+ my @str_labels = ();
+ if ($cms eq 'webctce4') {
+ foreach my $str_id (@{$$settings{$id}{str}}) {
+ foreach my $label (@{$$settings{$id}{$str_id}{labels}}) {
+ push(@str_labels,$label);
+ }
+ }
+ } elsif ($cms eq 'webctvista4') {
+ @str_labels = @{$$settings{$id}{str}};
+ }
+ foreach my $label (@str_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];
- }
+ }
+ 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];
}
- $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 ($$settings{$id}{strings}{$label}[$k] >= $max) {
+ $max = $$settings{$id}{strings}{$label}[$k];
}
}
- if ($context eq 'CSTR') {
- if (@{$$settings{$id}{str}} > 1) {
- $output .= qq|
-<startouttext />$labelnum.<endouttext />
-|;
+ $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"
@@ -3441,54 +4267,54 @@ sub write_webct4_questions {
</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 ($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|
+ 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';
}
- 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|
+ $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|
+ } 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 />
|;
- }
}
}
}
@@ -3514,7 +4340,6 @@ sub write_webct4_questions {
'sqrt' => 'sqrt',
'tan' => 'tan',
);
-
my $scriptblock = qq|
<script type="loncapa/perl">
|;
@@ -3534,8 +4359,12 @@ sub write_webct4_questions {
$deccount --;
}
$increment .= '1';
- }
- $formula =~ s/{($var)}/(\$$1)/g;
+ }
+ if ($cms eq 'webctce4') {
+ $formula =~ s/{($var)}/(\$$1)/g;
+ } elsif ($cms eq 'webctvista4') {
+ $formula =~ s/\[($var)\]/(\$$1)/g;
+ }
$scriptblock .= qq|
\$$var=&random($$settings{$id}{$numid}{vars}{$var}{min},$$settings{$id}{$numid}{vars}{$var}{max},$increment);
|;
@@ -3557,7 +4386,7 @@ sub write_webct4_questions {
$ansformat = 'format="'.$ansformat.'"';
}
my $tolerance = $$settings{$id}{$numid}{tolerance};
- if ($$settings{$id}{$numid}{toltype} eq 'percent') {
+ if (lc($$settings{$id}{$numid}{toltype}) eq 'percent') {
$tolerance .= '%';
}
my $unit = '';
@@ -3581,20 +4410,37 @@ sub write_webct4_questions {
}
}
if ($context eq 'CSTR') {
+ my $probdir;
my $catid = $$settings{$id}{category};
- my $probdir = $$catinfo{$catid}{title}.'_'.$catid;
- $probdir =~ s/\s/_/g;
- $probdir =~ s/\W//g;
+ if ($catid) {
+ if ($cms eq 'webctce4') {
+ $probdir = $$catinfo{$catid}{title}.'_'.$catid;
+ } else {
+ $probdir = $$catinfo{$catid}{title};
+ }
+ $probdir =~ s/\s/_/g;
+ $probdir =~ s/://g;
+ } elsif (defined($dirtitle)) {
+ $probdir = $dirtitle;
+ }
if (!-e "$destdir/problems/$probdir") {
mkdir("$destdir/problems/$probdir",0755);
}
+ if ($allfeedback ne '') {
+ $output .= qq|
+ <postanswerdate>
+ $allfeedback
+ </postanswerdate>
+|;
+ }
$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");
+ $title =~ s/:/_/g;
+ $title =~ s/\//_/g;
+ $title .= '_'.$id;
+ open(PROB,">$destdir/problems/$probdir/$title.problem");
print PROB $output;
close PROB;
} else {
@@ -3605,6 +4451,17 @@ sub write_webct4_questions {
}
}
+sub text_cleanup {
+ my ($text) = @_;
+ $text =~ s/(\&)(nbsp|gt|lt)(?!;)/$1$2;$3/gi;
+ $text = &Apache::loncleanup::htmlclean($text);
+ $text =~ s#(<img src=["']?)([^>]+?)(/?>)#$1../../resfiles/$2 />#gi;
+ $text =~ s#<([bh])r>#<$1r />#g;
+ $text =~ s#<p>#<br /><br />#g;
+ $text =~ s#</p>##g;
+ return $text;
+}
+
sub test_for_html {
my ($source) = @_;
my @tags = ();
@@ -3624,6 +4481,7 @@ sub test_for_html {
sub write_bb6_questions {
my ($allids,$containerdir,$context,$settings,$dirname,$destdir,$res,$total,$newdir,$cid,$cdom,$cnum,$docroot) = @_;
+ my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
my $qnum = 0;
foreach my $id (@{$allids}) {
my $questiontext = $$settings{$id}{question}{text};
@@ -3632,7 +4490,7 @@ sub write_bb6_questions {
$qnum ++;
my $output;
my $permcontainer = $containerdir;
- $permcontainer =~ s#/home/httpd/html/userfiles#uploaded#;
+ $permcontainer =~ s{\Q$londocroot/userfiles\E}{uploaded};
my $symb = $cid.'.'.$permcontainer.'___'.$qnum.'___lib/templates/simpleproblem.problem.0.';
my %resourcedata = ();
for (my $i=0; $i<10; $i++) {
@@ -3981,7 +4839,7 @@ sub write_bb6_questions {
$title =~ s/\s/_/g;
$title =~ s/\W//g;
$title .= '_'.$id;
- open(PROB,">:utf8", "$newdir/$title.problem");
+ open(PROB,">$newdir/$title.problem");
print PROB $output;
close PROB;
} else {
@@ -4126,10 +4984,11 @@ sub process_content {
my ($cms,$res,$context,$docroot,$destdir,$settings,$dom,$user,$resrcfiles,$packages,$hrefs) = @_;
my $xmlfile = $docroot.'/'.$res.".dat";
my $destresdir = $destdir;
+ my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
if ($context eq 'CSTR') {
- $destresdir =~ s|/home/$user/public_html/|/res/$dom/$user/|;
+ $destresdir =~ s{^\Q$londocroot/priv/\E}{/res/};
} elsif ($context eq 'DOCS') {
- $destresdir =~ s|^/home/httpd/html/userfiles|/uploaded|;
+ $destresdir =~ s{^\Q$londocroot/userfiles\E}{/uploaded};
}
my $filetag = '';
if ($cms eq 'bb5') {
@@ -4550,20 +5409,18 @@ sub angel_content {
# ---------------------------------------------------------------- WebCT content
sub webct4_content {
my ($res,$docroot,$destdir,$settings,$dom,$user,$type,$title,$resrcfiles) = @_;
- if (!open(FILE,">$destdir/resfiles/$res.html")) {
- &Apache::lonnet::logthis("IMS import error: Cannot open file - $destdir/resfiles/$res.html - $!");
- } else {
- push(@{$resrcfiles}, "$res.html");
- my $linktag = '';
- if (defined($$settings{url})) {
- $linktag = qq|<a href="$$settings{url}"|;
+ if (defined($$settings{url})) {
+ if (!open(FILE,">$destdir/resfiles/$res.html")) {
+ &Apache::lonnet::logthis("IMS import error: Cannot open file - $destdir/resfiles/$res.html - $!");
+ } else {
+ push(@{$resrcfiles}, "$res.html");
+ my $linktag = qq|<a href="$$settings{url}"|;
if ($title ne '') {
$linktag .= qq|>$title</a>|;
} else {
$linktag .= qq|>$$settings{url}|;
}
- }
- print FILE qq|<html>
+ print FILE qq|<html>
<head>
<title>$title</title>
</head>
@@ -4571,7 +5428,8 @@ sub webct4_content {
$linktag
</body>
</html>|;
- close(FILE);
+ close(FILE);
+ }
}
}