[BACK]Return to structuretags.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/structuretags.pm between versions 1.106 and 1.114

version 1.106, 2002/08/26 20:29:30 version 1.114, 2002/09/16 20:40:38
Line 387  sub end_problem { Line 387  sub end_problem {
       $status ne 'UNCHECKEDOUT') {        $status ne 'UNCHECKEDOUT') {
       # if part is zero, no <part>s existed, so we need show the current         # if part is zero, no <part>s existed, so we need show the current 
       # grading status        # grading status
       my $gradesatement = &Apache::inputtags::gradestatus($Apache::inputtags::part);        my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part);
       if ($target eq 'tex') {        #FIXME this is ugly we should just generate tex in inputtags
   $gradesatement =~ s/<table>//;        if ($target eq 'tex') { $gradestatus=&html_to_tex($gradestatus); }
   $gradesatement =~ s/<\/table>//;        $result.= $gradestatus;
   $gradesatement =~ s/<tr([^>]*)>//g;  
   $gradesatement =~ s/<\/tr>//g;  
   $gradesatement =~ s/<td([^>]*)>//g;  
   $gradesatement =~ s/<\/td>//g;  
   $gradesatement =~ s/<b>/\\textbf{/g;  
   $gradesatement =~ s/<\/b>/}/g;  
   $gradesatement =~ s/<br \/>/\\vskip 0 mm /g;  
   $gradesatement =~ s/<input([^>]*)>//g;  
       }  
       $result.= $gradesatement;  
       if ($target eq 'tex') {  
   $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';  
   if (not $ENV{'request.symb'} =~ m/\.page_/) {  
       $result .= '\end{document} ';  
   } else {  
       $result .= '} ';  
   }  
       }  
     }      }
     if (      if (
  (($target eq 'web' || $target eq 'tex') && ($ENV{'request.state'} ne 'construct')) ||   (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
  ($target eq 'answer')   ($target eq 'answer') || ($target eq 'tex')
        ) {         ) {
       if ($status eq 'CAN_ANSWER') {        if ($status eq 'CAN_ANSWER') {
   if ($target ne 'tex') {    if ($target ne 'tex') {
Line 450  sub end_problem { Line 432  sub end_problem {
   return $result;    return $result;
 }  }
   
   #FIXME I am ugly shoot me
   sub html_to_tex {
     my ($string)=@_;
     $string =~ s/<table>//;
     $string =~ s/<\/table>//;
     $string =~ s/<tr([^>]*)>//g;
     $string =~ s/<\/tr>//g;
     $string =~ s/<td([^>]*)>//g;
     $string =~ s/<\/td>//g;
     $string =~ s/<b>/\\textbf{/g;
     $string =~ s/<\/b>/}/g;
     $string =~ s/<br \/>/\\vskip 0 mm /g;
     $string =~ s/<input([^>]*)>//g;
     return $string;
   }
   
 sub start_library {  sub start_library {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=    my ($result,$head_tag_start,$body_tag_start,$form_tag_start);
     &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);  
   if ($target eq 'edit') {    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."</head>".$body_tag_start.$form_tag_start.      $result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
       &problem_edit_header();        &problem_edit_header();
     my $temp=&Apache::edit::insertlist($target,$token);      my $temp=&Apache::edit::insertlist($target,$token);
Line 462  sub start_library { Line 462  sub start_library {
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     $result=$token->[4];      $result=$token->[4];
     $result.=&Apache::edit::handle_insert();      $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 $name=&get_resource_name($parstack,$safeeval);
     my $rndseed=&setup_rndseed($safeeval);      my $rndseed=&setup_rndseed($safeeval);
     $result.="$head_tag_start<title>$name</title></head>      $result.="$head_tag_start<title>$name</title></head>
Line 478  sub end_library { Line 481  sub end_library {
   my $result='';    my $result='';
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $result=&problem_edit_footer();      $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.='</form></body>'.&Apache::lonxml::xmlend();      $result.='</form></body>'.&Apache::lonxml::xmlend();
   }    }
   return $result;    return $result;
Line 487  sub end_library { Line 491  sub end_library {
 sub start_block {  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') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
     my $code = @$parstack[$#$parstack];      my $code = @$parstack[$#$parstack];
     $code =~ s/\"//g;      $code =~ s/\"//g;
     $code .=';return $condition;';      $code .=';return $condition;';
Line 534  sub end_while { Line 538  sub end_while {
   return "";    return "";
 }  }
   
 # <randomlist>   # <randomlist show="1"> 
 #  <tag1>..</tag1>  #  <tag1>..</tag1>
 #  <tag2>..</tag2>  #  <tag2>..</tag2>
 #  <tag3>..</tag3>  #  <tag3>..</tag3>
Line 543  sub end_while { Line 547  sub end_while {
 sub start_randomlist {  sub start_randomlist {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result;    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 $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
     my $b_parser= HTML::TokeParser->new(\$body);      my $b_parser= HTML::TokeParser->new(\$body);
     my $b_tok;      my $b_tok;
Line 653  sub end_part { Line 658  sub end_part {
   if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {    if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
     return &Apache::inputtags::grade;      return &Apache::inputtags::grade;
   }    }
   if ($target eq 'web') {    if ($target eq 'web' || $target eq 'tex' ) {
     return &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); }
       return $gradestatus;
   }    }
   return '';    return '';
 }  }
   
 sub start_preduedate {  sub start_preduedate {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    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' &&      if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
  $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {   $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
       &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);        &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
Line 676  sub end_preduedate { Line 684  sub end_preduedate {
   
 sub start_postanswerdate {  sub start_postanswerdate {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    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') {      if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
       &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);        &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
     }      }
Line 692  sub end_postanswerdate { Line 700  sub end_postanswerdate {
   
 sub start_notsolved {  sub start_notsolved {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    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"};      my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
     &Apache::lonxml::debug("not solved has :$gradestatus:");      &Apache::lonxml::debug("not solved has :$gradestatus:");
     if ($gradestatus =~ /^correct/) {      if ($gradestatus =~ /^correct/) {
Line 709  sub end_notsolved { Line 717  sub end_notsolved {
   
 sub start_solved {  sub start_solved {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    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"};      my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
     if ($gradestatus !~ /^correct/) {      if ($gradestatus !~ /^correct/) {
       &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]);        &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]);
Removed from v.1.106  
changed lines
  Added in v.1.114

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>