--- loncom/homework/structuretags.pm 2003/04/03 14:53:44 1.160 +++ loncom/homework/structuretags.pm 2003/07/17 18:42:13 1.198 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.160 2003/04/03 14:53:44 albertel Exp $ +# $Id: structuretags.pm,v 1.198 2003/07/17 18:42:13 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,14 +38,15 @@ use Apache::File(); use Apache::lonmenu; 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', +'simpleeditbutton','definetag')); } sub start_web { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); - if ($target eq 'web') { - return $bodytext; + if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' || + $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) { + my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); } return ''; } @@ -56,11 +57,15 @@ sub end_web { sub start_tex { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); - if ($target eq 'tex') { - return $bodytext.' '; + my $result=''; + if (!($target eq 'edit' || $target eq 'modified' || + $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) { + &Apache::lonxml::debug("tex 1"); + my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); + } elsif ($target eq 'tex') { + $result=&Apache::lonxml::get_all_text("/tex",$parser); } - return ''; + return $result;; } sub end_tex { @@ -104,10 +109,11 @@ sub page_start { } $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { - my ($symb)=&Apache::lonxml::whichuser(); - if ($symb eq '') { + my ($symb,undef,undef,undef,$publicuser)= + &Apache::lonxml::whichuser(); + if ($symb eq '' && !$publicuser) { my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); - $help="Browsing or ambiguous reference, submissions ignored $help
"; + $help="Browsing resource, all submissions are temporary.
"; $body_tag_start.=$help; } } @@ -135,12 +141,27 @@ sub get_resource_name { sub setup_rndseed { my ($safeeval)=@_; 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'}; if (!$rndseed) { - $rndseed=time; + $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') { + srand(time); + $rndseed=int(rand(2100000000)); $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::run::run('$external::randomseed='.$rndseed.';',$safeeval); } @@ -168,26 +189,32 @@ sub problem_web_to_edit_header { my $result.=' - Random Seed: - + + + for
'; + $numtoanalyze.'" size="5" /> versions of this problem.'. + &Apache::loncommon::help_open_topic("Analyze_Problem", + '',undef,undef,300). + '
'; return $result; } sub initialize_storage { %Apache::lonhomework::results=(); + %Apache::lonhomework::history=(); 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::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name); my ($temp)=keys %Apache::lonhomework::history ; @@ -210,7 +237,8 @@ sub finalize_storage { my ($temp) = keys %Apache::lonhomework::results; if ( $temp ne '' ) { 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, $ENV{'request.uri'},'',$domain,$name); &Apache::lonxml::debug('Construct Store return message:'.$result); @@ -242,21 +270,33 @@ ENDCHECKOUT sub start_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - $Apache::lonhomework::parsing_a_problem=1; - # meta is called from lonpublisher, which doesn't uses the normal - # lonhomework method of parsing the file which means that inputtags - # won't get reset - 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); + if ( $Apache::inputtags::part ne '' || + $Apache::lonhomework::parsing_a_problem) { + &Apache::lonxml::error('Only one <problem> allowed in a .problem file'); + #my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); return ''; } -#intialize globals + + $Apache::lonhomework::parsing_a_problem=1; +#initialize globals $Apache::inputtags::part='0'; + @Apache::inputtags::partlist=('0'); @Apache::inputtags::responselist = (); + @Apache::inputtags::importlist = (); @Apache::inputtags::previous=(); @Apache::inputtags::previous_version=(); $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') { &initialize_storage(); if ($target eq 'web') { @@ -265,7 +305,7 @@ sub start_problem { $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.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'}; if ($uri=~/\.(\w+)$/) { $Apache::lonhomework::type=$1; @@ -304,6 +344,15 @@ sub start_problem { #handle rand seed in construction space my $rndseed=&setup_rndseed($safeeval); + my ($symb)=&Apache::lonxml::whichuser(); + if ($ENV{'request.state'} ne "construct" && $symb eq '') { + $form_tag_start.=''. + ''. + '
'; + } ($status,$accessmsg) = &Apache::lonhomework::check_access('0'); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; @@ -345,7 +394,7 @@ sub start_problem { $body_tag_start \n $form_tag_start". ''; 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 (defined $ENV{'form.grade_symb'}) { @@ -360,6 +409,10 @@ sub start_problem { "$name\n$body_tag_start\n"; } } elsif ($target eq 'tex') { + my $startminipage = ''; + if (not $ENV{'form.problem_split'}=~/yes/) { + $startminipage = '\begin{minipage}{\textwidth}'; + } my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); if ($name eq '') { $name=&Apache::lonnet::EXT('resource.title'); @@ -394,9 +447,9 @@ sub start_problem { print $temp_file "$duedate\n"; if (not $ENV{'request.symb'} =~ m/\.page_/) { if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') { - $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource

"'.$name_of_resourse.'"

located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}'; + $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource

"'.$name_of_resourse.'"

located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage; } else { - $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource

"'.$name_of_resourse.'"

located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}'; + $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource

"'.$name_of_resourse.'"

located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage; if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';} } } else { @@ -404,7 +457,7 @@ sub start_problem { } } else { if (not $ENV{'request.symb'} =~ m/\.page_/) { - $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource

"'.$name_of_resourse.'"

located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}'; + $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource

"'.$name_of_resourse.'"

located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage; if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} } else { $result .= '\vskip 1mm \\\\\\\\'; @@ -449,21 +502,27 @@ sub end_problem { ($target eq 'answer') || ($target eq 'tex') ) { if ($status eq 'CAN_ANSWER') { - if ($target ne 'tex') { + if ($target ne 'tex' && + $ENV{'form.answer_output_mode'} ne 'tex') { $result.="\n"; } } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'UNCHECKEDOUT' ) { - if ($target ne 'tex') { + if ($target ne 'tex' && + $ENV{'form.answer_output_mode'} ne 'tex') { $result.="\n"; } } if ($target eq 'web') { $result.=&Apache::lonxml::xmlend(); } elsif ($target eq 'tex') { - $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; + my $endminipage = ''; + if (not $ENV{'form.problem_split'}=~/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_/) { - $result .= '\end{minipage}\end{document} '; + $result .= $endminipage.'\end{document} '; } else { $result .= ''; } @@ -473,12 +532,14 @@ sub end_problem { &Apache::lonhomework::showhash(%Apache::lonhomework::results); &finalize_storage(); } - if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') ) { - $result.=''; #normally we get it from xmlend, but in CSTR + if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') + && $ENV{'form.answer_output_mode'} ne 'tex') { + $result.=''; # normally we get it from xmlend, but in CSTR # we always show answer mode too. } } elsif ($target eq 'meta') { if ($Apache::inputtags::part eq '0') { + @Apache::inputtags::response=(); $result=&Apache::response::mandatory_part_meta; } } elsif ($target eq 'edit') { @@ -486,6 +547,9 @@ sub end_problem { $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::results); undef($Apache::inputtags::part); @@ -535,6 +599,30 @@ sub end_library { return $result; } +sub start_definetag { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + + my $result; + + my $name = $token->[2]->{'name'}; + my $skip=&Apache::lonxml::get_all_text("/definetag",$parser); + if ($name=~/^\//) { + $result= + '
'; + } else { + $result= + '
END '.$name.'
'; + } + $skip=~s/\/\>\;/gs; + $result.='
BEGIN '.$name.'
'.$skip.'
'; + return $result; +} + +sub end_definetag { + return ''; +} + sub start_block { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -579,12 +667,97 @@ sub end_block { 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') { + &Apache::lonxml::startredirection(); + } 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 '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") { + $result.= &Apache::edit::tag_end($target,$token,''); + } + return $result; +} + sub start_while { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - &Apache::lonxml::debug('starting while'); 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') { my $code = $token->[2]->{'condition'}; @@ -593,8 +766,10 @@ sub start_while { &Apache::lonxml::default_homework_load($safeeval); } my $result = &Apache::run::run($code,$safeeval); - my $bodytext=$$parser[-1]->get_text("/while"); + my $bodytext=&Apache::lonxml::get_all_text("/while",$parser); push( @Apache::structuretags::whilebody, $bodytext); + push( @Apache::structuretags::whileline, $token->[5]); + &Apache::lonxml::debug("s code $code got -$result-"); if ( $result ) { &Apache::lonxml::newparser($parser,\$bodytext); } @@ -613,17 +788,26 @@ sub start_while { sub end_while { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - &Apache::lonxml::debug('ending while'); - my $result; if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { my $code = pop(@Apache::structuretags::whileconds); my $bodytext = pop(@Apache::structuretags::whilebody); - my $result = &Apache::run::run($code,$safeeval); - if ( $result ) { - &Apache::lonxml::newparser($parser,\$bodytext); + 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('
Code ran too long. It ran for more than '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds occured while running <while$gt; on line '.$line.'
'); } } elsif ($target eq "edit") { $result.= &Apache::edit::tag_end($target,$token,''); @@ -720,9 +904,12 @@ sub start_part { my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); if ($id eq '') { $id = $Apache::lonxml::curdepth; } $Apache::inputtags::part=$id; - @Apache::inputtags::responselist = (); + push(@Apache::inputtags::partlist,$id); + @Apache::inputtags::response=(); @Apache::inputtags::previous=(); @Apache::inputtags::previous_version=(); + $Apache::lonhomework::problemstatus= + &Apache::lonnet::EXT("resource.$id.problemstatus"); my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); if ($target eq 'meta') { @@ -742,11 +929,17 @@ sub start_part { if ( $target eq "web" ) { $result="
Part is not open to be viewed. It $accessmsg
"; } elsif ( $target eq 'tex' ) { - $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}"; + if (not $ENV{'form.problem_split'}=~/yes/) { + $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}"; + } else { + $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\"; + } } } else { if ($target eq 'tex') { - $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; + if (not $ENV{'form.problem_split'}=~/yes/) { + $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; + } my $weight = &Apache::lonnet::EXT("resource.$id.weight"); if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';} } @@ -783,6 +976,8 @@ sub end_part { $target); if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} $result=$gradestatus; + } elsif ($target eq 'edit') { + $result=&Apache::edit::end_table(); } pop @Apache::inputtags::status; $Apache::inputtags::part=''; @@ -877,15 +1072,7 @@ sub end_startouttext { &Apache::edit::insertlist($target,$token). &Apache::edit::end_row(). &Apache::edit::start_spanning_row()."\n" - .'
'. - &Apache::loncommon::help_open_topic("Greek_Symbols", - 'Greek Symbols', - undef,undef,600) - .''. - &Apache::loncommon::help_open_topic("Other_Symbols", - 'Other Symbols', - undef,undef,600) - .'
'. + . &Apache::loncommon::helpLatexCheatsheet () . &Apache::edit::editfield($token->[1],$text,"",80,4); } if ($target eq 'modified') { @@ -929,5 +1116,23 @@ sub delete_startouttext { return 1; } +sub start_simpleeditbutton { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=''; + if (($target eq 'web') && + (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) { + my $url=$ENV{'REQUEST_URI'}; + $url=~s/\?.*$//; + $result='
'. + 'Simple Problem Editor - Note: it can take up to 10 minutes for changes to take effect for all users.'. +&Apache::loncommon::help_open_topic('Caching').'

'; + } + return $result; +} + +sub end_simpleeditbutton { + return ''; +} + 1; __END__