--- loncom/homework/structuretags.pm 2002/08/26 21:01:52 1.108 +++ loncom/homework/structuretags.pm 2002/11/06 22:58:36 1.131 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.108 2002/08/26 21:01:52 albertel Exp $ +# $Id: structuretags.pm,v 1.131 2002/11/06 22:58:36 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -141,7 +141,7 @@ sub problem_edit_header {
-
+

 

'; } @@ -161,8 +161,15 @@ sub problem_web_to_edit_header {  Show All Foils
'; + my $numtoanalyze=$ENV{'form.numtoanalyze'}; + if (!$numtoanalyze) { $numtoanalyze=100; } + #DISABLED for now. + #$result.= ' +#
'; + return $result; } sub initialize_storage { @@ -297,7 +304,9 @@ sub start_problem { $msg.=&checkout_msg; } $result.=$msg.'
'; - } + } elsif ($target eq 'tex') { + $result.="\\begin{document}\\noindent \\vskip 1 mm \\begin{minipage}{\\textwidth}\\vskip 0 mm Problem is not open to be viewed. It $accessmsg \\vskip 0 mm "; + } } elsif ($target eq 'web') { my $name= &get_resource_name($parstack,$safeeval); if ($status eq 'CAN_ANSWER') { @@ -345,18 +354,18 @@ sub start_problem { print $temp_file "$duedate\n"; if (not $ENV{'request.symb'} =~ m/\.page_/) { if(not $duedate=~m/1969/) { - $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm'; + $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}'; } else { - $result .= '\begin{document} \noindent \vskip 1 mm'; + $result .= '\begin{document} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}'; } } else { - $result .= '\parbox{\minipagewidth}{\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; + $result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; } } else { if (not $ENV{'request.symb'} =~ m/\.page_/) { - $result .= '\begin{document} \noindent \vskip 1 mm'; + $result .= '\begin{document} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}'; } else { - $result .= '\parbox{\minipagewidth}{\vskip 1mm \\\\\\\\'; + $result .= '\vskip 1mm \\\\\\\\'; } } } @@ -387,14 +396,12 @@ sub end_problem { $status ne 'UNCHECKEDOUT') { # if part is zero, no s existed, so we need show the current # grading status - my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part); - #FIXME this is ugly we should just generate tex in inputtags - if ($target eq 'tex') { $gradestatus=&html_to_tex($gradestatus); } - $result.= $gradestatus; + my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target); + if ($Apache::lonhomework::type ne 'exam') {$result.= $gradestatus;} } if ( - (($target eq 'web' || $target eq 'tex') && ($ENV{'request.state'} ne 'construct')) || - ($target eq 'answer') + (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) || + ($target eq 'answer') || ($target eq 'tex') ) { if ($status eq 'CAN_ANSWER') { if ($target ne 'tex') { @@ -411,9 +418,9 @@ sub end_problem { } else { $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; if (not $ENV{'request.symb'} =~ m/\.page_/) { - $result .= '\end{document} '; + $result .= '\end{minipage}\end{document} '; } else { - $result .= '} '; + $result .= ''; } } } @@ -432,27 +439,14 @@ sub end_problem { return $result; } -#FIXME I am ugly shoot me -sub html_to_tex { - my ($string)=@_; - $string =~ s///; - $string =~ s/<\/table>//; - $string =~ s/]*)>//g; - $string =~ s/<\/tr>//g; - $string =~ s/]*)>//g; - $string =~ s/<\/td>//g; - $string =~ s//\\textbf{/g; - $string =~ s/<\/b>/}/g; - $string =~ s/
/\\vskip 0 mm /g; - $string =~ s/]*)>//g; - return $string; -} sub start_library { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= - &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + my ($result,$head_tag_start,$body_tag_start,$form_tag_start); + if ($target eq 'edit') { + ($result,$head_tag_start,$body_tag_start,$form_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); $result.=$head_tag_start."".$body_tag_start.$form_tag_start. &problem_edit_header(); my $temp=&Apache::edit::insertlist($target,$token); @@ -460,7 +454,10 @@ sub start_library { } elsif ($target eq 'modified') { $result=$token->[4]; $result.=&Apache::edit::handle_insert(); - } elsif ($target eq 'web' && $ENV{'request.state'} eq "construct" ) { + } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' && + $ENV{'request.state'} eq "construct" ) { + ($result,$head_tag_start,$body_tag_start,$form_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); my $name=&get_resource_name($parstack,$safeeval); my $rndseed=&setup_rndseed($safeeval); $result.="$head_tag_start$name @@ -476,28 +473,45 @@ sub end_library { my $result=''; if ($target eq 'edit') { $result=&problem_edit_footer(); - } elsif ($target eq 'web' && $ENV{'request.state'} eq "construct") { + } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' && + $ENV{'request.state'} eq "construct") { $result.=''.&Apache::lonxml::xmlend(); } return $result; } sub start_block { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { - my $code = @$parstack[$#$parstack]; - $code =~ s/\"//g; - $code .=';return $condition;'; - # print "
$code
"; - my $result = &Apache::run::run($code,$safeeval); - &Apache::lonxml::debug("block :$code: returned :$result:"); - if ( ! $result ) { - my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]); - &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]"); + my $result; + + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + my $code = @$parstack[$#$parstack]; + if ($code) { + $code =~ s/\"//g; + $code .=';return $condition;'; + $result = &Apache::run::run($code,$safeeval); + &Apache::lonxml::debug("block :$code: returned :$result:"); + } else { + $result='1'; + } + if ( ! $result ) { + my $skip=&Apache::lonxml::get_all_text("/block",$$parser[-1]); + &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('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_block { @@ -532,7 +546,7 @@ sub end_while { return ""; } -# +# # .. # .. # .. @@ -541,7 +555,8 @@ sub end_while { sub start_randomlist { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; - if ($target eq 'answer' || $target eq 'grade' || $target eq 'web') { + if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' || + $target eq 'tex' || $target eq 'analyze') { my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); my $b_parser= HTML::TokeParser->new(\$body); my $b_tok; @@ -594,7 +609,7 @@ sub shuffle { if (defined(@$a)) { &Apache::response::setrandomnumber(); for($i=@$a;--$i;) { - my $j=int rand($i+1); + my $j=int(&Math::Random::random_uniform() * ($i+1)); next if $i == $j; @$a[$i,$j] = @$a[$j,$i]; } @@ -631,11 +646,13 @@ sub start_part { if ( $target eq "web" ) { $result="
Part is not open to be viewed. It $accessmsg
"; } elsif ( $target eq 'tex' ) { - $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\"; + $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}"; } } else { if ($target eq 'tex') { - $result='\vskip 0 mm'; + if ($$tagstack[-2] ne 'problem') { + $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; + } } } } @@ -652,9 +669,8 @@ sub end_part { return &Apache::inputtags::grade; } if ($target eq 'web' || $target eq 'tex' ) { - my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part); - #FIXME this is ugly we should just generate tex in inputtags - if ($target eq 'tex') { $gradestatus=&html_to_tex($gradestatus); } + my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,$target); + if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} return $gradestatus; } return ''; @@ -662,7 +678,7 @@ sub end_part { sub start_preduedate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) { &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]); @@ -677,7 +693,7 @@ sub end_preduedate { sub start_postanswerdate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]); } @@ -693,7 +709,7 @@ sub end_postanswerdate { sub start_notsolved { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; &Apache::lonxml::debug("not solved has :$gradestatus:"); if ($gradestatus =~ /^correct/) { @@ -710,7 +726,7 @@ sub end_notsolved { sub start_solved { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; if ($gradestatus !~ /^correct/) { &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]); @@ -743,7 +759,7 @@ sub end_startouttext { ".&Apache::edit::end_table()."\n"; } - if ($target eq "modified") { $result=''; } + if ($target eq "modified") { + $result=''. + &Apache::edit::handle_insertafter('startouttext'); } return $result; } sub end_endouttext {
". &Apache::edit::insertlist($target,$token). &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n". - &Apache::edit::editfield($token->[1],$text,"",50,4); + &Apache::edit::editfield($token->[1],$text,"",80,4); } if ($target eq 'modified') { $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); @@ -758,7 +774,9 @@ sub start_endouttext { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; if ($target eq "edit" ) { $result="