--- loncom/homework/structuretags.pm 2002/06/25 15:01:49 1.99 +++ loncom/homework/structuretags.pm 2002/09/16 20:40:38 1.114 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.99 2002/06/25 15:01:49 sakharuk Exp $ +# $Id: structuretags.pm,v 1.114 2002/09/16 20:40:38 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,7 @@ package Apache::structuretags; use strict; use Apache::lonnet; +use Apache::File(); BEGIN { &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); @@ -56,7 +57,7 @@ sub start_tex { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]); if ($target eq 'tex') { - return $bodytext + return $bodytext.' '; } return ''; } @@ -100,7 +101,68 @@ sub page_start { } $body_tag_start.='>'; } - return ($result,$head_tag_start,$body_tag_start); + my $form_tag_start; + if (!defined($found{'form'})) { + $form_tag_start='
'; + } + return ($result,$head_tag_start,$body_tag_start,$form_tag_start); +} + +sub get_resource_name { + my ($parstack,$safeeval)=@_; + my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval); + if ($name eq '') { + $name=&Apache::lonnet::EXT('resource.title'); + if ($name eq 'con_lost') { $name = ''; } + } + $Apache::lonhomework::name=$name; + return $name; +} + +sub setup_rndseed { + my ($safeeval)=@_; + my $rndseed; + if ($ENV{'request.state'} eq "construct") { + $rndseed=$ENV{'form.rndseed'}; + if (!$rndseed) { + $rndseed=time; + $ENV{'form.rndseed'}=$rndseed; + } + &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); + } + return $rndseed; +} + +sub problem_edit_header { + return ' + + + +
+ +
+ '; +} + +sub problem_edit_footer { + return '
+ '; +} + +sub problem_web_to_edit_header { + my ($rndseed)=@_; + my $result.=' + + + Random Seed: + + + or the neccesary stuff to start XML/MathML - my ($result,$head_tag_start,$body_tag_start)= + my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';} @@ -215,15 +277,7 @@ sub start_problem { } #handle rand seed in construction space - my $rndseed; - if ($ENV{'request.state'} eq "construct") { - $rndseed=$ENV{'form.rndseed'}; - if (!$rndseed) { - $rndseed=time; - $ENV{'form.rndseed'}=$rndseed; - } - &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); - } + my $rndseed=&setup_rndseed($safeeval); ($status,$accessmsg) = &Apache::lonhomework::check_access('0'); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; @@ -245,31 +299,14 @@ sub start_problem { $result.=$msg.'
'; } } elsif ($target eq 'web') { - my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); - if ($name eq '') { - $name=&Apache::lonnet::EXT('resource.title'); - if ($name eq 'con_lost') { $name = ''; } - } - $Apache::lonhomework::name=$name; + my $name= &get_resource_name($parstack,$safeeval); if ($status eq 'CAN_ANSWER') { # create a page header and exit - $result.="$head_tag_start$name\n - $body_tag_start\n - ". + $result.="$head_tag_start$name + $body_tag_start \n $form_tag_start". ''; if ($ENV{'request.state'} eq "construct") { - $result.= - ' - - - Random Seed: - - - $name\n$body_tag_start\n"; } } elsif ($target eq 'tex') { + my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); + if ($name eq '') { + $name=&Apache::lonnet::EXT('resource.title'); + if ($name eq 'con_lost') { $name = ''; } + } + $Apache::lonhomework::name=$name; my $id = $Apache::inputtags::part; my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); $duedate = POSIX::strftime("%c",localtime($duedate)); - if (not $ENV{'request.symb'} =~ m/\.page_/) { - $result .= '\begin{document} \noindent\fbox{Due date: '.$duedate.'} \\vskip 1 mm'; + my $temp_file; + my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due"; + if (-e $filename) { + $temp_file = Apache::File->new($filename); + } else { + $temp_file = Apache::File->new('>>'.$filename); + } + my @due_file_content = <$temp_file>; + my $due_file_content = $due_file_content[$#due_file_content]; + chomp $due_file_content; + if ($due_file_content ne $duedate) { + $temp_file = Apache::File->new('>'.$filename); + 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'; + } else { + $result .= '\begin{document} \noindent \vskip 1 mm'; + } + } else { + $result .= '\parbox{\minipagewidth}{\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; + } } else { - $result .= '\begin{minipage}{\minipagewidth}\vskip 1mm\fbox{Due date: '.$duedate.'} \\vskip 1 mm'; + if (not $ENV{'request.symb'} =~ m/\.page_/) { + $result .= '\begin{document} \noindent \vskip 1 mm'; + } else { + $result .= '\parbox{\minipagewidth}{\vskip 1mm \\\\\\\\'; + } } } } elsif ($target eq 'edit') { - $result.=$head_tag_start."".$body_tag_start. - ' - - - - -
- -
- '; + $result.=$head_tag_start."".$body_tag_start.$form_tag_start. + &problem_edit_header(); my $temp=&Apache::edit::insertlist($target,$token); $result.=$temp; } elsif ($target eq 'modified') { @@ -321,27 +379,43 @@ sub end_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; my $status=$Apache::inputtags::status['-1']; - if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) { + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { if ( $target eq 'grade' && $Apache::inputtags::part eq '0') { # if part is zero, no s existed, so we need to the grading &Apache::inputtags::grade; - } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0' && + } elsif ( ($target eq 'web' || $target eq 'tex') && $Apache::inputtags::part eq '0' && $status ne 'UNCHECKEDOUT') { # if part is zero, no s existed, so we need show the current # grading status - $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part); + 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; } if ( - ($target eq 'web' && ($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') { - $result.="\n"; + if ($target ne 'tex') { + $result.="\n"; + } } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'UNCHECKEDOUT' ) { - $result.="\n"; + if ($target ne 'tex') { + $result.="\n"; + } + } + if ($target ne 'tex') { + $result.=&Apache::lonxml::xmlend(); + } else { + $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; + if (not $ENV{'request.symb'} =~ m/\.page_/) { + $result .= '\end{document} '; + } else { + $result .= '} '; + } } - $result.=&Apache::lonxml::xmlend(); } if ($target eq 'grade') { &Apache::lonhomework::showhash(%Apache::lonhomework::results); @@ -353,48 +427,63 @@ sub end_problem { } } elsif ($target eq 'edit') { &Apache::lonxml::debug("in end_problem with $target, edit"); - $result ='
'; - $result.=''; - } elsif ($target eq 'tex') { - $result .= '\vskip 0.5mm\noindent\makebox[9.0cm][b]{\hrulefill}'; - if (not $ENV{'request.symb'} =~ m/\.page_/) { - $result .= '\end{document} '; - } else { - $result .= '\end{minipage} '; - } - } + $result = &problem_edit_footer(); + } 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)= - &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. - '
- - - -
- '; + ($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); $result.=$temp; - return $result; - } - if ($target eq 'modified') { + } elsif ($target eq 'modified') { $result=$token->[4]; $result.=&Apache::edit::handle_insert(); - return $result; + } 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 + $body_tag_start \n $form_tag_start". + ''; + $result.=&problem_web_to_edit_header($rndseed); } - return ''; + return $result; } sub end_library { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; if ($target eq 'edit') { - $result='
'; + $result=&problem_edit_footer(); + } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' && + $ENV{'request.state'} eq "construct") { + $result.=''.&Apache::lonxml::xmlend(); } return $result; } @@ -402,7 +491,7 @@ sub end_library { sub start_block { 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 $code = @$parstack[$#$parstack]; $code =~ s/\"//g; $code .=';return $condition;'; @@ -449,7 +538,7 @@ sub end_while { return ""; } -# +# # .. # .. # .. @@ -458,7 +547,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') { my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); my $b_parser= HTML::TokeParser->new(\$body); my $b_tok; @@ -568,15 +658,18 @@ sub end_part { if ( $target eq 'grade' && $status eq 'CAN_ANSWER') { return &Apache::inputtags::grade; } - if ($target eq 'web') { - return &Apache::inputtags::gradestatus($Apache::inputtags::part); + 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); } + return $gradestatus; } return ''; } 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]); @@ -591,10 +684,12 @@ 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]); } + } elsif ($target eq 'tex') { + return '\vskip 0 mm \noindent'; } return ''; } @@ -605,7 +700,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/) { @@ -622,7 +717,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]);