version 1.159, 2003/04/03 14:31:58
|
version 1.177, 2003/05/23 16:26:28
|
Line 38 use Apache::File();
|
Line 38 use Apache::File();
|
use Apache::lonmenu; |
use Apache::lonmenu; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::structuretags',('block','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 104 sub page_start {
|
Line 104 sub page_start {
|
} |
} |
$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); |
$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); |
if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { |
if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { |
my ($symb)=&Apache::lonxml::whichuser(); |
my ($symb,undef,undef,undef,$publicuser)= |
if ($symb eq '') { |
&Apache::lonxml::whichuser(); |
|
if ($symb eq '' && !$publicuser) { |
my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); |
my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); |
$help="Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored $help<br />"; |
$help="Browsing resource, all submissions are temporary.<br />"; |
$body_tag_start.=$help; |
$body_tag_start.=$help; |
} |
} |
} |
} |
Line 135 sub get_resource_name {
|
Line 136 sub get_resource_name {
|
sub setup_rndseed { |
sub setup_rndseed { |
my ($safeeval)=@_; |
my ($safeeval)=@_; |
my $rndseed; |
my $rndseed; |
if ($ENV{'request.state'} eq "construct") { |
my ($symb)=&Apache::lonxml::whichuser(); |
|
if ($ENV{'request.state'} eq "construct" || $symb eq '') { |
$rndseed=$ENV{'form.rndseed'}; |
$rndseed=$ENV{'form.rndseed'}; |
if (!$rndseed) { |
if (!$rndseed) { |
|
$rndseed=$Apache::lonhomework::history{'rndseed'}; |
|
if (!$rndseed) { |
|
$rndseed=time; |
|
$ENV{'form.rndseed'}=$rndseed; |
|
} |
|
} |
|
if ($ENV{'form.resetdata'} eq 'New Problem Variation' || |
|
$ENV{'form.newrandomization'} eq 'New Randomization') { |
$rndseed=time; |
$rndseed=time; |
|
if ($rndseed eq $ENV{'form.rndseed'}) { |
|
srand($rndseed); |
|
$rndseed=int(rand(1000000000)); |
|
} |
$ENV{'form.rndseed'}=$rndseed; |
$ENV{'form.rndseed'}=$rndseed; |
} |
} |
&Apache::lonxml::debug("Setting rndseed to $rndseed"); |
&Apache::lonxml::debug("Setting rndseed to $rndseed"); |
Line 168 sub problem_web_to_edit_header {
|
Line 182 sub problem_web_to_edit_header {
|
my $result.='<input type="hidden" name="problemmode" value="View" /> |
my $result.='<input type="hidden" name="problemmode" value="View" /> |
<input type="submit" name="problemmode" value="Edit" /> |
<input type="submit" name="problemmode" value="Edit" /> |
<input type="submit" name="problemmode" value="EditXML" /> |
<input type="submit" name="problemmode" value="EditXML" /> |
Random Seed:<input type="text" name="rndseed" width="10" value="'. |
<input type="submit" name="newrandomization" value="New Randomization" /> |
$rndseed.'" /> |
|
<input type="submit" name="changerandseed" value="Change" /> |
|
<input type="submit" name="resetdata" value="Reset Submissions" /> |
<input type="submit" name="resetdata" value="Reset Submissions" /> |
|
<nobr><input type="submit" name="changerandseed" value="Change Random Seed To:" /> |
|
<input type="text" name="rndseed" width="10" value="'. |
|
$rndseed.'" |
|
onChange="javascript:document.lonhomework.changerandseed.click()" /></nobr> |
<input type="checkbox" name="showallfoils" '; |
<input type="checkbox" name="showallfoils" '; |
if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; } |
if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; } |
$result.= ' /> Show All Foils |
$result.= ' /> Show All Foils |
<hr />'; |
<hr />'; |
my $numtoanalyze=$ENV{'form.numtoanalyze'}; |
my $numtoanalyze=$ENV{'form.numtoanalyze'}; |
if (!$numtoanalyze) { $numtoanalyze=100; } |
if (!$numtoanalyze) { $numtoanalyze=20; } |
$result.= '<input type="submit" name="problemmode" value="Answer Distribution" /> |
$result.= '<input type="submit" name="problemmode" value="Calculate answers" /> for |
<input type="text" name="numtoanalyze" value="'. |
<input type="text" name="numtoanalyze" value="'. |
$numtoanalyze.'" size="5" /> <hr />'; |
$numtoanalyze.'" size="5" /> versions of this problem.'. |
|
&Apache::loncommon::help_open_topic("Analyze_Problem", |
|
'',undef,undef,300). |
|
'<hr />'; |
return $result; |
return $result; |
} |
} |
|
|
sub initialize_storage { |
sub initialize_storage { |
%Apache::lonhomework::results=(); |
%Apache::lonhomework::results=(); |
|
%Apache::lonhomework::history=(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
if ($ENV{'request.state'} eq 'construct') { |
if ($ENV{'request.state'} eq 'construct' || $symb eq '') { |
%Apache::lonhomework::history= |
%Apache::lonhomework::history= |
&Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name); |
&Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name); |
my ($temp)=keys %Apache::lonhomework::history ; |
my ($temp)=keys %Apache::lonhomework::history ; |
Line 210 sub finalize_storage {
|
Line 230 sub finalize_storage {
|
my ($temp) = keys %Apache::lonhomework::results; |
my ($temp) = keys %Apache::lonhomework::results; |
if ( $temp ne '' ) { |
if ( $temp ne '' ) { |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
if ($ENV{'request.state'} eq 'construct') { |
if ($ENV{'request.state'} eq 'construct' || $symb eq '') { |
|
$Apache::lonhomework::results{'rndseed'}=$ENV{'form.rndseed'}; |
$result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results, |
$result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results, |
$ENV{'request.uri'},'',$domain,$name); |
$ENV{'request.uri'},'',$domain,$name); |
&Apache::lonxml::debug('Construct Store return message:'.$result); |
&Apache::lonxml::debug('Construct Store return message:'.$result); |
Line 251 sub start_problem {
|
Line 272 sub start_problem {
|
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); |
return ''; |
return ''; |
} |
} |
#intialize globals |
#initialize globals |
$Apache::inputtags::part='0'; |
$Apache::inputtags::part='0'; |
|
@Apache::inputtags::partlist=('0'); |
@Apache::inputtags::responselist = (); |
@Apache::inputtags::responselist = (); |
|
@Apache::inputtags::importlist = (); |
@Apache::inputtags::previous=(); |
@Apache::inputtags::previous=(); |
@Apache::inputtags::previous_version=(); |
@Apache::inputtags::previous_version=(); |
$Apache::structuretags::printanswer='No'; |
$Apache::structuretags::printanswer='No'; |
|
@Apache::structuretags::whileconds=(); |
|
@Apache::structuretags::whilebody=(); |
|
@Apache::structuretags::whileline=(); |
|
$Apache::lonhomework::scantronmode=0; |
|
$Apache::lonhomework::problemstatus= |
|
&Apache::lonnet::EXT('resource.0.problemstatus'); |
|
|
|
if (defined($ENV{'scantron.maxquest'})) { |
|
$Apache::lonhomework::scantronmode=1; |
|
} |
|
|
if ($target ne 'analyze') { |
if ($target ne 'analyze') { |
&initialize_storage(); |
&initialize_storage(); |
if ($target eq 'web') { |
if ($target eq 'web') { |
Line 265 sub start_problem {
|
Line 299 sub start_problem {
|
$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); |
$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); |
&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); |
&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); |
} |
} |
if ($Apache::lonhomework::type eq '') { |
if ($Apache::lonhomework::type eq '' ) { |
my $uri=$ENV{'request.uri'}; |
my $uri=$ENV{'request.uri'}; |
if ($uri=~/\.(\w+)$/) { |
if ($uri=~/\.(\w+)$/) { |
$Apache::lonhomework::type=$1; |
$Apache::lonhomework::type=$1; |
Line 304 sub start_problem {
|
Line 338 sub start_problem {
|
|
|
#handle rand seed in construction space |
#handle rand seed in construction space |
my $rndseed=&setup_rndseed($safeeval); |
my $rndseed=&setup_rndseed($safeeval); |
|
my ($symb)=&Apache::lonxml::whichuser(); |
|
if ($ENV{'request.state'} ne "construct" && $symb eq '') { |
|
$form_tag_start.='<input type="hidden" name="rndseed" value="'. |
|
$rndseed.'" />'. |
|
'<input type="submit" name="resetdata" |
|
value="New Problem Variation" />'. |
|
'<input type="hidden" name="username" |
|
value="'.$ENV{'form.username'}.'" />'; |
|
} |
($status,$accessmsg) = &Apache::lonhomework::check_access('0'); |
($status,$accessmsg) = &Apache::lonhomework::check_access('0'); |
push (@Apache::inputtags::status,$status); |
push (@Apache::inputtags::status,$status); |
my $expression='$external::datestatus="'.$status.'";'; |
my $expression='$external::datestatus="'.$status.'";'; |
Line 449 sub end_problem {
|
Line 492 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 461 sub end_problem {
|
Line 505 sub end_problem {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$result.=&Apache::lonxml::xmlend(); |
$result.=&Apache::lonxml::xmlend(); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; |
$result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
$result .= '\end{minipage}\end{document} '; |
$result .= '\end{minipage}\end{document} '; |
} else { |
} else { |
Line 473 sub end_problem {
|
Line 517 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_output_mode'} 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 486 sub end_problem {
|
Line 531 sub end_problem {
|
$result = &problem_edit_footer(); |
$result = &problem_edit_footer(); |
} |
} |
|
|
|
if ($ENV{'request.state'} eq 'construct' && $target eq 'web') { |
|
&Apache::inputtags::check_for_duplicate_ids(); |
|
} |
undef(%Apache::lonhomework::history); |
undef(%Apache::lonhomework::history); |
undef(%Apache::lonhomework::results); |
undef(%Apache::lonhomework::results); |
undef($Apache::inputtags::part); |
undef($Apache::inputtags::part); |
Line 540 sub start_block {
|
Line 588 sub start_block {
|
|
|
my $result; |
my $result; |
|
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
my $code = $token->[2]->{'condition'}; |
my $code = $token->[2]->{'condition'}; |
if ($code) { |
if ($code) { |
Line 572 sub start_block {
|
Line 620 sub start_block {
|
|
|
sub end_block { |
sub end_block { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my @result=('',''); |
my $result; |
if ($target eq "edit" || $target eq 'modified') { @result=('','no'); } |
if ($target eq "edit") { |
return (@result); |
$result.= &Apache::edit::tag_end($target,$token,''); |
|
} |
|
return $result; |
|
} |
|
|
|
sub start_languageblock { |
|
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') { |
|
my $include = $token->[2]->{'include'}; |
|
my $exclude = $token->[2]->{'exclude'}; |
|
my %languages=&Apache::loncommon::display_languages(); |
|
$result='1'; |
|
if ($include) { |
|
$result=''; |
|
foreach (split(/\,/,$include)) { |
|
if ($languages{$_}) { $result='1'; } |
|
} |
|
} |
|
if ($exclude) { |
|
foreach (split(/\,/,$exclude)) { |
|
if ($languages{$_}) { $result='0'; } |
|
} |
|
} |
|
if ( ! $result ) { |
|
my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser); |
|
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
|
} |
|
$result=''; |
|
} elsif ($target eq 'edit') { |
|
$result .=&Apache::edit::tag_start($target,$token); |
|
$result .=&Apache::edit::text_arg('Include Language:','include', |
|
$token,40); |
|
$result .=&Apache::edit::text_arg('Exclude Language:','exclude', |
|
$token,40); |
|
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'include', |
|
'exclude'); |
|
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
|
} |
|
return $result; |
|
} |
|
|
|
sub end_languageblock { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result; |
|
if ($target eq "edit") { |
|
$result.= &Apache::edit::tag_end($target,$token,''); |
|
} |
|
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)=@_; |
|
|
my $code = $token->[2]->{'condition'}; |
my $result; |
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
|
$target eq 'tex' || $target eq 'analyze') { |
|
my $code = $token->[2]->{'condition'}; |
|
|
push( @Apache::structuretags::whileconds, $code); |
push( @Apache::structuretags::whileconds, $code); |
if (!$Apache::lonxml::default_homework_loaded) { |
if (!$Apache::lonxml::default_homework_loaded) { |
&Apache::lonxml::default_homework_load($safeeval); |
&Apache::lonxml::default_homework_load($safeeval); |
} |
} |
my $result = &Apache::run::run($code,$safeeval); |
my $result = &Apache::run::run($code,$safeeval); |
my $bodytext=$$parser[$#$parser]->get_text("/while"); |
my $bodytext=&Apache::lonxml::get_all_text("/while",$parser); |
push( @Apache::structuretags::whilebody, $bodytext); |
push( @Apache::structuretags::whilebody, $bodytext); |
if ( $result ) { |
push( @Apache::structuretags::whileline, $token->[5]); |
&Apache::lonxml::newparser($parser,\$bodytext); |
&Apache::lonxml::debug("s code $code got -$result-"); |
|
if ( $result ) { |
|
&Apache::lonxml::newparser($parser,\$bodytext); |
|
} |
|
} elsif ($target eq 'edit') { |
|
$result .=&Apache::edit::tag_start($target,$token); |
|
$result .=&Apache::edit::text_arg('Test Condition:','condition', |
|
$token,40); |
|
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'condition'); |
|
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} |
} |
return ""; |
return $result; |
} |
} |
|
|
sub end_while { |
sub end_while { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $code = pop @Apache::structuretags::whileconds; |
my $result; |
my $bodytext = pop @Apache::structuretags::whilebody; |
|
my $result = &Apache::run::run($code,$safeeval); |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
if ( $result ) { |
$target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::newparser($parser,\$bodytext); |
my $code = pop(@Apache::structuretags::whileconds); |
|
my $bodytext = pop(@Apache::structuretags::whilebody); |
|
my $line = pop(@Apache::structuretags::whileline); |
|
my $return = &Apache::run::run($code,$safeeval); |
|
my $starttime=time; |
|
my $error=0; |
|
while ($return) { |
|
if (time-$starttime > |
|
$Apache::lonnet::perlvar{'lonScriptTimeout'}) { |
|
$return = 0; $error=1; next; |
|
} |
|
$result.=&Apache::scripttag::xmlparse($bodytext); |
|
$return = &Apache::run::run($code,$safeeval); |
|
} |
|
if ($error) { |
|
&Apache::lonxml::error('<pre>Code ran too long. It ran for more than '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds occured while running <while$gt; on line '.$line.'</pre>'); |
|
} |
|
} elsif ($target eq "edit") { |
|
$result.= &Apache::edit::tag_end($target,$token,''); |
} |
} |
return ""; |
return $result; |
} |
} |
|
|
# <randomlist show="1"> |
# <randomlist show="1"> |
# <tag1>..</tag1> |
# <tag1>..</tag1> |
# <tag2>..</tag2> |
# <tag2>..</tag2> |
# <tag3>..</tag3> |
# <tag3>..</tag3> |
# ... |
# ... |
# </randomlist> |
# </randomlist> |
sub start_randomlist { |
sub start_randomlist { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
Line 695 sub start_part {
|
Line 859 sub start_part {
|
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); |
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); |
if ($id eq '') { $id = $Apache::lonxml::curdepth; } |
if ($id eq '') { $id = $Apache::lonxml::curdepth; } |
$Apache::inputtags::part=$id; |
$Apache::inputtags::part=$id; |
@Apache::inputtags::responselist = (); |
push(@Apache::inputtags::partlist,$id); |
|
@Apache::inputtags::response=(); |
@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') { |