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

Diff for /loncom/homework/structuretags.pm between versions 1.36 and 1.40

version 1.36, 2001/05/04 21:21:45 version 1.40, 2001/06/02 03:59:59
Line 8  use Apache::lonnet; Line 8  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','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 23  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 35  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 47  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);    my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);
   
   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');
Line 63  sub start_problem { Line 64  sub start_problem {
     }       } 
   }    }
   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]; }  
     my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);  
     if ($name eq '') {       if ($name eq '') { 
       $name=&Apache::lonnet::EXT('resource.title');        $name=&Apache::lonnet::EXT('resource.title');
       if ($name eq 'con_lost') { $name = ''; }        if ($name eq 'con_lost') { $name = ''; }
Line 94  sub start_problem { Line 93  sub start_problem {
 <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($token,$target);      my $temp=&Apache::edit::insertlist($target,$token);
     &Apache::lonxml::debug("edit gave me $temp");  
     $result.=$temp;      $result.=$temp;
     return $result;      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'];
   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 126  sub end_problem { Line 129  sub end_problem {
   }     } 
   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 138  sub end_problem { Line 140  sub end_problem {
 }  }
   
 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 174  sub start_while { Line 179  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 191  sub end_while { Line 196  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 241  sub end_randomlist { Line 246  sub end_randomlist {
 }  }
   
 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]; }  
   my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);  
   $Apache::inputtags::part=$id;    $Apache::inputtags::part=$id;
   @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 266  sub start_part { Line 269  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;
   if ( $target eq 'meta' ) { return ''; }    if ( $target eq 'meta' ) { return ''; }
   if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {     if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
     return &Apache::inputtags::grade;       return &Apache::inputtags::grade;
   }    }
   return &Apache::inputtags::gradestatus($Apache::inputtags::part);    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 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 293  sub end_preduedate { Line 299  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 307  sub end_postanswerdate { Line 313  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 324  sub end_notsolved { Line 330  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 339  sub end_solved { Line 345  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='';
   
   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[$#$parser]);
     $result=      $result=
       &Apache::edit::tag_start("outtext").        &Apache::edit::tag_start($target,$token).
  &Apache::edit::editfield($token->[1],$text,"Text Block");   &Apache::edit::editfield($token->[1],$text,"Text Block",50,5);
   }    }
   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 362  sub end_startouttext { Line 368  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("outtext"); }    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.36  
changed lines
  Added in v.1.40

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