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

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

version 1.39, 2001/05/31 22:37:56 version 1.41, 2001/06/05 16:32:18
Line 12  sub BEGIN { Line 12  sub BEGIN {
 }  }
   
 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 24  sub end_web { Line 24  sub end_web {
 }  }
   
 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 36  sub end_tex { Line 36  sub end_tex {
 }  }
   
 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';
Line 48  sub start_problem { Line 48  sub start_problem {
   my $status;    my $status;
   my $datemsg;    my $datemsg;
   
   my $result=&Apache::londefdef::start_html($target,$token,$parstack,$parser,$safeeval);    #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 $head_tag_start='<head>'.&Apache::lonxml::registerurl();
     my $body_tag_start='<body onLoad="'.&Apache::lonxml::loadevents().'" '.
     'onUnload="'.&Apache::lonxml::unloadevents().'" '.
       'bgcolor="#FFFFFF">';
   if ($target eq 'web' || $target eq 'grade') {    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);
Line 59  sub start_problem { Line 64  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 $result."<body bgcolor=\"#FFFFFF\"> <br />Problem is not open to be viewed. The problem $datemsg<br />";   $result.= $head_tag_start.'</head>';
    return $result . $body_tag_start .
     " <br />Problem is not open to be viewed. The problem $datemsg<br />";
       }        }
     }       }
   }    }
   if ($target eq 'web') {    if ($target eq 'web') {
     my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);      my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
Line 72  sub start_problem { Line 79  sub start_problem {
     $Apache::lonhomework::name=$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
       $result.="<head><title>$name</title></head>\n        $result.="$head_tag_start<title>$name</title></head>\n
               <body bgcolor=\"#FFFFFF\">\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") {
Line 82  sub start_problem { Line 89  sub start_problem {
       }        }
       return $result;        return $result;
     } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') {      } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') {
       return $result."<title>$name</title>\n<body bgcolor=\"#FFFFFF\">\n";        return $result.$head_tag_start."<title>$name</title></head>\n$body_tag_start\n";
     }      }
   }    }
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $result.='<body bgcolor="#FFFFFF">      $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 />
 ';        ';
     my $temp=&Apache::edit::insertlist($target,$token);      my $temp=&Apache::edit::insertlist($target,$token);
     $result.=$temp;      $result.=$temp;
     return $result;      return $result;
Line 106  sub start_problem { Line 113  sub start_problem {
 }  }
   
 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'];
   if ($target eq 'grade' || $target eq'web' ) {    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') {         $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
Line 118  sub end_problem { Line 125  sub end_problem {
       # 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' || $status eq 'CANNOT_ANSWER') {        } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
  $result.="</body>\n";    $result.="</body>\n";
       }         }
     }      }
   }     }
   if ($target eq 'meta') {    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;
Line 140  sub end_problem { Line 147  sub end_problem {
 }  }
   
 sub start_block {  sub start_block {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade') {
     my $code = @$parstack[$#$parstack];      my $code = @$parstack[$#$parstack];
Line 162  sub end_block { Line 169  sub end_block {
 }  }
   
 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 179  sub start_while { Line 186  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 196  sub end_while { Line 203  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 246  sub end_randomlist { Line 253  sub end_randomlist {
 }  }
   
 sub start_part {  sub start_part {
   my ($target,$token,$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);
   $Apache::inputtags::part=$id;    $Apache::inputtags::part=$id;
   @Apache::inputtags::responselist = ();    @Apache::inputtags::responselist = ();
Line 269  sub start_part { Line 276  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'];    my $status=$Apache::inputtags::status['-1'];
   pop @Apache::inputtags::status;    pop @Apache::inputtags::status;
Line 284  sub end_part { Line 291  sub end_part {
 }  }
   
 sub start_preduedate {  sub start_preduedate {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade') {
     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' ) {
Line 299  sub end_preduedate { Line 306  sub end_preduedate {
 }  }
   
 sub start_postanswerdate {  sub start_postanswerdate {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web' || $target eq 'grade') {    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("/postanswerdate",$$parser[$#$parser]);        &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
Line 313  sub end_postanswerdate { Line 320  sub end_postanswerdate {
 }  }
   
 sub start_notsolved {  sub start_notsolved {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web' || $target eq 'grade') {    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:");
Line 330  sub end_notsolved { Line 337  sub end_notsolved {
 }  }
   
 sub start_solved {  sub start_solved {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web' || $target eq 'grade') {    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/) {
Line 345  sub end_solved { Line 352  sub end_solved {
 }  }
   
 sub start_startouttext {  sub start_startouttext {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my @result=(''.'');    my @result=(''.'');
   if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); }    if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); }
   return (@result);    return (@result);
 }  }
 sub end_startouttext {  sub end_startouttext {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result='';    my $result='';
   my $text='';    my $text='';
   
Line 368  sub end_startouttext { Line 375  sub end_startouttext {
   return $result;    return $result;
 }  }
 sub start_endouttext {  sub start_endouttext {
   my ($target,$token,$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=&Apache::edit::tag_end($target,$token); }
   if ($target eq "modified") { $result='<endouttext />'; }    if ($target eq "modified") { $result='<endouttext />'; }
   return $result;    return $result;
 }  }
 sub end_endouttext {  sub end_endouttext {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my @result=('','');    my @result=('','');
   if ($target eq "edit" || $target eq 'modified') { @result=('','no'); }    if ($target eq "edit" || $target eq 'modified') { @result=('','no'); }
   return (@result);    return (@result);
Removed from v.1.39  
changed lines
  Added in v.1.41

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