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

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

version 1.25, 2000/12/29 21:54:06 version 1.63, 2001/08/20 16:15:54
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
   # 6/26/2001 fixed extra web display at end of <web></web> tags
   # 8/17,8/18,8/20 Gerd Kortemeyer
   
 package Apache::structuretags;   package Apache::structuretags; 
   
Line 6  use strict; Line 10  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','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
   #  &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate'))
 }  }
   
 sub start_web {  sub start_web {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]);    my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]);
   if ($target eq 'web') {    if ($target eq 'web') {
     return $bodytext;      return $bodytext;
Line 19  sub start_web { Line 24  sub start_web {
 }  }
   
 sub end_web {  sub end_web {
       return '';
 }  }
   
 sub start_tex {  sub start_tex {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);    my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
   if ($target eq 'tex') {    if ($target eq 'tex') {
     return $bodytext      return $bodytext
Line 31  sub start_tex { Line 37  sub start_tex {
 }  }
   
 sub end_tex {  sub end_tex {
       return '';
   }
   
   sub page_start {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);
     my $head_tag_start='<head>'.&Apache::lonxml::registerurl();
     my $body_tag_start='<body onLoad="'.&Apache::lonxml::loadevents().'" '.
     'onUnload="'.&Apache::lonxml::unloadevents().'" ';
     my $background=&Apache::lonxml::get_param('background',$parstack,$safeeval);
     if ($background) {
       $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
                                           $background;
       $body_tag_start.='background="'.$background.'" ';
     } else {
       my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,$safeeval);
       if ($bgcolor) {
         $body_tag_start.='bgcolor="'.$bgcolor.'" ';
       } else {
         $body_tag_start.='bgcolor="#ffffff"';
       }
     }
     $body_tag_start.='>';
     return ($result,$head_tag_start,$body_tag_start);
 }  }
   
 sub start_problem {  sub start_problem {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
 #intialize globals  #intialize globals
   $Apache::inputtags::part='0';    $Apache::inputtags::part='0';
   @Apache::inputtags::responselist = ();    @Apache::inputtags::responselist = ();
     @Apache::inputtags::previous=();
     $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
     &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
     if ($Apache::lonhomework::type eq '') {
       my $uri=$ENV{'request.uri'};
       if ($uri=~/\.(\w+)$/) {
         $Apache::lonhomework::type=$1;
         &Apache::lonxml::debug("Using type of $1");
       } else {
         $Apache::lonhomework::type='problem';
         &Apache::lonxml::debug("Using default type, problem, :$uri:");
       }
     }
   
 #adeed vars to the scripting enviroment  #adeed vars to the scripting enviroment
   my $expression='$external::part='.$Apache::inputtags::part.';';    my $expression='$external::part='.$Apache::inputtags::part.';';
   &Apache::run::run($expression,$safeeval);    &Apache::run::run($expression,$safeeval);
   my $status;    my $status;
   my $datemsg;    my $accessmsg;
   if ($target ne 'meta') {  
     ($status,$datemsg) = &Apache::lonhomework::check_date('0');    #should get back a <html> or the neccesary stuff to start XML/MathML
     my ($result,$head_tag_start,$body_tag_start)=
       &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
   
     if ($Apache::lonhomework::type eq 'exam') {
         if ($target eq 'web') {
             my $token=$Apache::lonhomework::history{"resource.0.outtoken"};
             if (($ENV{'form.doescheckout'}) && (!$token)) {
        $token=&Apache::lonxml::maketoken();
                $Apache::lonhomework::history{"resource.0.outtoken"}=$token;
             }
             $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
         }
         if ($target eq 'meta') {
        
     return (<<ENDSTORES);
   <stores part="0" name="outtoken" type="string" 
    display="Document ID checked out"></stores>
   <stores part="0" name="checkouttime" type="date"
    display="Time checked out"></stores>
   <stores part="0" name="outremote" type="string" 
    display="Client IP checked out from"></stores>
   
   <stores part="0" name="intoken" type="string" 
    display="Document ID checked in"></stores>
   <stores part="0" name="checkintime" type="date"
    display="Time checked in"></stores>
   <stores part="0" name="inremote" type="string" 
    display="Client IP checked in from"></stores>
   ENDSTORES
         }
     }
     if ($target eq 'web' || $target eq 'grade') {
       ($status,$accessmsg) = &Apache::lonhomework::check_access('0');
     push (@Apache::inputtags::status,$status);      push (@Apache::inputtags::status,$status);
     my $expression='$external::datestatus="'.$status.'";';      my $expression='$external::datestatus="'.$status.'";';
     $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';      $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
     &Apache::run::run($expression,$safeeval);      &Apache::run::run($expression,$safeeval);
     if ( $status eq 'CLOSED' ) {      if (( $status eq 'CLOSED' ) ||
           ( $status eq 'UNCHECKEDOUT') ||
           ( $status eq 'BANNED')) {
       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>";   $result.= $head_tag_start.'</head>';
           my $msg=$body_tag_start.
       '<h1>Not open to be viewed</h1>';
           if ($status eq 'CLOSED') {
       $msg.='The problem '.$accessmsg;
    } elsif ($status eq 'UNCHECKEDOUT') {
               $msg.=(<<ENDCHECKOUT);
   <h2>The resource needs to be checked out</h2>
   As a resource gets checked out, a unique timestamped ID is given to it, and a
   permanent record is left in the system.<p />
   <font color=red>
   Checking out resources is subject to course policies, and may exclude future
   credit even if done erroneously.<p />
   </font>  
   <form method=post>
   <input type=button name="doescheckout" 
   value="Check out Exam for Viewing" 
   onClick="if (confirm('Check out Exam?')) { this.form.submit(); }" />
   </form>
   ENDCHECKOUT
           }
    return $result.$msg.'<br />';
       }        }
     }       }
   }    }
   if ($target eq 'web') {    if ($target eq 'web') {
     my $args ='';      my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }      if ($name eq '') { 
     my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);        $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_tag_start<title>$name</title></head>\n
     } elsif ($status eq 'SHOW_ANSWER') {                $body_tag_start\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.$head_tag_start."<title>$name</title></head>\n$body_tag_start\n";
       }
     }
     if ($target eq 'edit') {
       $result.=$head_tag_start."</head>".$body_tag_start.
         '<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 />
          <input type="submit" name="submit" value="Submit Changes" /><br />
         ';
       my $temp=&Apache::edit::insertlist($target,$token);
       $result.=$temp;
       return $result;
     }
     if ($target eq 'modified') {
       $result=$token->[4];
       $result.=&Apache::edit::handle_insert();
       return $result;
   }    }
   return '';    return '';
 }  }
   
 sub end_problem {  sub end_problem {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$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') {
       # 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
       $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part);        $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part);
     }       }
     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";
       }         }
         $result.=&Apache::lonxml::xmlend();
     }      }
   } 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;
   }
   
   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);
     if ($target eq 'edit') {
       $result.=$head_tag_start."</head>".$body_tag_start.
         '<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($target,$token);
       $result.=$temp;
       return $result;
     }
     if ($target eq 'modified') {
       $result=$token->[4];
       $result.=&Apache::edit::handle_insert();
       return $result;
     }
     return '';
   }
   
   sub end_library {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
     if ($target eq '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,$tagstack,$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 {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
   my $code = @$parstack[$#$parstack];    my $code = @$parstack[$#$parstack];
   $code =~ s/\"//g;    $code =~ s/\"//g;
Line 137  sub start_while { Line 308  sub start_while {
 }  }
   
 sub end_while {  sub end_while {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $code = pop @Apache::structuretags::whileconds;    my $code = pop @Apache::structuretags::whileconds;
   my $bodytext = pop @Apache::structuretags::whilebody;    my $bodytext = pop @Apache::structuretags::whilebody;
   my $result = &Apache::run::run($code,$safeeval);    my $result = &Apache::run::run($code,$safeeval);
Line 154  sub end_while { Line 325  sub end_while {
 #  ...   #  ... 
 # </randomlist>  # </randomlist>
 sub start_randomlist {  sub start_randomlist {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   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 169  sub start_randomlist { Line 340  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 193  sub start_randomlist { Line 364  sub start_randomlist {
 sub shuffle {  sub shuffle {
     my $a=shift;      my $a=shift;
     my $i;      my $i;
       &Apache::response::setrandomnumber();
     for($i=@$a;--$i;) {      for($i=@$a;--$i;) {
       my $j=int rand($i+1);        my $j=int rand($i+1);
       next if $i == $j;        next if $i == $j;
Line 201  sub shuffle { Line 373  sub shuffle {
 }  }
   
 sub end_randomlist {  sub end_randomlist {
     return '';
 }  }
   
 sub start_part {  sub start_part {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $args ='';    my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
   if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }    if ($id eq '') { $id = $Apache::lonxml::curdepth; }
   my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);  
   $Apache::inputtags::part=$id;    $Apache::inputtags::part=$id;
   @Apache::inputtags::responselist = ();    @Apache::inputtags::responselist = ();
     @Apache::inputtags::previous=();
   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,$accessmsg) = &Apache::lonhomework::check_access($id);
     push (@Apache::inputtags::status,$status);      push (@Apache::inputtags::status,$status);
     my $expression='$external::datestatus="'.$status.'";';      my $expression='$external::datestatus="'.$status.'";';
     $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';      $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
Line 221  sub start_part { Line 394  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 $accessmsg<br />";
       }        }
     }      }
   }    }
Line 229  sub start_part { Line 402  sub start_part {
 }  }
   
 sub end_part {  sub end_part {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$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,$tagstack,$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 252  sub end_preduedate { Line 432  sub end_preduedate {
 }  }
   
 sub start_postanswerdate {  sub start_postanswerdate {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$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 266  sub end_postanswerdate { Line 446  sub end_postanswerdate {
 }  }
   
 sub start_notsolved {  sub start_notsolved {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$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 283  sub end_notsolved { Line 463  sub end_notsolved {
 }  }
   
 sub start_solved {  sub start_solved {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$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 476  sub start_solved {
 sub end_solved {  sub end_solved {
   return '';    return '';
 }  }
   
   sub start_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my @result=(''.'');
     if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); }
     return (@result);
   }
   sub end_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
     my $text='';
   
     if ($target eq 'edit') {
       $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);
       $result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td>
   <td>Delete:".
     &Apache::edit::deletelist($target,$token)
     ."</td>
   <td>".
     &Apache::edit::insertlist($target,$token).
       "</td>
   </tr><tr><td colspan=\"3\">\n".
    &Apache::edit::editfield($token->[1],$text,"",50,4);
     }
     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,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
     if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; }
     if ($target eq "modified") { $result='<endouttext />'; }
     return $result;
   }
   sub end_endouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my @result=('','');
     if ($target eq "edit" || $target eq 'modified') { @result=('','no'); }
     return (@result);
   }
   sub delete_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   #  my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
     my $text=$$parser['-1']->get_text("/endouttext");
     my $token=$$parser['-1']->get_token();
     &Apache::lonxml::debug("Deleting :$text: and :$token->[0]:$token->[1]:$token->[2]: for startouttext");
     &Apache::lonxml::end_tag($tagstack,$parstack,$token);
     # Deleting 2 parallel tag pairs, but we need the numbers later to look like 
     # they did the last time round
     &Apache::lonxml::increasedepth($token);
     &Apache::lonxml::decreasedepth($token);
     return 1;
   }
   
 1;  1;
 __END__  __END__
Removed from v.1.25  
changed lines
  Added in v.1.63

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