version 1.49, 2011/10/24 23:41:52
|
version 1.50, 2011/11/03 17:54:53
|
Line 679 sub process_resinfo {
|
Line 679 sub process_resinfo {
|
$cid = $env{'request.course.id'}; |
$cid = $env{'request.course.id'}; |
} |
} |
my $destresdir = $destdir; |
my $destresdir = $destdir; |
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
if ($context eq 'CSTR') { |
if ($context eq 'CSTR') { |
$destresdir =~ s|/home/httpd/html/priv/|/res/|; |
$destresdir =~ s{^\Q$londocroot/priv/\E}{/res/}; |
} elsif ($context eq 'DOCS') { |
} elsif ($context eq 'DOCS') { |
$destresdir =~ s|^/home/httpd/html/userfiles|/uploaded|; |
$destresdir =~ s{^\Q$londocroot/userfiles\E}{/uploaded}; |
} |
} |
foreach my $res (sort(keys(%allquestions))) { |
foreach my $res (sort(keys(%allquestions))) { |
my $parent = $allquestions{$res}; |
my $parent = $allquestions{$res}; |
Line 3217 sub process_assessment {
|
Line 3218 sub process_assessment {
|
($cdom,$cnum) = split/_/,$cid; |
($cdom,$cnum) = split/_/,$cid; |
} |
} |
my $destresdir = $destdir; |
my $destresdir = $destdir; |
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
if ($context eq 'CSTR') { |
if ($context eq 'CSTR') { |
$destresdir =~ s|/home/httpd/html/priv/|/res/|; |
$destresdir =~ s{^\Q$londocroot/priv/\E}{/res/}; |
} elsif ($context eq 'DOCS') { |
} elsif ($context eq 'DOCS') { |
$destresdir =~ s|^/home/httpd/html/userfiles|/uploaded|; |
$destresdir =~ s{^\Q$londocroot/userfiles\E}{/uploaded}; |
} |
} |
if ($cms eq 'bb5') { |
if ($cms eq 'bb5') { |
&parse_bb5_assessment($res,$docroot,$container,$settings,\%allanswers,\%allchoices,\@allids); |
&parse_bb5_assessment($res,$docroot,$container,$settings,\%allanswers,\%allchoices,\@allids); |
Line 3367 sub build_problem_container {
|
Line 3369 sub build_problem_container {
|
push @{$sequencesfiles},$mapname.'.sequence'; |
push @{$sequencesfiles},$mapname.'.sequence'; |
} else { |
} else { |
$$containerdir = $pagedir.'/'.$mapname.'.page'; |
$$containerdir = $pagedir.'/'.$mapname.'.page'; |
if (!-e "$destdir/pages") { |
if (!-e "$pagedir") { |
mkdir("$destdir/pages",0770); |
mkdir("$pagedir",0770); |
} |
} |
open($fh,">$$containerdir"); |
open($fh,">$$containerdir"); |
$$total{page} ++; |
$$total{page} ++; |
Line 3462 sub write_bb5_questions {
|
Line 3464 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; |
my $pathstart; |
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
if ($context eq 'CSTR') { |
if ($context eq 'CSTR') { |
$pathstart = '../..'; |
$pathstart = '../..'; |
} else { |
} else { |
Line 3481 sub write_bb5_questions {
|
Line 3484 sub write_bb5_questions {
|
$qnum ++; |
$qnum ++; |
my $output; |
my $output; |
my $permcontainer = $containerdir; |
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 $symb = $cid.'.'.$permcontainer.'___'.$qnum.'___lib/templates/simpleproblem.problem.0.'; |
my %resourcedata = (); |
my %resourcedata = (); |
for (my $i=0; $i<10; $i++) { |
for (my $i=0; $i<10; $i++) { |
Line 3838 sub write_bb5_questions {
|
Line 3841 sub write_bb5_questions {
|
|
|
sub write_webct4_questions { |
sub write_webct4_questions { |
my ($cms,$alldbquestids,$context,$settings,$dirname,$allanswers,$allchoices,$total,$cid,$cdom,$cnum,$destdir,$catinfo,$dirtitle) = @_; |
my ($cms,$alldbquestids,$context,$settings,$dirname,$allanswers,$allchoices,$total,$cid,$cdom,$cnum,$destdir,$catinfo,$dirtitle) = @_; |
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my $qnum = 0; |
my $qnum = 0; |
foreach my $id (@{$alldbquestids}) { |
foreach my $id (@{$alldbquestids}) { |
$qnum ++; |
$qnum ++; |
Line 3870 sub write_webct4_questions {
|
Line 3874 sub write_webct4_questions {
|
} |
} |
} |
} |
} |
} |
$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 $symb = $cid.'.'.$permcontainer.'___'.$qnum.'___lib/templates/simpleproblem.problem.0.'; |
my %resourcedata = (); |
my %resourcedata = (); |
for (my $i=0; $i<10; $i++) { |
for (my $i=0; $i<10; $i++) { |
Line 4477 sub test_for_html {
|
Line 4481 sub test_for_html {
|
|
|
sub write_bb6_questions { |
sub write_bb6_questions { |
my ($allids,$containerdir,$context,$settings,$dirname,$destdir,$res,$total,$newdir,$cid,$cdom,$cnum,$docroot) = @_; |
my ($allids,$containerdir,$context,$settings,$dirname,$destdir,$res,$total,$newdir,$cid,$cdom,$cnum,$docroot) = @_; |
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my $qnum = 0; |
my $qnum = 0; |
foreach my $id (@{$allids}) { |
foreach my $id (@{$allids}) { |
my $questiontext = $$settings{$id}{question}{text}; |
my $questiontext = $$settings{$id}{question}{text}; |
Line 4485 sub write_bb6_questions {
|
Line 4490 sub write_bb6_questions {
|
$qnum ++; |
$qnum ++; |
my $output; |
my $output; |
my $permcontainer = $containerdir; |
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 $symb = $cid.'.'.$permcontainer.'___'.$qnum.'___lib/templates/simpleproblem.problem.0.'; |
my %resourcedata = (); |
my %resourcedata = (); |
for (my $i=0; $i<10; $i++) { |
for (my $i=0; $i<10; $i++) { |
Line 4979 sub process_content {
|
Line 4984 sub process_content {
|
my ($cms,$res,$context,$docroot,$destdir,$settings,$dom,$user,$resrcfiles,$packages,$hrefs) = @_; |
my ($cms,$res,$context,$docroot,$destdir,$settings,$dom,$user,$resrcfiles,$packages,$hrefs) = @_; |
my $xmlfile = $docroot.'/'.$res.".dat"; |
my $xmlfile = $docroot.'/'.$res.".dat"; |
my $destresdir = $destdir; |
my $destresdir = $destdir; |
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
if ($context eq 'CSTR') { |
if ($context eq 'CSTR') { |
$destresdir =~ s|/home/httpd/html/priv/|/res/|; |
$destresdir =~ s{^\Q$londocroot/priv/\E}{/res/}; |
} elsif ($context eq 'DOCS') { |
} elsif ($context eq 'DOCS') { |
$destresdir =~ s|^/home/httpd/html/userfiles|/uploaded|; |
$destresdir =~ s{^\Q$londocroot/userfiles\E}{/uploaded}; |
} |
} |
my $filetag = ''; |
my $filetag = ''; |
if ($cms eq 'bb5') { |
if ($cms eq 'bb5') { |