version 1.167, 2003/05/03 20:35:43
|
version 1.187, 2003/06/19 20:04:16
|
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 { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); |
if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' || |
if ($target eq 'web') { |
$target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) { |
return $bodytext; |
my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); |
} |
} |
return ''; |
return ''; |
} |
} |
Line 56 sub end_web {
|
Line 56 sub end_web {
|
|
|
sub start_tex { |
sub start_tex { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); |
if (!($target eq 'tex' || $target eq 'edit' || $target eq 'modified' || |
if ($target eq 'tex') { |
$target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) { |
return $bodytext.' '; |
&Apache::lonxml::debug("tex 1"); |
|
my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); |
} |
} |
return ''; |
return ''; |
} |
} |
Line 146 sub setup_rndseed {
|
Line 147 sub setup_rndseed {
|
$ENV{'form.rndseed'}=$rndseed; |
$ENV{'form.rndseed'}=$rndseed; |
} |
} |
} |
} |
if ($ENV{'form.resetdata'} eq 'New Problem Variation') { |
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; |
|
delete($ENV{'form.resetdata'}); |
|
delete($ENV{'form.newrandomization'}); |
} |
} |
|
if (defined($rndseed) && $rndseed ne int($rndseed)) { |
|
$rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed)); |
|
} |
&Apache::lonxml::debug("Setting rndseed to $rndseed"); |
&Apache::lonxml::debug("Setting rndseed to $rndseed"); |
&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); |
&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); |
} |
} |
Line 177 sub problem_web_to_edit_header {
|
Line 188 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; |
} |
} |
|
|
Line 253 ENDCHECKOUT
|
Line 269 ENDCHECKOUT
|
sub start_problem { |
sub start_problem { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
|
$Apache::lonhomework::parsing_a_problem=1; |
if ( $Apache::inputtags::part ne '' || |
# meta is called from lonpublisher, which doesn't uses the normal |
$Apache::lonhomework::parsing_a_problem) { |
# lonhomework method of parsing the file which means that inputtags |
&Apache::lonxml::error('Only one <problem> allowed in a .problem file'); |
# won't get reset |
#my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); |
if ( $Apache::inputtags::part ne '' && $target != 'meta' ) { |
|
&Apache::lonxml::error('Only one problem allowed in a .problem file'); |
|
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); |
|
return ''; |
return ''; |
} |
} |
|
|
|
$Apache::lonhomework::parsing_a_problem=1; |
#initialize 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'; |
Line 272 sub start_problem {
|
Line 289 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 331 sub start_problem {
|
Line 350 sub start_problem {
|
'<input type="submit" name="resetdata" |
'<input type="submit" name="resetdata" |
value="New Problem Variation" />'. |
value="New Problem Variation" />'. |
'<input type="hidden" name="username" |
'<input type="hidden" name="username" |
value="'.$ENV{'form.username'}.'" />'; |
value="'.$ENV{'form.username'}.'" /> <br />'; |
} |
} |
($status,$accessmsg) = &Apache::lonhomework::check_access('0'); |
($status,$accessmsg) = &Apache::lonhomework::check_access('0'); |
push (@Apache::inputtags::status,$status); |
push (@Apache::inputtags::status,$status); |
Line 374 sub start_problem {
|
Line 393 sub start_problem {
|
$body_tag_start \n $form_tag_start". |
$body_tag_start \n $form_tag_start". |
'<input type="hidden" name="submitted" value="yes" />'; |
'<input type="hidden" name="submitted" value="yes" />'; |
if ($ENV{'request.state'} eq "construct") { |
if ($ENV{'request.state'} eq "construct") { |
$result.= &problem_web_to_edit_header($rndseed); |
$result.= &problem_web_to_edit_header($ENV{'form.rndseed'}); |
} |
} |
# if we are viewing someone else preserve that info |
# if we are viewing someone else preserve that info |
if (defined $ENV{'form.grade_symb'}) { |
if (defined $ENV{'form.grade_symb'}) { |
Line 389 sub start_problem {
|
Line 408 sub start_problem {
|
"<title>$name</title></head>\n$body_tag_start\n"; |
"<title>$name</title></head>\n$body_tag_start\n"; |
} |
} |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
|
my $startminipage = ''; |
|
if ($ENV{'form.problem_split'} ne 'yes') { |
|
$startminipage = '\begin{minipage}{\textwidth}'; |
|
} |
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); |
if ($name eq '') { |
if ($name eq '') { |
$name=&Apache::lonnet::EXT('resource.title'); |
$name=&Apache::lonnet::EXT('resource.title'); |
Line 423 sub start_problem {
|
Line 446 sub start_problem {
|
print $temp_file "$duedate\n"; |
print $temp_file "$duedate\n"; |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') { |
if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') { |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}'; |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage; |
} else { |
} else { |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}'; |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage; |
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
} |
} |
} else { |
} else { |
Line 433 sub start_problem {
|
Line 456 sub start_problem {
|
} |
} |
} else { |
} else { |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}'; |
$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage; |
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
} else { |
} else { |
$result .= '\vskip 1mm \\\\\\\\'; |
$result .= '\vskip 1mm \\\\\\\\'; |
Line 478 sub end_problem {
|
Line 501 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 490 sub end_problem {
|
Line 514 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}'; |
my $endminipage = ''; |
|
if ($ENV{'form.problem_split'} ne 'yes') { |
|
$endminipage = '\end{minipage}'; |
|
} |
|
$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 .= $endminipage.'\end{document} '; |
} else { |
} else { |
$result .= ''; |
$result .= ''; |
} |
} |
Line 502 sub end_problem {
|
Line 530 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') { |
if ($Apache::inputtags::part eq '0') { |
if ($Apache::inputtags::part eq '0') { |
|
@Apache::inputtags::response=(); |
$result=&Apache::response::mandatory_part_meta; |
$result=&Apache::response::mandatory_part_meta; |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
Line 515 sub end_problem {
|
Line 545 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 615 sub start_languageblock {
|
Line 648 sub start_languageblock {
|
|
|
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 $include = $token->[2]->{'include'}; |
&Apache::lonxml::startredirection(); |
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') { |
} elsif ($target eq 'edit') { |
$result .=&Apache::edit::tag_start($target,$token); |
$result .=&Apache::edit::tag_start($target,$token); |
$result .=&Apache::edit::text_arg('Include Language:','include', |
$result .=&Apache::edit::text_arg('Include Language:','include', |
Line 644 sub start_languageblock {
|
Line 658 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 655 sub start_languageblock {
|
Line 668 sub start_languageblock {
|
sub end_languageblock { |
sub end_languageblock { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result; |
my $result; |
|
|
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
|
$target eq 'tex' || $target eq 'analyze') { |
|
my $text=&Apache::lonxml::endredirection(); |
|
my $include= &Apache::lonxml::get_param('include',$parstack,$safeeval); |
|
my $exclude= &Apache::lonxml::get_param('exclude',$parstack,$safeeval); |
|
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 ) { |
|
$result=''; |
|
} else { |
|
$result=$text; |
|
} |
|
} elsif ($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") { |
if ($target eq "edit") { |
$result.= &Apache::edit::tag_end($target,$token,''); |
$result.= &Apache::edit::tag_end($target,$token,''); |
} |
} |
Line 812 sub start_part {
|
Line 878 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') { |
Line 875 sub end_part {
|
Line 944 sub end_part {
|
$target); |
$target); |
if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} |
if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} |
$result=$gradestatus; |
$result=$gradestatus; |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::end_table(); |
} |
} |
pop @Apache::inputtags::status; |
pop @Apache::inputtags::status; |
$Apache::inputtags::part=''; |
$Apache::inputtags::part=''; |