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

version 1.41, 2001/06/05 16:32:18 version 1.55, 2001/08/17 14:24:29
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 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 start_problem {  sub start_problem {
Line 41  sub start_problem { Line 69  sub start_problem {
 #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;
   
   #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().'" '.  
   '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,$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.='The resource needs to be checked out';
           }
    return $result.$msg.'<br />';
       }        }
     }      }
   }    }
Line 99  sub start_problem { Line 144  sub start_problem {
        <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;
Line 132  sub end_problem { Line 178  sub end_problem {
       } 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 'meta') {    if ($target eq 'meta') {
Line 146  sub end_problem { Line 193  sub end_problem {
   return $result;    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;
   }
   
 sub start_block {  sub start_block {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
Line 242  sub start_randomlist { Line 322  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 250  sub shuffle { Line 331  sub shuffle {
 }  }
   
 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') {
     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 352  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 364  sub end_startouttext { Line 448  sub end_startouttext {
   
   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::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 467  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 477  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 $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.41  
changed lines
  Added in v.1.55


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