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

Diff for /loncom/homework/structuretags.pm between versions 1.41 and 1.71

version 1.41, 2001/06/05 16:32:18 version 1.71, 2001/10/30 19:18:15
Line 1 Line 1
 # The LearningOnline Network with CAPA   # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document  # definition of tags that give a structure to a document
 # 2/19 Guy  # 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; 
   
 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','startouttext','endouttext'));    &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'))  #  &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate'))
 }  }
   
Line 21  sub start_web { Line 24  sub start_web {
 }  }
   
 sub end_web {  sub end_web {
       return '';
 }  }
   
 sub start_tex {  sub start_tex {
Line 33  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 initialize_storage {
     %Apache::lonhomework::results=();
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
     if ($ENV{'request.state'} eq 'construct') {
       %Apache::lonhomework::history=
         &Apache::lonnet::restore($ENV{'request.uri'},'nohist_construct',$domain,$name);
       my ($temp)=keys %Apache::lonhomework::history ;
       &Apache::lonxml::debug("Return message of $temp");
     } else {
       %Apache::lonhomework::history=
         &Apache::lonnet::restore($symb,$courseid,$domain,$name);
     }
     #ignore error conditions
     my ($temp)=keys %Apache::lonhomework::history ;
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
   }
   
   # -------------------------------------------------------------finalize_storage
   # Stores away the result has to a student's environment
   # checks form.grade_ for specific values, other wises stores
   # to the running users environment
   sub finalize_storage {
     my $result;
     my ($temp) = keys %Apache::lonhomework::results;
     if ( $temp ne '' ) {
       my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
       if ($ENV{'request.state'} eq 'construct') {
         $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
         $ENV{'request.uri'},'nohist_construct',
         $domain,$name);
         &Apache::lonxml::debug('Construct Store return message:'.$result);
       } else {
         $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
         $symb,$courseid,$domain,$name);
         &Apache::lonxml::debug('Store return message:'.$result);
       }
     }
     return $result;
   }
   
   sub checkout_msg {
   return (<<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
 }  }
   
 sub start_problem {  sub start_problem {
Line 41  sub start_problem { Line 126  sub start_problem {
 #intialize globals  #intialize globals
   $Apache::inputtags::part='0';    $Apache::inputtags::part='0';
   @Apache::inputtags::responselist = ();    @Apache::inputtags::responselist = ();
     @Apache::inputtags::previous=();
     &initialize_storage();
     $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    #added 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;
   
   #should get back a <html> or the neccesary stuff to start XML/MathML    #should get back a <html> or the neccesary stuff to start XML/MathML
   my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);    my ($result,$head_tag_start,$body_tag_start)=
       &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
   
   my $head_tag_start='<head>'.&Apache::lonxml::registerurl();  
   my $body_tag_start='<body onLoad="'.&Apache::lonxml::loadevents().'" '.    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
   'onUnload="'.&Apache::lonxml::unloadevents().'" '.      #handle exam checkout
     'bgcolor="#FFFFFF">';      if ($Apache::lonhomework::type eq 'exam') {
   if ($target eq 'web' || $target eq 'grade') {        my $token=$Apache::lonhomework::history{"resource.0.outtoken"};
     ($status,$datemsg) = &Apache::lonhomework::check_date('0');        if (($ENV{'form.doescheckout'}) && (!$token)) {
    $token=&Apache::lonxml::maketoken();
    $Apache::lonhomework::history{"resource.0.outtoken"}=$token;
         }
         $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
       }
   
       #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);
       }
       ($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" ) {
  $result.= $head_tag_start.'</head>';   $result.= $head_tag_start.'</head>';
  return $result . $body_tag_start .          my $msg=$body_tag_start.
   " <br />Problem is not open to be viewed. The problem $datemsg<br />";      '<h1>Not open to be viewed</h1>';
           if ($status eq 'CLOSED') {
       $msg.='The problem '.$accessmsg;
    } elsif ($status eq 'UNCHECKEDOUT') {
               $msg.=&checkout_msg;
           }
    $result.=$msg.'<br />';
       }        }
     }      } elsif ($target eq 'web') {
   }        my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
   if ($target eq 'web') {        if ($name eq '') { 
     my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);   $name=&Apache::lonnet::EXT('resource.title');
     if ($name eq '') {    if ($name eq 'con_lost') { $name = ''; }
       $name=&Apache::lonnet::EXT('resource.title');        }
       if ($name eq 'con_lost') { $name = ''; }        $Apache::lonhomework::name=$name;
     }        if ($status eq 'CAN_ANSWER') {
     $Apache::lonhomework::name=$name;   # create a page header and exit
     if ($status eq 'CAN_ANSWER') {   $result.="$head_tag_start<title>$name</title></head>\n
       # create a page header and exit  
       $result.="$head_tag_start<title>$name</title></head>\n  
               $body_tag_start\n                $body_tag_start\n
               <form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">".                <form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">".
  '<input type="hidden" name="submitted" value="yes" />';   '<input type="hidden" name="submitted" value="yes" />';
       if ($ENV{'request.state'} eq "construct") {   if ($ENV{'request.state'} eq "construct") {
  $result.='<input type="hidden" name="problemmode" value="View" />    $result.=
                  <input type="submit" name="problemmode" value="Edit" /><hr />';      '<input type="hidden" name="problemmode" value="View" />
                <input type="submit" name="problemmode" value="Edit" />
                Random Seed:<input type="text" name="rndseed" width="10" value="'.
          $rndseed.'" /><hr />';
    }
    # if we are viewing someone else preserve that info
    if (defined $ENV{'form.grade_symb'}) {
     foreach my $field ('symb','courseid','domain','username') {
       $result .= '<input type="hidden" name="grade_'.$field.
         '" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
     }
    }
         } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'
          || $status eq 'CLOSED') {
    $result.=$head_tag_start.
     "<title>$name</title></head>\n$body_tag_start\n";
       }        }
       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";  
     }      }
   }    } elsif ($target eq 'edit') {
   if ($target eq 'edit') {  
     $result.=$head_tag_start."</head>".$body_tag_start.      $result.=$head_tag_start."</head>".$body_tag_start.
       '<form name="lonhomework" method="POST" action="'.$ENV{'request.uri'}.'">        '<form name="lonhomework" method="POST" action="'.
    $ENV{'request.uri'}.'">
        <input type="hidden" name="submitted" value="edit" />         <input type="hidden" name="submitted" value="edit" />
        <input type="hidden" name="problemmode" value="Edit" />         <input type="hidden" name="problemmode" value="Edit" />
        <input type="submit" name="problemmode" value="View" />         <input type="submit" name="problemmode" value="View" />
        <input type="submit" name="Undo" value="undo" /> <hr />         <input type="submit" name="Undo" value="undo" /> <hr />
          <input type="submit" name="submit" value="Submit Changes" /><br />
       ';        ';
     my $temp=&Apache::edit::insertlist($target,$token);      my $temp=&Apache::edit::insertlist($target,$token);
     $result.=$temp;      $result.=$temp;
     return $result;    } elsif ($target eq 'modified') {
   }  
   if ($target eq 'modified') {  
     $result=$token->[4];      $result=$token->[4];
     $result.=&Apache::edit::handle_insert();      $result.=&Apache::edit::handle_insert();
     return $result;    } else {
       # page_start returned a starting result, delete it if we don't need it
       $result = '';
   }    }
   return '';    return $result;
 }  }
   
 sub end_problem {  sub end_problem {
   my ($target,$token,$tagstack,$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'];
   if ($target eq 'grade' || $target eq 'web' ) {    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) {
     if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&      if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
        $status eq 'CAN_ANSWER') {         $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 ( $target eq 'web' && $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' && ($ENV{'request.state'} ne 'construct')) ||
    ($target eq 'answer')
          ) {
       if ($status eq 'CAN_ANSWER') {        if ($status eq 'CAN_ANSWER') {
  $result.="</form></body>\n";    $result.="</form></body>\n"; 
       } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {        } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
  $result.="</body>\n";   $result.="</body>\n";
       }        }
         $result.=&Apache::lonxml::xmlend();
     }      }
   }      if ($target eq 'grade') { 
   if ($target eq 'meta') {        &Apache::lonhomework::showhash(%Apache::lonhomework::results);
         &finalize_storage();
       }
     } elsif ($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;
     }      }
     } elsif ($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') {    if ($target eq 'edit') {
     &Apache::lonxml::debug("in end_problem with $target, edit");  
     $result='<br /><input type="submit" name="submit" value="Submit Changes" />';      $result='<br /><input type="submit" name="submit" value="Submit Changes" />';
   }    }
   return $result;    return $result;
Line 149  sub end_problem { Line 324  sub end_problem {
 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') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     my $code = @$parstack[$#$parstack];      my $code = @$parstack[$#$parstack];
     $code =~ s/\"//g;      $code =~ s/\"//g;
     $code .=';return $condition;';      $code .=';return $condition;';
Line 204  sub end_while { Line 379  sub end_while {
 # </randomlist>  # </randomlist>
 sub start_randomlist {  sub start_randomlist {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);    if ($target eq 'answer' || $target eq 'grade' || $target eq 'web') {
   my $b_parser= HTML::TokeParser->new(\$body);      my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
   my $b_tok;      my $b_parser= HTML::TokeParser->new(\$body);
   my @randomlist;      my $b_tok;
   my $list_item;      my @randomlist;
       my $list_item;
   while($b_tok = $b_parser->get_token() ) {      while($b_tok = $b_parser->get_token() ) {
     if($b_tok->[0] eq 'S') { # start tag        if($b_tok->[0] eq 'S') { # start tag
     # get content of the tag until matching end tag   # get content of the tag until matching end tag
     # get all text upto the matching tag   # get all text upto the matching tag
     # and push the content into @randomlist   # and push the content into @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);  
   &Apache::structuretags::shuffle(\@idx_arr);  
   my $bodytext = '';  
   for(0 .. $#randomlist) {  
     $bodytext .= "$randomlist[ $idx_arr[$_] ]";  
   }  
   
   &Apache::lonxml::newparser($parser,\$bodytext);      my @idx_arr = (0 .. $#randomlist);
       &Apache::structuretags::shuffle(\@idx_arr);
       my $bodytext = '';
       for(0 .. $#randomlist) {
         $bodytext .= "$randomlist[ $idx_arr[$_] ]";
       }
       &Apache::lonxml::newparser($parser,\$bodytext);
     }
   return "";    return "";
 }  }
   
 sub shuffle {  sub shuffle {
     my $a=shift;      my $a=shift;
     my $i;      my $i;
     for($i=@$a;--$i;) {      if (defined(@$a)) {
       my $j=int rand($i+1);        &Apache::response::setrandomnumber();
       next if $i == $j;        for($i=@$a;--$i;) {
       @$a[$i,$j] = @$a[$j,$i];   my $j=int rand($i+1);
    next if $i == $j;
    @$a[$i,$j] = @$a[$j,$i];
         }
     }      }
 }  }
   
 sub end_randomlist {  sub end_randomlist {
     return '';
 }  }
   
 sub start_part {  sub start_part {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);    my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
     if ($id eq '') { $id = $Apache::lonxml::curdepth; }
   $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;
   } elsif ($target eq 'web' || $target eq 'grade') {    } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     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 268  sub start_part { Line 450  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 />Part is not open to be viewed. It $datemsg<br />";   return "<br />Part is not open to be viewed. It $accessmsg<br />";
       }        }
     }      }
   }    }
Line 292  sub end_part { Line 474  sub end_part {
   
 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') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     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 321  sub end_postanswerdate { Line 503  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') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     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 338  sub end_notsolved { Line 520  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') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     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 363  sub end_startouttext { Line 545  sub end_startouttext {
   my $text='';    my $text='';
   
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);      $text=&Apache::lonxml::get_all_text("endouttext",$$parser[-1]);
     $result=      $result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td>
       &Apache::edit::tag_start($target,$token).  <td>Delete:".
  &Apache::edit::editfield($token->[1],$text,"Text Block",50,5);    &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') {    if ($target eq 'modified') {
     $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);      $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
Line 377  sub end_startouttext { Line 565  sub end_startouttext {
 sub start_endouttext {  sub start_endouttext {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result='';    my $result='';
   if ($target eq "edit" ) { $result=&Apache::edit::tag_end($target,$token); }    if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; }
   if ($target eq "modified") { $result='<endouttext />'; }    if ($target eq "modified") { $result='<endouttext />'; }
   return $result;    return $result;
 }  }
Line 387  sub end_endouttext { Line 575  sub end_endouttext {
   if ($target eq "edit" || $target eq 'modified') { @result=('','no'); }    if ($target eq "edit" || $target eq 'modified') { @result=('','no'); }
   return (@result);    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 $ntoken=$$parser['-1']->get_token();
     &Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext");
     &Apache::lonxml::end_tag($tagstack,$parstack,$ntoken);
     # Deleting 2 parallel tag pairs, but we need the numbers later to look like 
     # they did the last time round
     &Apache::lonxml::increasedepth($ntoken);
     &Apache::lonxml::decreasedepth($ntoken);
     return 1;
   }
   
 1;  1;
 __END__  __END__
Removed from v.1.41  
changed lines
  Added in v.1.71

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