version 1.18, 2005/03/23 20:55:33
|
version 1.21, 2005/05/28 01:32:32
|
Line 24
|
Line 24
|
package Apache::imsprocessor; |
package Apache::imsprocessor; |
|
|
use Apache::lonnet; |
use Apache::lonnet; |
|
use Apache::loncleanup; |
|
use LWP::UserAgent; |
|
use HTTP::Request::Common; |
use LONCAPA::Configuration; |
use LONCAPA::Configuration; |
use strict; |
use strict; |
|
|
Line 95 sub uploadzip {
|
Line 98 sub uploadzip {
|
my ($context,$tempdir,$source) = @_; |
my ($context,$tempdir,$source) = @_; |
my $fname; |
my $fname; |
if ($context eq 'DOCS') { |
if ($context eq 'DOCS') { |
$fname=$ENV{'form.uploadname.filename'}; |
$fname=$env{'form.uploadname.filename'}; |
# Replace Windows backslashes by forward slashes |
# Replace Windows backslashes by forward slashes |
$fname=~s/\\/\//g; |
$fname=~s/\\/\//g; |
# Get rid of everything but the actual filename |
# Get rid of everything but the actual filename |
Line 107 sub uploadzip {
|
Line 110 sub uploadzip {
|
# See if there is anything left |
# See if there is anything left |
unless ($fname) { return 'error: no uploaded file'; } |
unless ($fname) { return 'error: no uploaded file'; } |
# Save the file |
# Save the file |
chomp($ENV{'form.uploadname'}); |
chomp($env{'form.uploadname'}); |
open(my $fh,'>'.$tempdir.'/'.$fname); |
open(my $fh,'>'.$tempdir.'/'.$fname); |
print $fh $ENV{'form.uploadname'}; |
print $fh $env{'form.uploadname'}; |
close($fh); |
close($fh); |
} elsif ($context eq 'CSTR') { |
} elsif ($context eq 'CSTR') { |
if ($source =~ m/\/([^\/]+)$/) { |
if ($source =~ m/\/([^\/]+)$/) { |
Line 128 sub expand_zip {
|
Line 131 sub expand_zip {
|
return 'no zip'; |
return 'no zip'; |
} |
} |
if ($filename =~ m|\.zip$|i) { |
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 |"); |
open(OUTPUT, "unzip -o $zipfile -d $tempdir 2> /dev/null |"); |
close(OUTPUT); |
close(OUTPUT); |
%ENV=%oldENV; |
|
undef(%oldENV); |
|
} else { |
} else { |
return 'nozip'; |
return 'nozip'; |
} |
} |
Line 1730 sub parse_bb5_assessment {
|
Line 1727 sub parse_bb5_assessment {
|
$id = $attr->{id}; |
$id = $attr->{id}; |
} elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "BODY") && ($state[3] eq "FLAGS") ) { |
} elsif ( ($state[0] eq $toptag{$container}) && ($state[1] =~ m/^QUESTION_(\w+)$/) && ($state[2] eq "BODY") && ($state[3] eq "FLAGS") ) { |
if ($state[4] eq "ISHTML") { |
if ($state[4] eq "ISHTML") { |
$$settings{$id}{html} = $attr->{value}; |
$$settings{$id}{ishtml} = $attr->{value}; |
} elsif ($state[4] eq "ISNEWLINELITERAL") { |
} elsif ($state[4] eq "ISNEWLINELITERAL") { |
$$settings{$id}{newline} = $attr->{value}; |
$$settings{$id}{newline} = $attr->{value}; |
} |
} |
Line 2290 sub process_assessment {
|
Line 2287 sub process_assessment {
|
my $randompickflag = 0; |
my $randompickflag = 0; |
my ($cid,$cdom,$cnum); |
my ($cid,$cdom,$cnum); |
if ($context eq 'DOCS') { |
if ($context eq 'DOCS') { |
$cid = $ENV{'request.course.id'}; |
$cid = $env{'request.course.id'}; |
($cdom,$cnum) = split/_/,$cid; |
($cdom,$cnum) = split/_/,$cid; |
} |
} |
my $destresdir = $destdir; |
my $destresdir = $destdir; |
Line 2348 sub process_assessment {
|
Line 2345 sub process_assessment {
|
if (!-e "$destdir/problems/$seqname") { |
if (!-e "$destdir/problems/$seqname") { |
mkdir("$destdir/problems/$seqname",0755); |
mkdir("$destdir/problems/$seqname",0755); |
} |
} |
my $newdir = "$destdir/problems/$seqname"; |
$newdir = "$destdir/problems/$seqname"; |
my $dbcontainerdir; |
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); |
&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); |
} |
} |
Line 2376 sub process_assessment {
|
Line 2373 sub process_assessment {
|
if (!-e "$destdir/problems/$dirtitle") { |
if (!-e "$destdir/problems/$dirtitle") { |
mkdir("$destdir/problems/$dirtitle",0755); |
mkdir("$destdir/problems/$dirtitle",0755); |
} |
} |
my $newdir = "$destdir/problems/$dirtitle"; |
$newdir = "$destdir/problems/$dirtitle"; |
} |
} |
|
|
&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 'webct4') { |
|
&build_problem_container($cms,$dirtitle,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@allids,$udom,$uname,$dirname,\$containerdir,$cid,$cdom,$cnum,$catinfo,$qzdbsettings); |
|
} else { |
|
&build_problem_container($cms,$dirtitle,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@allids,$udom,$uname,$dirname,\$containerdir,$cid,$cdom,$cnum,$catinfo,$settings); |
|
} |
if ($cms eq 'bb5') { |
if ($cms eq 'bb5') { |
&write_bb5_questions(\@allids,$containerdir,$context,$settings,$dirname,$res,\%allanswers,\%allchoices,$total,$newdir,$cid,$cdom,$cnum); |
&write_bb5_questions(\@allids,$containerdir,$context,$settings,$dirname,$destdir,$res,\%allanswers,\%allchoices,$total,$newdir,$cid,$cdom,$cnum,$docroot); |
} elsif ($cms eq 'bb6') { |
} elsif ($cms eq 'bb6') { |
&write_bb6_questions(\@allids,$containerdir,$context,$settings,$dirname,$res,\%allanswers,\%allchoices,$total,$newdir,$cid,$cdom,$cnum); |
&write_bb6_questions(\@allids,$containerdir,$context,$settings,$dirname,$destdir,$res,\%allanswers,\%allchoices,$total,$newdir,$cid,$cdom,$cnum); |
} |
} |
} |
} |
|
|
Line 2417 sub build_problem_container {
|
Line 2418 sub build_problem_container {
|
my $probsrc = "/res/lib/templates/simpleproblem.problem"; |
my $probsrc = "/res/lib/templates/simpleproblem.problem"; |
if ($context eq 'CSTR') { |
if ($context eq 'CSTR') { |
foreach my $id (@{$allids}) { |
foreach my $id (@{$allids}) { |
$probtitle{$id} = $$settings{$id}{title}; |
if ($cms eq 'webct4') { |
|
$probtitle{$id} = $$settings{$id}{title}; |
|
} else { |
|
$probtitle{$id} = $$settings{title}; |
|
} |
$probtitle{$id} =~ s/\s/_/g; |
$probtitle{$id} =~ s/\s/_/g; |
$probtitle{$id} =~ s/\W//g; |
$probtitle{$id} =~ s/\W//g; |
$probtitle{$id} .= '_'.$id; |
$probtitle{$id} .= '_'.$id; |
Line 2429 sub build_problem_container {
|
Line 2434 sub build_problem_container {
|
$probdir =~ s/\W//g; |
$probdir =~ s/\W//g; |
$probsrc = "$dirname/problems/$probdir/$probtitle{$$allids[0]}.problem"; |
$probsrc = "$dirname/problems/$probdir/$probtitle{$$allids[0]}.problem"; |
} else { |
} else { |
$probsrc="$dirname/problems/$dirtitle/$$allids[0].problem"; |
$probsrc="$dirname/problems/$dirtitle/$probtitle{$$allids[0]}.problem"; |
} |
} |
} |
} |
print $fh qq|<resource id="1" src="$probsrc" type="start" title="question_0001"></resource>|; |
print $fh qq|<resource id="1" src="$probsrc" type="start" title="question_0001"></resource>|; |
Line 2453 sub build_problem_container {
|
Line 2458 sub build_problem_container {
|
$probdir =~ s/\W//g; |
$probdir =~ s/\W//g; |
$probsrc = "$dirname/problems/$probdir/$probtitle{$$allids[$j]}.problem"; |
$probsrc = "$dirname/problems/$probdir/$probtitle{$$allids[$j]}.problem"; |
} else { |
} else { |
$probsrc = "$dirname/problems/$dirtitle/$$allids[$j].problem"; |
$probsrc = "$dirname/problems/$dirtitle/$probtitle{$$allids[$j]}.problem"; |
} |
} |
} |
} |
print $fh qq| |
print $fh qq| |
Line 2471 sub build_problem_container {
|
Line 2476 sub build_problem_container {
|
} |
} |
|
|
sub write_bb5_questions { |
sub write_bb5_questions { |
my ($allids,$containerdir,$context,$settings,$dirname,$res,$allanswers,$allchoices,$total,$newdir,$cid,$cdom,$cnum) = @_; |
my ($allids,$containerdir,$context,$settings,$dirname,$destdir,$res,$allanswers,$allchoices,$total,$newdir,$cid,$cdom,$cnum,$docroot) = @_; |
my $qnum = 0; |
my $qnum = 0; |
foreach my $id (@{$allids}) { |
foreach my $id (@{$allids}) { |
|
if ($$settings{$id}{ishtml} eq 'true') { |
|
$$settings{$id}{text} = &HTML::Entities::decode($$settings{$id}{text}); |
|
} |
|
if ($$settings{$id}{text} =~ m#<img src=['"]?(https?://[^\s]+/)([^/\s\'"]+)['"]?[^>]*>#) { |
|
if (&retrieve_image($context,$res,$dirname,$cdom,$cnum,$docroot,$destdir,$1,$2) eq 'ok') { |
|
$$settings{$id}{text} =~ s#(<img src=['"]?)(https?://[^\s]+/)([^/\s'"]+)(['"]?[^>]*>)#$1../../resfiles/$res/webimages/$3$4#g; |
|
} |
|
} |
|
$$settings{$id}{text} =~ s#(<img src=[^>]+)/*>#$1 />#gi; |
|
$$settings{$id}{text} =~ s#<br>#<br />#g; |
$qnum ++; |
$qnum ++; |
my $output; |
my $output; |
my $permcontainer = $containerdir; |
my $permcontainer = $containerdir; |
Line 2817 sub write_bb5_questions {
|
Line 2832 sub write_bb5_questions {
|
if ($context eq 'CSTR') { |
if ($context eq 'CSTR') { |
$output .= qq|</problem> |
$output .= qq|</problem> |
|; |
|; |
open(PROB,">$newdir/problems/$id.problem"); |
my $title = $$settings{title}; |
|
$title =~ s/\s/_/g; |
|
$title =~ s/\W//g; |
|
$title .= '_'.$id; |
|
open(PROB,">:utf8", "$newdir/$title.problem"); |
print PROB $output; |
print PROB $output; |
close PROB; |
close PROB; |
} else { |
} else { |
Line 2846 sub write_webct4_questions {
|
Line 2865 sub write_webct4_questions {
|
} |
} |
if ($$settings{$id}{texttype} eq 'text/html') { |
if ($$settings{$id}{texttype} eq 'text/html') { |
$$settings{$id}{text} = &HTML::Entities::decode($$settings{$id}{text}); |
$$settings{$id}{text} = &HTML::Entities::decode($$settings{$id}{text}); |
$$settings{$id}{text} = &Apache::lonxml::htmlclean($$settings{$id}{text}); |
$$settings{$id}{text} = &Apache::loncleanup::htmlclean($$settings{$id}{text}); |
$$settings{$id}{text} =~ s#(<img src=")([^>]+)>#$1../../resfiles/$2 />#gi; |
$$settings{$id}{text} =~ s#(<img src=["']?)([^>]+)(/?>)#$1../../resfiles/$2 />#gi; |
$$settings{$id}{text} =~ s#<hr>#<hr />#g; |
$$settings{$id}{text} =~ s#<([bh])r>#<$1r />#g; |
# $$settings{$id}{text} =~ s#<p>#</p><p>#g; |
# $$settings{$id}{text} =~ s#<p>#</p><p>#g; |
# $$settings{$id}{text} =~ s#</p></p>#</p>#; |
# $$settings{$id}{text} =~ s#</p></p>#</p>#; |
# $$settings{$id}{text} =~ s#<p></p>##g; |
# $$settings{$id}{text} =~ s#<p></p>##g; |
$$settings{$id}{text} =~ s#<p>#<br /><br />#g; |
$$settings{$id}{text} =~ s#<p>#<br /><br />#g; |
$$settings{$id}{text} =~ s#<\\p>##g; |
$$settings{$id}{text} =~ s#</p>##g; |
} |
} |
if ($$settings{$id}{class} eq 'numerical') { |
if ($$settings{$id}{class} eq 'numerical') { |
foreach my $numid (@{$$settings{$id}{numids}}) { |
foreach my $numid (@{$$settings{$id}{numids}}) { |
Line 2936 sub write_webct4_questions {
|
Line 2955 sub write_webct4_questions {
|
} |
} |
if ($$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{texttype} eq 'text/html') { |
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} = &HTML::Entities::decode($$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text}); |
$$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text} = &Apache::lonxml::htmlclean($$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#(<img src=")([^>]+)>#$1../../resfiles/$2 />#gi; |
$$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text} =~ s#</?p>##g; |
$$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text} =~ s#</?p>##g; |
|
|
Line 2978 sub write_webct4_questions {
|
Line 2997 sub write_webct4_questions {
|
} |
} |
if ($$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{texttype} eq 'text/html') { |
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} = &HTML::Entities::decode($$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text}); |
$$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text} = &Apache::lonxml::htmlclean($$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#(<img src=")([^>]+)>#$1../../resfiles/$2 />#gi; |
$$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text} =~ s#</?p>##g; |
$$settings{$id}{$list}{$$allanswers{$id}{$list}[$k]}{text} =~ s#</?p>##g; |
Line 3010 sub write_webct4_questions {
|
Line 3029 sub write_webct4_questions {
|
|
|
$$settings{$id}{$grp}{$answer_id}{text} = &HTML::Entities::decode($$settings{$id}{$grp}{$answer_id}{text}); |
$$settings{$id}{$grp}{$answer_id}{text} = &HTML::Entities::decode($$settings{$id}{$grp}{$answer_id}{text}); |
$test_for_html = &test_for_html($$settings{$id}{$grp}{$answer_id}{text}); |
$test_for_html = &test_for_html($$settings{$id}{$grp}{$answer_id}{text}); |
$$settings{$id}{$grp}{$answer_id}{text} = &Apache::lonxml::chtmlclean($$settings{$id}{$grp}{$answer_id}{text}); |
$$settings{$id}{$grp}{$answer_id}{text} = &Apache::loncleanup::htmlclean($$settings{$id}{$grp}{$answer_id}{text}); |
$$settings{$id}{$grp}{$answer_id}{text} =~ s#(<img src=")([^>]+)>#$1../../resfiles/$2 />#gi; |
$$settings{$id}{$grp}{$answer_id}{text} =~ s#(<img src=")([^>]+)>#$1../../resfiles/$2 />#gi; |
$$settings{$id}{$grp}{$answer_id}{text} =~ s#</?p>##g; |
$$settings{$id}{$grp}{$answer_id}{text} =~ s#</?p>##g; |
} |
} |
Line 3073 sub write_webct4_questions {
|
Line 3092 sub write_webct4_questions {
|
for (my $k=0; $k<@{$$allchoices{$id}}; $k++) { |
for (my $k=0; $k<@{$$allchoices{$id}}; $k++) { |
if ($$settings{$id}{$$allchoices{$id}[$k]}{texttype} eq 'text/html') { |
if ($$settings{$id}{$$allchoices{$id}[$k]}{texttype} eq 'text/html') { |
$$settings{$id}{$$allchoices{$id}[$k]}{text} = &HTML::Entities::decode($$settings{$id}{$$allchoices{$id}[$k]}{text}); |
$$settings{$id}{$$allchoices{$id}[$k]}{text} = &HTML::Entities::decode($$settings{$id}{$$allchoices{$id}[$k]}{text}); |
$$settings{$id}{$$allchoices{$id}[$k]}{text} = &Apache::lonxml::htmlclean($$settings{$id}{$$allchoices{$id}[$k]}{text}); |
$$settings{$id}{$$allchoices{$id}[$k]}{text} = &Apache::loncleanup::htmlclean($$settings{$id}{$$allchoices{$id}[$k]}{text}); |
$$settings{$id}{$$allchoices{$id}[$k]}{text} =~ s#(<img src=")([^>]+)>#$1../../resfiles/$2 />#gi; |
$$settings{$id}{$$allchoices{$id}[$k]}{text} =~ s#(<img src=")([^>]+)>#$1../../resfiles/$2 />#gi; |
$$settings{$id}{$$allchoices{$id}[$k]}{text} =~ s#</?p>##g; |
$$settings{$id}{$$allchoices{$id}[$k]}{text} =~ s#</?p>##g; |
} |
} |
Line 3338 sub test_for_html {
|
Line 3357 sub test_for_html {
|
} |
} |
|
|
sub write_bb6_questions { |
sub write_bb6_questions { |
my ($allids,$containerdir,$context,$settings,$dirname,$res,$allanswers,$allchoices) = @_; |
my ($allids,$containerdir,$context,$settings,$dirname,$destdir,$res,$allanswers,$allchoices) = @_; |
|
} |
|
|
|
sub retrieve_image { |
|
my ($context,$res,$dirname,$cdom,$cname,$docroot,$destdir,$urlpath,$filename) = @_; |
|
my $contents; |
|
my $url = $urlpath.$filename; |
|
my $ua=new LWP::UserAgent; |
|
my $request=new HTTP::Request('GET',$url); |
|
my $response=$ua->request($request); |
|
if ($response->is_success) { |
|
$contents = $response->content; |
|
if (!-e "$docroot/$res") { |
|
mkdir("$docroot/$res",0755); |
|
} |
|
if (!-e "$docroot/$res/webimages") { |
|
mkdir("$docroot/$res/webimages",0755); |
|
} |
|
open(my $fh,">$docroot/$res/webimages/$filename"); |
|
print $fh $contents; |
|
close($fh); |
|
if ($context eq 'DOCS') { |
|
my $chome = &Apache::lonnet::homeserver($cname,$cdom); |
|
my $copyfile = $dirname.'/'.$filename; |
|
my $source = "$docroot/$res/webimages/$filename"; |
|
my $fileresult; |
|
if (-e $source) { |
|
$fileresult = &Apache::lonnet::process_coursefile('copy',$cname,$cdom,$chome,$copyfile,$source); |
|
} |
|
return $fileresult; |
|
} elsif ($context eq 'CSTR') { |
|
if (!-e "$destdir/resfiles/$res") { |
|
mkdir("$destdir/resfiles/$res",0755); |
|
} |
|
if (!-e "$destdir/resfiles/$res/webimages") { |
|
mkdir("$destdir/resfiles/$res/webimages",0755); |
|
} |
|
rename("$docroot/$res/webimages/$filename","$destdir/resfiles/$res/webimages/$filename"); |
|
return 'ok'; |
|
} |
|
} else { |
|
return -1; |
|
} |
} |
} |
|
|
# ---------------------------------------------------------------- Process Blackboard Announcements |
# ---------------------------------------------------------------- Process Blackboard Announcements |