version 1.30, 2005/10/25 13:54:46
|
version 1.34, 2006/03/24 17:36:27
|
Line 64 sub ims_config {
|
Line 64 sub ims_config {
|
survey => 'FORM', |
survey => 'FORM', |
); |
); |
@{$$cmsmap{angel}{doc}} = ('FILE','PAGE'); |
@{$$cmsmap{angel}{doc}} = ('FILE','PAGE'); |
%{$$cmsmap{webct4}} = ( |
%{$$cmsmap{webctce4}} = ( |
quiz => 'webctquiz', |
quiz => 'webctquiz', |
survey => 'webctsurvey', |
survey => 'webctsurvey', |
doc => 'webcontent' |
doc => 'webcontent' |
Line 158 sub process_manifest {
|
Line 158 sub process_manifest {
|
bb6 => 'organization', |
bb6 => 'organization', |
bb5 => 'tableofcontents', |
bb5 => 'tableofcontents', |
angel => 'organization', |
angel => 'organization', |
webct4 => 'organization', |
webctce4 => 'organization', |
); |
); |
my %contents = (); |
my %contents = (); |
my @state = (); |
my @state = (); |
Line 202 sub process_manifest {
|
Line 202 sub process_manifest {
|
%{$$items{$itm}} = (); |
%{$$items{$itm}} = (); |
$$items{$itm}{contentscount} = 0; |
$$items{$itm}{contentscount} = 0; |
@{$$items{$itm}{contents}} = (); |
@{$$items{$itm}{contents}} = (); |
if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webct4') { |
if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webctce4') { |
$$items{$itm}{resnum} = $attr->{identifierref}; |
$$items{$itm}{resnum} = $attr->{identifierref}; |
if ($cms eq 'bb5') { |
if ($cms eq 'bb5') { |
$$items{$itm}{title} = $attr->{title}; |
$$items{$itm}{title} = $attr->{title}; |
Line 256 sub process_manifest {
|
Line 256 sub process_manifest {
|
$lastitem = $itm; |
$lastitem = $itm; |
} |
} |
} |
} |
if ($cms eq 'webct4') { |
if ($cms eq 'webctce4') { |
if (($state[-1] eq "webct:properties") && (@state > 4)) { |
if (($state[-1] eq "webct:properties") && (@state > 4)) { |
$$items{$itm}{properties} = $attr->{identifierref}; |
$$items{$itm}{properties} = $attr->{identifierref}; |
} |
} |
Line 267 sub process_manifest {
|
Line 267 sub process_manifest {
|
if ($cms eq 'bb5' || $cms eq 'bb6') { |
if ($cms eq 'bb5' || $cms eq 'bb6') { |
$$resources{$identifier}{file} = $attr->{file}; |
$$resources{$identifier}{file} = $attr->{file}; |
$$resources{$identifier}{type} = $attr->{type}; |
$$resources{$identifier}{type} = $attr->{type}; |
} elsif ($cms eq 'webct4') { |
} elsif ($cms eq 'webctce4') { |
$$resources{$identifier}{type} = $attr->{type}; |
$$resources{$identifier}{type} = $attr->{type}; |
$$resources{$identifier}{file} = $attr->{href}; |
$$resources{$identifier}{file} = $attr->{href}; |
} elsif ($cms eq 'angel') { |
} elsif ($cms eq 'angel') { |
Line 280 sub process_manifest {
|
Line 280 sub process_manifest {
|
} |
} |
} elsif ("@state" eq "manifest resources resource file") { |
} elsif ("@state" eq "manifest resources resource file") { |
if ($$includedres{$identifier} || $phase ne 'build') { |
if ($$includedres{$identifier} || $phase ne 'build') { |
if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webct4') { |
if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webctce4') { |
push @{$$hrefs{$identifier}},$attr->{href}; |
push @{$$hrefs{$identifier}},$attr->{href}; |
} elsif ($cms eq 'angel') { |
} elsif ($cms eq 'angel') { |
if ($attr->{href} =~ m/^_assoc\\$identifier\\(.+)$/) { |
if ($attr->{href} =~ m/^_assoc\\$identifier\\(.+)$/) { |
Line 303 sub process_manifest {
|
Line 303 sub process_manifest {
|
if ($cms eq 'angel' || $cms eq 'bb6') { |
if ($cms eq 'angel' || $cms eq 'bb6') { |
$$items{$itm}{title} = $text; |
$$items{$itm}{title} = $text; |
} |
} |
if ($cms eq 'webct4') { |
if ($cms eq 'webctce4') { |
$$items{$itm}{title} = $text; |
$$items{$itm}{title} = $text; |
$$items{$itm}{title} =~ s/(<[^>]*>)//g; |
$$items{$itm}{title} =~ s/(<[^>]*>)//g; |
} |
} |
Line 365 sub target_resources {
|
Line 365 sub target_resources {
|
} |
} |
|
|
sub copy_resources { |
sub copy_resources { |
my ($context,$cms,$hrefs,$tempdir,$targets,$url,$crs,$cdom,$chome,$destdir,$timenow) = @_; |
my ($context,$cms,$hrefs,$tempdir,$targets,$url,$crs,$cdom,$destdir,$timenow) = @_; |
if ($context eq 'DOCS') { |
if ($context eq 'DOCS') { |
foreach my $key (sort keys %{$hrefs}) { |
foreach my $key (sort keys %{$hrefs}) { |
if (grep/^$key$/,@{$targets}) { |
if (grep/^$key$/,@{$targets}) { |
%{$$url{$key}} = (); |
%{$$url{$key}} = (); |
foreach my $file (@{$$hrefs{$key}}) { |
foreach my $file (@{$$hrefs{$key}}) { |
my $source = $tempdir.'/'.$key.'/'.$file; |
my $source = $tempdir.'/'.$key.'/'.$file; |
if ($cms eq 'webct4') { |
if ($cms eq 'webctce4') { |
$source = $tempdir.'/'.$file; |
$source = $tempdir.'/'.$file; |
} |
} |
my $filename = ''; |
my $filename = ''; |
Line 384 sub copy_resources {
|
Line 384 sub copy_resources {
|
} |
} |
$file =~ s-\\-/-g; |
$file =~ s-\\-/-g; |
my $copyfile = $file; |
my $copyfile = $file; |
if ($cms eq 'webct4') { |
if ($cms eq 'webctce4') { |
if ($file =~ m-/my_files/(.+)$-) { |
if ($file =~ m-/my_files/(.+)$-) { |
$copyfile = $1; |
$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$/)) { |
$copyfile = $fpath.$copyfile; |
$copyfile = $fpath.$copyfile; |
my $fileresult; |
my $fileresult; |
if (-e $source) { |
if (-e $source) { |
$fileresult = &Apache::lonnet::process_coursefile('copy',$crs,$cdom,$chome,$copyfile,$source); |
$fileresult = &Apache::lonnet::process_coursefile('copy',$crs,$cdom,$copyfile,$source); |
} |
} |
} |
} |
} |
} |
Line 427 sub copy_resources {
|
Line 427 sub copy_resources {
|
} elsif ($cms eq 'bb5' || $cms eq 'bb6') { |
} elsif ($cms eq 'bb5' || $cms eq 'bb6') { |
rename("$tempdir/$key/$file","$destdir/resfiles/$key/$file"); |
rename("$tempdir/$key/$file","$destdir/resfiles/$key/$file"); |
} |
} |
} elsif ($cms eq 'webct4') { |
} elsif ($cms eq 'webctce4') { |
if ($file =~ m-/my_files/(.+)$-) { |
if ($file =~ m-/my_files/(.+)$-) { |
my $copyfile = $1; |
my $copyfile = $1; |
if ($copyfile =~ m-^[^/]+/[^/]+-) { |
if ($copyfile =~ m-^[^/]+/[^/]+-) { |
Line 511 sub process_resinfo {
|
Line 511 sub process_resinfo {
|
} |
} |
} elsif ($$resources{$key}{type} eq "resource/x-bb-staffinfo") { |
} elsif ($$resources{$key}{type} eq "resource/x-bb-staffinfo") { |
%{$$resinfo{$key}} = (); |
%{$$resinfo{$key}} = (); |
&process_staff($key,$docroot,$dirname,$destdir,\%{$$resinfo{$key}},$resrcfiles); |
&process_staff($key,$docroot,$destdir,\%{$$resinfo{$key}},$resrcfiles); |
} elsif ($$resources{$key}{type} eq "resource/x-bb-externallink") { |
} elsif ($$resources{$key}{type} eq "resource/x-bb-externallink") { |
%{$$resinfo{$key}} = (); |
%{$$resinfo{$key}} = (); |
&process_link($key,$docroot,$dirname,$destdir,\%{$$resinfo{$key}},$resrcfiles); |
&process_link($key,$docroot,$destdir,\%{$$resinfo{$key}},$resrcfiles); |
} elsif ($$resources{$key}{type} eq "resource/x-bb-discussionboard") { |
} elsif ($$resources{$key}{type} eq "resource/x-bb-discussionboard") { |
%{$$resinfo{$key}} = (); |
%{$$resinfo{$key}} = (); |
unless ($db_handling eq 'ignore') { |
unless ($db_handling eq 'ignore') { |
Line 569 sub process_resinfo {
|
Line 569 sub process_resinfo {
|
if (@{$pools}) { |
if (@{$pools}) { |
$$items{'Top'}{'contentscount'} ++; |
$$items{'Top'}{'contentscount'} ++; |
} |
} |
} elsif ($cms eq 'webct4') { |
} elsif ($cms eq 'webctce4') { |
foreach my $key (sort keys %{$resources}) { |
foreach my $key (sort keys %{$resources}) { |
if (grep/^$key$/,@{$targets}) { |
if (grep/^$key$/,@{$targets}) { |
if ($$resources{$key}{type} eq "webcontent") { |
if ($$resources{$key}{type} eq "webcontent") { |
Line 649 sub build_structure {
|
Line 649 sub build_structure {
|
my $resnum = $$items{$key}{resnum}; |
my $resnum = $$items{$key}{resnum}; |
my $type = $$resources{$resnum}{type}; |
my $type = $$resources{$resnum}{type}; |
my $contentscount = $$items{$key}{'contentscount'}; |
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)) { |
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 'webctce4' && $contentscount > 0)) { |
unless (($cms eq 'bb5') && $key eq 'Top') { |
unless (($cms eq 'bb5') && $key eq 'Top') { |
$seqtext{$key} = "<map>\n"; |
$seqtext{$key} = "<map>\n"; |
} |
} |
Line 887 sub build_structure {
|
Line 887 sub build_structure {
|
sub make_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) = @_; |
my $src =''; |
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 'angel' && $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'; |
$src = $srcstem.'/sequences/'.$contitem.'.sequence'; |
$$flag{$key}{page} = 0; |
$$flag{$key}{page} = 0; |
$$flag{$key}{seq} = 1; |
$$flag{$key}{seq} = 1; |
$$count{$key}{seq} ++; |
$$count{$key}{seq} ++; |
} elsif ($cms eq 'webct4' && $randompick) { |
} elsif ($cms eq 'webctce4' && $randompick) { |
$src = $srcstem.'/sequences/'.$res.'.sequence'; |
$src = $srcstem.'/sequences/'.$res.'.sequence'; |
$$flag{$key}{page} = 0; |
$$flag{$key}{page} = 0; |
$$flag{$key}{seq} = 1; |
$$flag{$key}{seq} = 1; |
Line 940 sub make_structure {
|
Line 940 sub make_structure {
|
} |
} |
$$flag{$key}{seq} = 0; |
$$flag{$key}{seq} = 0; |
} |
} |
} elsif ($cms eq 'webct4') { |
} elsif ($cms eq 'webctce4') { |
if ($type eq 'webctquiz') { |
if ($type eq 'webctquiz') { |
$src = $srcstem.'/pages/'.$res.'.page'; |
$src = $srcstem.'/pages/'.$res.'.page'; |
$$count{$key}{page} ++; |
$$count{$key}{page} ++; |
Line 1205 sub process_group {
|
Line 1205 sub process_group {
|
|
|
# ---------------------------------------------------------------- Process Blackboard Staff |
# ---------------------------------------------------------------- Process Blackboard Staff |
sub process_staff { |
sub process_staff { |
my ($res,$docroot,$dirname,$destdir,$settings,$resrcfiles) = @_; |
my ($res,$docroot,$destdir,$settings,$resrcfiles) = @_; |
my $xmlfile = $docroot.'/'.$res.".dat"; |
my $xmlfile = $docroot.'/'.$res.".dat"; |
my $filecount = 0; |
my $filecount = 0; |
my @state; |
my @state; |
%{$$settings{name}} = (); |
%{$$settings{name}} = (); |
%{$$settings{office}} = (); |
%{$$settings{office}} = (); |
|
|
my $p = HTML::Parser->new |
my $p = HTML::Parser->new |
( |
( |
Line 1363 sub process_staff {
|
Line 1363 sub process_staff {
|
|; |
|; |
if ( defined($$settings{image}) ) { |
if ( defined($$settings{image}) ) { |
$staffentry .= qq| |
$staffentry .= qq| |
<img src="$dirname/resfiles/$res/$$settings{image}"> |
<img src="$res/$$settings{image}"> |
|; |
|; |
} |
} |
$staffentry .= qq| |
$staffentry .= qq| |
Line 1386 $staffentry
|
Line 1386 $staffentry
|
|
|
# ---------------------------------------------------------------- Process Blackboard Links |
# ---------------------------------------------------------------- Process Blackboard Links |
sub process_link { |
sub process_link { |
my ($res,$docroot,$dirname,$destdir,$settings,$resrcfiles) = @_; |
my ($res,$docroot,$destdir,$settings,$resrcfiles) = @_; |
my $xmlfile = $docroot.'/'.$res.".dat"; |
my $xmlfile = $docroot.'/'.$res.".dat"; |
my @state = (); |
my @state = (); |
my $p = HTML::Parser->new |
my $p = HTML::Parser->new |
Line 2540 sub process_assessment {
|
Line 2540 sub process_assessment {
|
&parse_bb5_assessment($res,$docroot,$container,$settings,\%allanswers,\%allchoices,\@allids); |
&parse_bb5_assessment($res,$docroot,$container,$settings,\%allanswers,\%allchoices,\@allids); |
} elsif ($cms eq 'bb6') { |
} elsif ($cms eq 'bb6') { |
&parse_bb6_assessment($res,$docroot,$container,$settings,\@allids); |
&parse_bb6_assessment($res,$docroot,$container,$settings,\@allids); |
} elsif ($cms eq 'webct4') { |
} elsif ($cms eq 'webctce4') { |
unless($$dbparse) { |
unless($$dbparse) { |
&parse_webct4_questionDB($docroot,$$resources{$res}{file},$catinfo,$qzdbsettings,\%alldbanswers,\%alldbchoices,\@alldbquestids); |
&parse_webct4_questionDB($docroot,$$resources{$res}{file},$catinfo,$qzdbsettings,\%alldbanswers,\%alldbchoices,\@alldbquestids); |
if (!-e "$destdir/sequences") { |
if (!-e "$destdir/sequences") { |
Line 2603 sub process_assessment {
|
Line 2603 sub process_assessment {
|
} |
} |
} |
} |
my $dirtitle; |
my $dirtitle; |
unless ($cms eq 'webct4') { |
unless ($cms eq 'webctce4') { |
$dirtitle = $$settings{'title'}; |
$dirtitle = $$settings{'title'}; |
$dirtitle =~ s/\W//g; |
$dirtitle =~ s/\W//g; |
$dirtitle .= '_'.$res; |
$dirtitle .= '_'.$res; |
Line 2616 sub process_assessment {
|
Line 2616 sub process_assessment {
|
$newdir = "$destdir/problems/$dirtitle"; |
$newdir = "$destdir/problems/$dirtitle"; |
} |
} |
|
|
if ($cms eq 'webct4') { |
if ($cms eq 'webctce4') { |
&build_problem_container($cms,$dirtitle,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@allids,$udom,$uname,$dirname,\$containerdir,$cid,$cdom,$cnum,$catinfo,$qzdbsettings); |
&build_problem_container($cms,$dirtitle,$destdir,$container,$res,$total,$sequencesfiles,$pagesfiles,$randompickflag,$context,\@allids,$udom,$uname,$dirname,\$containerdir,$cid,$cdom,$cnum,$catinfo,$qzdbsettings); |
} else { |
} 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,$settings); |
Line 2658 sub build_problem_container {
|
Line 2658 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}) { |
if ($cms eq 'webct4') { |
if ($cms eq 'webctce4') { |
$probtitle{$id} = $$settings{$id}{title}; |
$probtitle{$id} = $$settings{$id}{title}; |
} else { |
} else { |
$probtitle{$id} = $$settings{title}; |
$probtitle{$id} = $$settings{title}; |
Line 2667 sub build_problem_container {
|
Line 2667 sub build_problem_container {
|
$probtitle{$id} =~ s/\W//g; |
$probtitle{$id} =~ s/\W//g; |
$probtitle{$id} .= '_'.$id; |
$probtitle{$id} .= '_'.$id; |
} |
} |
if ($cms eq 'webct4' && $container ne 'database') { |
if ($cms eq 'webctce4' && $container ne 'database') { |
my $catid = $$settings{$$allids[0]}{category}; |
my $catid = $$settings{$$allids[0]}{category}; |
my $probdir = $$catinfo{$catid}{title}.'_'.$catid; |
my $probdir = $$catinfo{$catid}{title}.'_'.$catid; |
$probdir =~ s/\s/_/g; |
$probdir =~ s/\s/_/g; |
Line 2691 sub build_problem_container {
|
Line 2691 sub build_problem_container {
|
$curr_id = $j; |
$curr_id = $j; |
$next_id = $curr_id + 1; |
$next_id = $curr_id + 1; |
if ($context eq 'CSTR') { |
if ($context eq 'CSTR') { |
if ($cms eq 'webct4' && $container ne 'database') { |
if ($cms eq 'webctce4' && $container ne 'database') { |
my $catid = $$settings{$$allids[$j]}{category}; |
my $catid = $$settings{$$allids[$j]}{category}; |
my $probdir = $$catinfo{$catid}{title}.'_'.$catid; |
my $probdir = $$catinfo{$catid}{title}.'_'.$catid; |
$probdir =~ s/\s/_/g; |
$probdir =~ s/\s/_/g; |
Line 2718 sub build_problem_container {
|
Line 2718 sub build_problem_container {
|
sub write_bb5_questions { |
sub write_bb5_questions { |
my ($allids,$containerdir,$context,$settings,$dirname,$destdir,$res,$allanswers,$allchoices,$total,$newdir,$cid,$cdom,$cnum,$docroot) = @_; |
my ($allids,$containerdir,$context,$settings,$dirname,$destdir,$res,$allanswers,$allchoices,$total,$newdir,$cid,$cdom,$cnum,$docroot) = @_; |
my $qnum = 0; |
my $qnum = 0; |
|
my $pathstart; |
|
if ($context eq 'CSTR') { |
|
$pathstart = '../..'; |
|
} else { |
|
$pathstart = $dirname; |
|
} |
foreach my $id (@{$allids}) { |
foreach my $id (@{$allids}) { |
if ($$settings{$id}{ishtml} eq 'true') { |
if ($$settings{$id}{ishtml} eq 'true') { |
$$settings{$id}{text} = &HTML::Entities::decode($$settings{$id}{text}); |
$$settings{$id}{text} = &HTML::Entities::decode($$settings{$id}{text}); |
} |
} |
if ($$settings{$id}{text} =~ m#<img src=['"]?(https?://[^\s]+/)([^/\s\'"]+)['"]?[^>]*>#) { |
if ($$settings{$id}{text} =~ m#<img src=['"]?(https?://[^\s]+/)([^/\s\'"]+)['"]?[^>]*>#) { |
if (&retrieve_image($context,$res,$dirname,$cdom,$cnum,$docroot,$destdir,$1,$2) eq 'ok') { |
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=['"]?)(https?://[^\s]+/)([^/\s'"]+)(['"]?[^>]*>)#$1$pathstart/resfiles/$res/webimages/$3$4#g; |
} |
} |
} |
} |
$$settings{$id}{text} =~ s#(<img src=[^>]+)/*>#$1 />#gi; |
$$settings{$id}{text} =~ s#(<img src=[^>]+)/*>#$1 />#gi; |
Line 2772 sub write_bb5_questions {
|
Line 2778 sub write_bb5_questions {
|
my ($image,$imglink,$url); |
my ($image,$imglink,$url); |
if ( defined($$settings{$id}{image}) ) { |
if ( defined($$settings{$id}{image}) ) { |
if ( $$settings{$id}{style} eq 'embed' ) { |
if ( $$settings{$id}{style} eq 'embed' ) { |
$image = qq|<br /><img src="$dirname/resfiles/$res/$$settings{$id}{image}" /><br />|; |
$image = qq|<br /><img src="$pathstart/resfiles/$res/$$settings{$id}{image}" /><br />|; |
} else { |
} else { |
$imglink = qq|<br /><a href="$dirname/resfiles/$res/$$settings{$id}{image}">Link to file</a><br />|; |
$imglink = qq|<br /><a href="$pathstart/resfiles/$res/$$settings{$id}{image}">Link to file</a><br />|; |
} |
} |
} |
} |
if ( defined($$settings{$id}{url}) ) { |
if ( defined($$settings{$id}{url}) ) { |
Line 2819 sub write_bb5_questions {
|
Line 2825 sub write_bb5_questions {
|
my ($ans_image,$ans_link); |
my ($ans_image,$ans_link); |
if ( defined($$settings{$id}{$$allanswers{$id}[$k]}{image}) ) { |
if ( defined($$settings{$id}{$$allanswers{$id}[$k]}{image}) ) { |
if ( $$settings{$id}{$$allanswers{$id}[$k]}{style} eq 'embed' ) { |
if ( $$settings{$id}{$$allanswers{$id}[$k]}{style} eq 'embed' ) { |
$ans_image .= qq|<br /><img src="$dirname/resfiles/$res/$$settings{$id}{$$allanswers{$id}[$k]}{image}" /><br />|; |
$ans_image .= qq|<br /><img src="$pathstart/resfiles/$res/$$settings{$id}{$$allanswers{$id}[$k]}{image}" /><br />|; |
} else { |
} else { |
$ans_link .= qq|<br /><a href="$dirname/resfiles/$res/$$settings{$id}{$$allanswers{$id}[$k]}{image}" />Link to file</a><br/>|; |
$ans_link .= qq|<br /><a href="$pathstart/resfiles/$res/$$settings{$id}{$$allanswers{$id}[$k]}{image}" />Link to file</a><br/>|; |
} |
} |
} |
} |
$output .= $ans_image.$ans_link.'<endouttext /></foil>'."\n"; |
$output .= $ans_image.$ans_link.'<endouttext /></foil>'."\n"; |
Line 3642 sub write_bb6_questions {
|
Line 3648 sub write_bb6_questions {
|
|; |
|; |
} |
} |
$$total{prob} ++; |
$$total{prob} ++; |
$questiontext .= &add_images_links('question',$settings,$id,$dirname,$res); |
$questiontext .= &add_images_links('question',$context,$settings,$id,$dirname,$res); |
if ($$settings{$id}{class} eq "Essay") { |
if ($$settings{$id}{class} eq "Essay") { |
if ($context eq 'CSTR') { |
if ($context eq 'CSTR') { |
$output .= qq|<startouttext />$questiontext<endouttext /> |
$output .= qq|<startouttext />$questiontext<endouttext /> |
Line 3680 sub write_bb6_questions {
|
Line 3686 sub write_bb6_questions {
|
my $answer_text = $$settings{$id}{$answer_id}{text}; |
my $answer_text = $$settings{$id}{$answer_id}{text}; |
my $texttype = $$settings{$id}{$answer_id}{texttype}; |
my $texttype = $$settings{$id}{$answer_id}{texttype}; |
&process_html(\$answer_text,'bb6',$texttype,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir); |
&process_html(\$answer_text,'bb6',$texttype,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir); |
$answer_text .= &add_images_links('response',$settings,$id,$dirname,$res); |
$answer_text .= &add_images_links('response',$context,$settings,$id,$dirname,$res); |
$output .= " <foil name=\"foil".$k."\" value=\""; |
$output .= " <foil name=\"foil".$k."\" value=\""; |
if (grep/^$answer_id$/,@{$$settings{$id}{correctanswer}}) { |
if (grep/^$answer_id$/,@{$$settings{$id}{correctanswer}}) { |
$output .= "true\" location=\""; |
$output .= "true\" location=\""; |
Line 3733 sub write_bb6_questions {
|
Line 3739 sub write_bb6_questions {
|
my $answer_text = $$settings{$id}{$answer_id}{text}; |
my $answer_text = $$settings{$id}{$answer_id}{text}; |
my $texttype = $$settings{$id}{$answer_id}{texttype}; |
my $texttype = $$settings{$id}{$answer_id}{texttype}; |
&process_html(\$answer_text,'bb6',$texttype,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir); |
&process_html(\$answer_text,'bb6',$texttype,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir); |
$answer_text .= &add_images_links('response',$settings,$id,$dirname,$res); |
$answer_text .= &add_images_links('response',$context,$settings,$id,$dirname,$res); |
|
|
$output .= " <foil name=\"foil".$k."\" value=\""; |
$output .= " <foil name=\"foil".$k."\" value=\""; |
if (grep/^$answer_id$/,@{$$settings{$id}{correctanswer}}) { |
if (grep/^$answer_id$/,@{$$settings{$id}{correctanswer}}) { |
Line 3779 sub write_bb6_questions {
|
Line 3785 sub write_bb6_questions {
|
my $answer_text = $$settings{$id}{$answer_id}{text}; |
my $answer_text = $$settings{$id}{$answer_id}{text}; |
my $texttype = $$settings{$id}{$answer_id}{texttype}; |
my $texttype = $$settings{$id}{$answer_id}{texttype}; |
&process_html(\$answer_text,'bb6',$texttype,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir); |
&process_html(\$answer_text,'bb6',$texttype,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir); |
$answer_text .= &add_images_links('response',$settings,$id,$dirname,$res); |
$answer_text .= &add_images_links('response',$context,$settings,$id,$dirname,$res); |
my $iter = $k+1; |
my $iter = $k+1; |
if ($context eq 'CSTR') { |
if ($context eq 'CSTR') { |
$output .= " <foil location=\"random\" name=\"foil".$k."\" value=\"".$$settings{$id}{$answer_id}{order}."\"><startouttext />".$answer_text."<endouttext /></foil>\n"; |
$output .= " <foil location=\"random\" name=\"foil".$k."\" value=\"".$$settings{$id}{$answer_id}{order}."\"><startouttext />".$answer_text."<endouttext /></foil>\n"; |
Line 3920 sub write_bb6_questions {
|
Line 3926 sub write_bb6_questions {
|
my $texttype = $$settings{$id}{$choice_id}{texttype}; |
my $texttype = $$settings{$id}{$choice_id}{texttype}; |
my $choice_plaintext = &remove_html($choice_text); |
my $choice_plaintext = &remove_html($choice_text); |
&process_html(\$choice_text,'bb6',$texttype,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir); |
&process_html(\$choice_text,'bb6',$texttype,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir); |
$choice_text .= &add_images_links($choice_id,$settings,$id,$dirname,$res); |
$choice_text .= &add_images_links($choice_id,$context,$settings,$id,$dirname,$res); |
push(@allmatchers,$choice_plaintext); |
push(@allmatchers,$choice_plaintext); |
if ($context eq 'CSTR') { |
if ($context eq 'CSTR') { |
$output .= qq| |
$output .= qq| |
Line 3940 sub write_bb6_questions {
|
Line 3946 sub write_bb6_questions {
|
my $answer_text = $$settings{$id}{$answer_id}{text}; |
my $answer_text = $$settings{$id}{$answer_id}{text}; |
my $texttype = $$settings{$id}{$answer_id}{texttype}; |
my $texttype = $$settings{$id}{$answer_id}{texttype}; |
&process_html(\$answer_text,'bb6',$texttype,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir); |
&process_html(\$answer_text,'bb6',$texttype,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir); |
$answer_text .= &add_images_links($answer_id,$settings,$id,$dirname,$res); |
$answer_text .= &add_images_links($answer_id,$context,$settings,$id,$dirname,$res); |
if ($context eq 'CSTR') { |
if ($context eq 'CSTR') { |
$output .= ' |
$output .= ' |
<foil location="random" value="rightmatch'.$$settings{$id}{$$settings{$id}{$answer_id}{correctanswer}}{order}.'" name="'.$answer_id.'"> |
<foil location="random" value="rightmatch'.$$settings{$id}{$$settings{$id}{$answer_id}{correctanswer}}{order}.'" name="'.$answer_id.'"> |
Line 4005 sub retrieve_image {
|
Line 4011 sub retrieve_image {
|
print $fh $contents; |
print $fh $contents; |
close($fh); |
close($fh); |
if ($context eq 'DOCS') { |
if ($context eq 'DOCS') { |
my $chome = &Apache::lonnet::homeserver($cname,$cdom); |
|
my $copyfile = $dirname.'/'.$filename; |
my $copyfile = $dirname.'/'.$filename; |
my $source = "$docroot/$res/webimages/$filename"; |
my $source = "$docroot/$res/webimages/$filename"; |
my $fileresult; |
my $fileresult; |
if (-e $source) { |
if (-e $source) { |
$fileresult = &Apache::lonnet::process_coursefile('copy',$cname,$cdom,$chome,$copyfile,$source); |
$fileresult = &Apache::lonnet::process_coursefile('copy',$cname,$cdom,$copyfile,$source); |
} |
} |
return $fileresult; |
return $fileresult; |
} elsif ($context eq 'CSTR') { |
} elsif ($context eq 'CSTR') { |
Line 4572 $linktag
|
Line 4577 $linktag
|
|
|
sub process_html { |
sub process_html { |
my ($text,$caller,$html_cond,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir) = @_; |
my ($text,$caller,$html_cond,$context,$res,$dirname,$cdom,$cnum,$docroot,$destdir) = @_; |
|
my $pathstart; |
|
if ($context eq 'CSTR') { |
|
$pathstart = '../..'; |
|
} else { |
|
$pathstart = $dirname; |
|
} |
if ($caller eq 'bb5') { |
if ($caller eq 'bb5') { |
if ($html_cond eq 'true') { |
if ($html_cond eq 'true') { |
$$text = &HTML::Entities::decode($$text); |
$$text = &HTML::Entities::decode($$text); |
Line 4584 sub process_html {
|
Line 4594 sub process_html {
|
} |
} |
if ($$text =~ m#<img src=['"]?(https?://[^\s]+/)([^/\s\'"]+)['"]?[^>]*>#) { |
if ($$text =~ m#<img src=['"]?(https?://[^\s]+/)([^/\s\'"]+)['"]?[^>]*>#) { |
if (&retrieve_image($context,$res,$dirname,$cdom,$cnum,$docroot,$destdir,$1,$2) eq 'ok') { |
if (&retrieve_image($context,$res,$dirname,$cdom,$cnum,$docroot,$destdir,$1,$2) eq 'ok') { |
$$text =~ s#(<img src=['"]?)(https?://[^\s]+/)([^/\s'"]+)(['"]?[^>]*>)#$1../../resfiles/$res/webimages/$3$4#g; |
$$text =~ s#(<img src=['"]?)(https?://[^\s]+/)([^/\s'"]+)(['"]?[^>]*>)#$1$pathstart/resfiles/$res/webimages/$3$4#g; |
} |
} |
} |
} |
$$text =~ s#(<img src=[^>]+)/*>#$1 />#gi; |
$$text =~ s#(<img src=[^>]+)/*>#$1 />#gi; |
Line 4593 sub process_html {
|
Line 4603 sub process_html {
|
} |
} |
|
|
sub add_images_links { |
sub add_images_links { |
my ($type,$settings,$id,$dirname,$res) = @_; |
my ($type,$context,$settings,$id,$dirname,$res) = @_; |
my ($image,$imglink,$url); |
my ($image,$imglink,$url,$pathstart); |
|
if ($context eq 'CSTR') { |
|
$pathstart = '../..'; |
|
} else { |
|
$pathstart = $dirname; |
|
} |
if ((defined($$settings{$id}{$type}{image})) && ($$settings{$id}{$type}{image} ne '')) { |
if ((defined($$settings{$id}{$type}{image})) && ($$settings{$id}{$type}{image} ne '')) { |
if ( $$settings{$id}{$type}{style} eq 'Inline' ) { |
if ( $$settings{$id}{$type}{style} eq 'Inline' ) { |
$image = qq|<br /><img src="../../resfiles/$res/$$settings{$id}{$type}{image}" alt="$$settings{$id}{$type}{label}"/><br />|; |
$image = qq|<br /><img src="$pathstart/resfiles/$res/$$settings{$id}{$type}{image}" alt="$$settings{$id}{$type}{label}"/><br />|; |
} else { |
} else { |
$imglink = qq|<br /><a href="../../resfiles/$res/$$settings{$id}{$type}{image}">$$settings{$id}{$type}{label}</a><br />|; |
$imglink = qq|<br /><a href="$pathstart/resfiles/$res/$$settings{$id}{$type}{image}">$$settings{$id}{$type}{label}</a><br />|; |
} |
} |
} |
} |
if ((defined($$settings{$id}{$type}{link})) && ($$settings{$id}{$type}{link} ne '' )) { |
if ((defined($$settings{$id}{$type}{link})) && ($$settings{$id}{$type}{link} ne '' )) { |