Diff for /loncom/homework/structuretags.pm between versions 1.25 and 1.38

version 1.25, 2000/12/29 21:54:06 version 1.38, 2001/05/15 20:48:43
Line 1 Line 1
 # The LearningOnline Network with CAPA # <script> definiton  # The LearningOnline Network with CAPA 
   # definition of tags that give a structure to a document
   # 2/19 Guy
 package Apache::structuretags;   package Apache::structuretags; 
   
 use strict;  use strict;
 use Apache::lonnet;  use Apache::lonnet;
   
 sub BEGIN {  sub BEGIN {
   &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved'));    &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
   #  &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate'))
 }  }
   
 sub start_web {  sub start_web {
Line 45  sub start_problem { Line 47  sub start_problem {
   &Apache::run::run($expression,$safeeval);    &Apache::run::run($expression,$safeeval);
   my $status;    my $status;
   my $datemsg;    my $datemsg;
   if ($target ne 'meta') {  
     my $result=&Apache::londefdef::start_html($target,$token,$parstack,$parser,$safeeval);
   
     if ($target eq 'web' || $target eq 'grade') {
     ($status,$datemsg) = &Apache::lonhomework::check_date('0');      ($status,$datemsg) = &Apache::lonhomework::check_date('0');
     push (@Apache::inputtags::status,$status);      push (@Apache::inputtags::status,$status);
     my $expression='$external::datestatus="'.$status.'";';      my $expression='$external::datestatus="'.$status.'";';
Line 54  sub start_problem { Line 59  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 $result."<body bgcolor=\"#FFFFFF\"> <br />Problem is not open to be viewed. The problem $datemsg<br />";
       }        }
     }       } 
   }    }
Line 62  sub start_problem { Line 67  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'}."\">";        $result.="<head><title>$name</title></head>\n
     } elsif ($status eq 'SHOW_ANSWER') {                <body bgcolor=\"#FFFFFF\">\n
       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" />';
         if ($ENV{'request.state'} eq "construct") {
    $result.='<input type="hidden" name="problemmode" value="View" />
                    <input type="submit" name="problemmode" value="Edit" /><hr />';
         }
         return $result;
       } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') {
         return $result."<title>$name</title>\n<body bgcolor=\"#FFFFFF\">\n";
       }
     }
     if ($target eq 'edit') {
       $result.='<body bgcolor="#FFFFFF">
   <form name="lonhomework" method="POST" action="'.$ENV{'request.uri'}.'">
   <input type="hidden" name="submitted" value="edit" />
   <input type="hidden" name="problemmode" value="Edit" />
   <input type="submit" name="problemmode" value="View" />
   <input type="submit" name="Undo" value="undo" /> <hr />
   ';
       my $temp=&Apache::edit::insertlist($token,$target);
       $result.=$temp;
       return $result;
     }
     if ($target eq 'modified') {
       $result=$token->[4];
       $result.=&Apache::edit::handle_insert();
       return $result;
   }    }
   return '';    return '';
 }  }
Line 76  sub end_problem { Line 111  sub end_problem {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $result='';    my $result='';
   my $status=$Apache::inputtags::status['-1'];    my $status=$Apache::inputtags::status['-1'];
   unless ($target eq 'meta') {    if ($target eq 'grade' || $target eq'web' ) {
     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 124  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"; 
       }         } 
     }      }
   } else {    } 
     if ($target eq 'meta') {
     if ($Apache::inputtags::part eq '0') {      if ($Apache::inputtags::part eq '0') {
       $result=&Apache::response::mandatory_part_meta;        $result=&Apache::response::mandatory_part_meta;
     }      }
   }    }
     if ($target eq 'edit') {
       &Apache::lonxml::debug("in end_problem with $target, edit");
       $result='<br /><input type="submit" name="submit" value="Submit Changes" />';
     }
   return $result;    return $result;
 }  }
   
 sub start_block {  sub start_block {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   
   my $code = @$parstack[$#$parstack];    if ($target eq 'web' || $target eq 'grade') {
   $code =~ s/\"//g;      my $code = @$parstack[$#$parstack];
   $code .=';return $condition;';      $code =~ s/\"//g;
 #  print "<br>$code<br>";      $code .=';return $condition;';
   my $result = &Apache::run::run($code,$safeeval);      #  print "<br />$code<br />";
   &Apache::lonxml::debug("block :$code: returned :$result:");      my $result = &Apache::run::run($code,$safeeval);
   if ( ! $result ) {       &Apache::lonxml::debug("block :$code: returned :$result:");
     my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);      if ( ! $result ) { 
     &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");        my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
         &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");
       }
   }    }
   return "";    return "";
 }  }
   
 sub end_block {  sub end_block {
     return '';
 }  }
   
 sub start_while {  sub start_while {
Line 169  sub start_randomlist { Line 213  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 212  sub start_part { Line 256  sub start_part {
   @Apache::inputtags::responselist = ();    @Apache::inputtags::responselist = ();
   if ($target eq 'meta') {    if ($target eq 'meta') {
     return &Apache::response::mandatory_part_meta;      return &Apache::response::mandatory_part_meta;
   } else {    } elsif ($target eq 'web' || $target eq 'grade') {
     my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id);      my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
     push (@Apache::inputtags::status,$status);      push (@Apache::inputtags::status,$status);
     my $expression='$external::datestatus="'.$status.'";';      my $expression='$external::datestatus="'.$status.'";';
Line 221  sub start_part { Line 265  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 275  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::gradestatus($Apache::inputtags::part);      return &Apache::inputtags::grade;
     }
     if ($target eq 'web') {
       return &Apache::inputtags::gradestatus($Apache::inputtags::part);
     }
     return '';
 }  }
   
 sub start_preduedate {  sub start_preduedate {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   if ($target ne 'meta') {    if ($target eq 'web' || $target eq 'grade') {
     if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER') {      if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
       &Apache::lonxml::get_all_text("/pre_duedate",$$parser[$#$parser]);   $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
         &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
     }      }
   }    }
   return '';    return '';
Line 253  sub end_preduedate { Line 304  sub end_preduedate {
   
 sub start_postanswerdate {  sub start_postanswerdate {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   if ($target ne 'meta') {    if ($target eq 'web' || $target eq 'grade') {
     if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {      if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
       &Apache::lonxml::get_all_text("/post_answerdate",$$parser[$#$parser]);        &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
     }      }
   }    }
   return '';    return '';
Line 267  sub end_postanswerdate { Line 318  sub end_postanswerdate {
   
 sub start_notsolved {  sub start_notsolved {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   if ($target ne 'meta') {    if ($target eq 'web' || $target eq 'grade') {
     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/) {
       &Apache::lonxml::debug("skipping");        &Apache::lonxml::debug("skipping");
       &Apache::lonxml::get_all_text("/not_solved",$$parser[$#$parser]);        &Apache::lonxml::get_all_text("/notsolved",$$parser[$#$parser]);
     }      }
   }    }
   return '';    return '';
Line 284  sub end_notsolved { Line 335  sub end_notsolved {
   
 sub start_solved {  sub start_solved {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   if ($target ne 'meta') {    if ($target eq 'web' || $target eq 'grade') {
     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]);
Line 296  sub start_solved { Line 347  sub start_solved {
 sub end_solved {  sub end_solved {
   return '';    return '';
 }  }
   
   sub start_startouttext {
     my ($target,$token,$parstack,$parser,$safeeval)=@_;
     my @result=(''.'');
     if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); }
     return (@result);
   }
   sub end_startouttext {
     my ($target,$token,$parstack,$parser,$safeeval)=@_;
     my $result='';
     my $text='';
   
     if ($target eq 'edit') {
       $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);
       $result=
         &Apache::edit::tag_start($target,$token).
    &Apache::edit::editfield($token->[1],$text,"Text Block",50,5);
     }
     if ($target eq 'modified') {
       $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
       $result='<startouttext />'.&Apache::edit::modifiedfield();
     }
     return $result;
   }
   sub start_endouttext {
     my ($target,$token,$parstack,$parser,$safeeval)=@_;
     my $result='';
     if ($target eq "edit" ) { $result=&Apache::edit::tag_end($target,$token); }
     if ($target eq "modified") { $result='<endouttext />'; }
     return $result;
   }
   sub end_endouttext {
     my ($target,$token,$parstack,$parser,$safeeval)=@_;
     my @result=('','');
     if ($target eq "edit" || $target eq 'modified') { @result=('','no'); }
     return (@result);
   }
   
   
 1;  1;
 __END__  __END__

Removed from v.1.25  
changed lines
  Added in v.1.38


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