version 1.167, 2003/05/03 20:35:43
|
version 1.172, 2003/05/14 13:33:00
|
Line 38 use Apache::File();
|
Line 38 use Apache::File();
|
use Apache::lonmenu; |
use Apache::lonmenu; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); |
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); |
} |
} |
|
|
sub start_web { |
sub start_web { |
Line 272 sub start_problem {
|
Line 272 sub start_problem {
|
@Apache::structuretags::whilebody=(); |
@Apache::structuretags::whilebody=(); |
@Apache::structuretags::whileline=(); |
@Apache::structuretags::whileline=(); |
$Apache::lonhomework::scantronmode=0; |
$Apache::lonhomework::scantronmode=0; |
|
$Apache::lonhomework::problemstatus= |
|
&Apache::lonnet::EXT('resource.0.problemstatus'); |
|
|
if (defined($ENV{'scantron.maxquest'})) { |
if (defined($ENV{'scantron.maxquest'})) { |
$Apache::lonhomework::scantronmode=1; |
$Apache::lonhomework::scantronmode=1; |
Line 478 sub end_problem {
|
Line 480 sub end_problem {
|
($target eq 'answer') || ($target eq 'tex') |
($target eq 'answer') || ($target eq 'tex') |
) { |
) { |
if ($status eq 'CAN_ANSWER') { |
if ($status eq 'CAN_ANSWER') { |
if ($target ne 'tex') { |
if ($target ne 'tex' && |
|
$ENV{'form.answer_output_mode'} ne 'tex') { |
$result.="</form></body>\n"; |
$result.="</form></body>\n"; |
} |
} |
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || |
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || |
Line 502 sub end_problem {
|
Line 505 sub end_problem {
|
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&finalize_storage(); |
&finalize_storage(); |
} |
} |
if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') ) { |
if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') |
$result.='</html>'; #normally we get it from xmlend, but in CSTR |
&& $ENV{'form.answer_mode_output'} ne 'tex') { |
|
$result.='</html>'; # normally we get it from xmlend, but in CSTR |
# we always show answer mode too. |
# we always show answer mode too. |
} |
} |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
Line 644 sub start_languageblock {
|
Line 648 sub start_languageblock {
|
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
$safeeval,'include') |
$safeeval,'include', |
.&Apache::edit::get_new_args($token,$parstack, |
'exclude'); |
$safeeval,'exclude'); |
|
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} |
} |
return $result; |
return $result; |
Line 661 sub end_languageblock {
|
Line 664 sub end_languageblock {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub start_instructorcomment { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
|
|
my $result; |
|
|
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
|
$target eq 'tex' || $target eq 'analyze') { |
|
$result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/); |
|
if ( ! $result ) { |
|
my $skip=&Apache::lonxml::get_all_text("/instructorcomment",$parser); |
|
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
|
} |
|
$result=''; |
|
} elsif ($target eq 'edit') { |
|
$result .=&Apache::edit::tag_start($target,$token); |
|
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
|
} |
|
return $result; |
|
} |
|
|
|
sub end_instructorcomment { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result; |
|
if ($target eq "edit") { |
|
$result.= &Apache::edit::tag_end($target,$token,''); |
|
} |
|
return $result; |
|
} |
|
|
sub start_while { |
sub start_while { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
|
Line 815 sub start_part {
|
Line 847 sub start_part {
|
@Apache::inputtags::responselist = (); |
@Apache::inputtags::responselist = (); |
@Apache::inputtags::previous=(); |
@Apache::inputtags::previous=(); |
@Apache::inputtags::previous_version=(); |
@Apache::inputtags::previous_version=(); |
|
$Apache::lonhomework::problemstatus= |
|
&Apache::lonnet::EXT("resource.$id.problemstatus"); |
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); |
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); |
|
|
if ($target eq 'meta') { |
if ($target eq 'meta') { |