Diff for /loncom/homework/structuretags.pm between versions 1.26 and 1.33

version 1.26, 2001/01/03 00:14:47 version 1.33, 2001/02/19 21:02:59
Line 1 Line 1
 # The LearningOnline Network with CAPA # <script> definiton  # The LearningOnline Network with CAPA # <script> definiton
   # 2/19 Guy
 package Apache::structuretags;   package Apache::structuretags; 
   
 use strict;  use strict;
Line 54  sub start_problem { Line 54  sub start_problem {
     if ( $status eq 'CLOSED' ) {      if ( $status eq 'CLOSED' ) {
       my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);        my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
       if ( $target eq "web" ) {        if ( $target eq "web" ) {
  return "<br></br>Problem is not open to be viewed. The problem $datemsg<br></br>";   return "<body bgcolor=\"#FFFFFF\"> <br />Problem is not open to be viewed. The problem $datemsg<br />";
       }        }
     }       } 
   }    }
Line 62  sub start_problem { Line 62  sub start_problem {
     my $args ='';      my $args ='';
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }      if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);      my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
       if ($name eq '') { 
         $name=&Apache::lonnet::EXT('resource.title');
         if ($name eq 'con_lost') { $name = ''; }
       }
       $Apache::lonhomework::name=$name;
     if ($status eq 'CAN_ANSWER') {      if ($status eq 'CAN_ANSWER') {
       # create a page header and exit        # create a page header and exit
       return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">";        return "<title>$name</title>\n<body bgcolor=\"#FFFFFF\">\n<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">".'<input type="hidden" name="submitted" value="yes" />';
     } elsif ($status eq 'SHOW_ANSWER') {      } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') {
       return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n";        return "<title>$name</title>\n<body bgcolor=\"#FFFFFF\">\n";
     }      }
   }    }
   return '';    return '';
Line 77  sub end_problem { Line 82  sub end_problem {
   my $result='';    my $result='';
   my $status=$Apache::inputtags::status['-1'];    my $status=$Apache::inputtags::status['-1'];
   unless ($target eq 'meta') {    unless ($target eq 'meta') {
     if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {      if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
          $status eq 'CAN_ANSWER') {
       # if part is zero, no <part>s existed, so we need to the grading        # if part is zero, no <part>s existed, so we need to the grading
       &Apache::inputtags::grade;        &Apache::inputtags::grade;
     } elsif ($Apache::inputtags::part eq '0') {      } elsif ($Apache::inputtags::part eq '0') {
Line 88  sub end_problem { Line 94  sub end_problem {
     if ($target eq 'web') {       if ($target eq 'web') { 
       if ($status eq 'CAN_ANSWER') {        if ($status eq 'CAN_ANSWER') {
  $result.="</form></body>\n";    $result.="</form></body>\n"; 
       } elsif ($status eq 'SHOW_ANSWER') {        } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
  $result.="</body>\n";    $result.="</body>\n"; 
       }         } 
     }      }
Line 106  sub start_block { Line 112  sub start_block {
   my $code = @$parstack[$#$parstack];    my $code = @$parstack[$#$parstack];
   $code =~ s/\"//g;    $code =~ s/\"//g;
   $code .=';return $condition;';    $code .=';return $condition;';
 #  print "<br>$code<br>";  #  print "<br />$code<br />";
   my $result = &Apache::run::run($code,$safeeval);    my $result = &Apache::run::run($code,$safeeval);
   &Apache::lonxml::debug("block :$code: returned :$result:");    &Apache::lonxml::debug("block :$code: returned :$result:");
   if ( ! $result ) {     if ( ! $result ) { 
Line 169  sub start_randomlist { Line 175  sub start_randomlist {
       $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser);        $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser);
       $list_item = "$b_tok->[4]"."$list_item"."</$b_tok->[1]>";        $list_item = "$b_tok->[4]"."$list_item"."</$b_tok->[1]>";
       push(@randomlist,$list_item);        push(@randomlist,$list_item);
    #  print "<BR><B>START-TAG $b_tok->[1], $b_tok->[4], $list_item</B>";     #  print "<br /><b>START-TAG $b_tok->[1], $b_tok->[4], $list_item</b>";
     }      }
     if($b_tok->[0] eq 'T') { # text      if($b_tok->[0] eq 'T') { # text
     # what to do with text in between tags?      # what to do with text in between tags?
       #  print "<B>TEXT $b_tok->[1]</B><BR>";        #  print "<b>TEXT $b_tok->[1]</b><br />";
     }      }
     # if($b_tok->[0] eq 'E') { # end tag, should not happen      # if($b_tok->[0] eq 'E') { # end tag, should not happen
       #  print "<B>END-TAG $b_tok->[1]</B><BR>";        #  print "<b>END-TAG $b_tok->[1]</b><br />";
     # }      # }
   }    }
   my @idx_arr = (0 .. $#randomlist);    my @idx_arr = (0 .. $#randomlist);
Line 221  sub start_part { Line 227  sub start_part {
     if ( $status eq 'CLOSED' ) {      if ( $status eq 'CLOSED' ) {
       my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);        my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);
       if ( $target eq "web" ) {        if ( $target eq "web" ) {
  return "<br></br>Part is not open to be viewed. It $datemsg<br></br>";   return "<br />Part is not open to be viewed. It $datemsg<br />";
       }        }
     }      }
   }    }
Line 231  sub start_part { Line 237  sub start_part {
 sub end_part {  sub end_part {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   &Apache::lonxml::debug("in end_part $target ");    &Apache::lonxml::debug("in end_part $target ");
     my $status=$Apache::inputtags::status['-1'];
   pop @Apache::inputtags::status;    pop @Apache::inputtags::status;
   if ( $target eq 'meta' ) { return ''; }    if ( $target eq 'meta' ) { return ''; }
   if ( $target eq 'grade' ) { return &Apache::inputtags::grade; }    if ( $target eq 'grade' && $status eq 'CAN_ANSWER') { 
       return &Apache::inputtags::grade; 
     }
   return &Apache::inputtags::gradestatus($Apache::inputtags::part);    return &Apache::inputtags::gradestatus($Apache::inputtags::part);
 }  }
   
 sub start_preduedate {  sub start_preduedate {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   if ($target ne 'meta') {    if ($target ne 'meta') {
     if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER') {      if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
    $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
       &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);        &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
     }      }
   }    }

Removed from v.1.26  
changed lines
  Added in v.1.33


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