--- loncom/homework/structuretags.pm 2003/05/23 16:26:28 1.177 +++ 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.177 2003/05/23 16:26:28 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','languageblock','instructorcomment','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 { @@ -148,13 +153,15 @@ sub setup_rndseed { } if ($ENV{'form.resetdata'} eq 'New Problem Variation' || $ENV{'form.newrandomization'} eq 'New Randomization') { - $rndseed=time; - if ($rndseed eq $ENV{'form.rndseed'}) { - srand($rndseed); - $rndseed=int(rand(1000000000)); - } + 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); } @@ -263,15 +270,14 @@ 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 ''; } + + $Apache::lonhomework::parsing_a_problem=1; #initialize globals $Apache::inputtags::part='0'; @Apache::inputtags::partlist=('0'); @@ -345,7 +351,7 @@ sub start_problem { ''. ''; + value="'.$ENV{'form.username'}.'" />
'; } ($status,$accessmsg) = &Apache::lonhomework::check_access('0'); push (@Apache::inputtags::status,$status); @@ -388,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'}) { @@ -403,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'); @@ -437,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 { @@ -447,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 \\\\\\\\'; @@ -498,16 +508,21 @@ sub end_problem { } } 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') { + 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 .= ''; } @@ -524,6 +539,7 @@ sub end_problem { } } elsif ($target eq 'meta') { if ($Apache::inputtags::part eq '0') { + @Apache::inputtags::response=(); $result=&Apache::response::mandatory_part_meta; } } elsif ($target eq 'edit') { @@ -583,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)=@_; @@ -634,26 +674,7 @@ sub start_languageblock { 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=''; + &Apache::lonxml::startredirection(); } elsif ($target eq 'edit') { $result .=&Apache::edit::tag_start($target,$token); $result .=&Apache::edit::text_arg('Include Language:','include', @@ -673,7 +694,31 @@ sub start_languageblock { sub end_languageblock { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; - if ($target eq "edit") { + + 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; @@ -884,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}}';} } @@ -925,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=''; @@ -1019,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') { @@ -1071,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__