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

Diff for /loncom/homework/structuretags.pm between versions 1.77 and 1.90

version 1.77, 2002/01/23 14:36:19 version 1.90, 2002/04/11 17:37:13
Line 34  package Apache::structuretags; Line 34  package Apache::structuretags;
 use strict;  use strict;
 use Apache::lonnet;  use Apache::lonnet;
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','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 67  sub end_tex { Line 67  sub end_tex {
   
 sub page_start {  sub page_start {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);    my %found;
   my $head_tag_start='<head>'.&Apache::lonxml::registerurl();    foreach my $taginside ($tagstack) {
   my $body_tag_start='<body onLoad="'.&Apache::lonxml::loadevents().'" '.      foreach my $taglookedfor ('html','body','form') {
   'onUnload="'.&Apache::lonxml::unloadevents().'" ';        if ($taginside =~ /^$taglookedfor$/i) { $found{$taglookedfor} = 1; }
   my $background=&Apache::lonxml::get_param('background',$parstack,$safeeval);      }
   if ($background) {    }
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=  
                                         $background;    my $result;
     $body_tag_start.='background="'.$background.'" ';    my $head_tag_start;
   } else {    if (!defined($found{'html'})) {
     my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,$safeeval);      $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,
     if ($bgcolor) {     $parser,$safeeval);
       $body_tag_start.='bgcolor="'.$bgcolor.'" ';      $head_tag_start='<head>'.&Apache::lonxml::registerurl(undef,$target);
     }
     my $body_tag_start;
     if (!defined($found{'body'})) {
       $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 {      } else {
       $body_tag_start.='bgcolor="#ffffff"';        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.='>';
   }    }
   $body_tag_start.='>';  
   return ($result,$head_tag_start,$body_tag_start);    return ($result,$head_tag_start,$body_tag_start);
 }  }
   
Line 147  ENDCHECKOUT Line 162  ENDCHECKOUT
 sub start_problem {  sub start_problem {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
     # meta is called from lonpublisher, which doesn't uses the normal
     # lonhomework method of parsing the file which means that inputtags 
     # won't get reset
     if ( $Apache::inputtags::part ne '' && $target != 'meta' ) {
       &Apache::lonxml::error('Only one problem allowed in a .problem file');
       my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[-1]);
       return '';
     }
 #intialize globals  #intialize globals
   $Apache::inputtags::part='0';    $Apache::inputtags::part='0';
   @Apache::inputtags::responselist = ();    @Apache::inputtags::responselist = ();
   @Apache::inputtags::previous=();    @Apache::inputtags::previous=();
   &initialize_storage();    if ($target ne 'analyze') {
   if ($target eq 'web') {      &initialize_storage();
     &Apache::lonhomework::showhash(%Apache::lonhomework::history);      if ($target eq 'web') {
         &Apache::lonhomework::showhash(%Apache::lonhomework::history);
       }
       $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
       &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
   }    }
   $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 '') {    if ($Apache::lonhomework::type eq '') {
     my $uri=$ENV{'request.uri'};      my $uri=$ENV{'request.uri'};
     if ($uri=~/\.(\w+)$/) {      if ($uri=~/\.(\w+)$/) {
Line 274  sub start_problem { Line 299  sub start_problem {
     $result=$token->[4];      $result=$token->[4];
     $result.=&Apache::edit::handle_insert();      $result.=&Apache::edit::handle_insert();
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
       $result .= '\begin{document}\noindent\textbf{Problem.}\newline';        $result .= '\begin{document} ';
   } else {    } else {
     # page_start returned a starting result, delete it if we don't need it      # page_start returned a starting result, delete it if we don't need it
     $result = '';      $result = '';
Line 287  sub end_problem { Line 312  sub end_problem {
   my $result='';    my $result='';
   my $status=$Apache::inputtags::status['-1'];    my $status=$Apache::inputtags::status['-1'];
   if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) {    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') {  
       # 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 ( $target eq 'web' && $Apache::inputtags::part eq '0') {      } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0') {
Line 319  sub end_problem { Line 343  sub end_problem {
     &Apache::lonxml::debug("in end_problem with $target, 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" />';
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
       $result .= '\end{document}';        $result .= '\vskip 0.5mm\noindent\makebox[9.0cm][b]{\hrulefill}\end{document}';
   }    }
   return $result;    return $result;
 }  }
Line 415  sub end_while { Line 439  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 $result;
   if ($target eq 'answer' || $target eq 'grade' || $target eq 'web') {    if ($target eq 'answer' || $target eq 'grade' || $target eq 'web') {
     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);
Line 439  sub start_randomlist { Line 464  sub start_randomlist {
       #  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);
     &Apache::structuretags::shuffle(\@idx_arr);      &Apache::structuretags::shuffle(\@idx_arr);
     my $bodytext = '';      my $bodytext = '';
     for(0 .. $#randomlist) {      my $show=$#randomlist;
       my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
       $showarg--;
       if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }
       for(0 .. $show) {
       $bodytext .= "$randomlist[ $idx_arr[$_] ]";        $bodytext .= "$randomlist[ $idx_arr[$_] ]";
     }      }
     &Apache::lonxml::newparser($parser,\$bodytext);      &Apache::lonxml::newparser($parser,\$bodytext);
     } elsif ($target eq 'edit' ) {
       $result .= &Apache::edit::tag_start($target,$token);
       $result .= &Apache::edit::text_arg('Maximum Tags to Show:','show',$token,5);
       $result .= &Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified' ) {
       my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
    'show');
       if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }    }
   return "";    return $result;
 }  }
   
 sub shuffle {  sub shuffle {
Line 465  sub shuffle { Line 501  sub shuffle {
 }  }
   
 sub end_randomlist {  sub end_randomlist {
   return '';    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
     if ($target eq 'edit' ) {
       $result=&Apache::edit::tag_end($target,$token,'End Randomly Parsed Block');
     }
     return $result;
 }  }
   
 sub start_part {  sub start_part {
Line 585  sub end_startouttext { Line 626  sub end_startouttext {
     $result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td>      $result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td>
 <td>Delete:".  <td>Delete:".
   &Apache::edit::deletelist($target,$token)    &Apache::edit::deletelist($target,$token)
   ."</td>      ."</td>
 <td>".  <td>".
   &Apache::edit::insertlist($target,$token).    &Apache::edit::insertlist($target,$token).
     "</td>      &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n".
 </tr><tr><td colspan=\"3\">\n".        &Apache::edit::editfield($token->[1],$text,"",50,4);
  &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']);
     $result='<startouttext />'.&Apache::edit::modifiedfield();      $result='<startouttext />'.&Apache::edit::modifiedfield();
   }    }
     if ($target eq 'tex') {
         $result .= '\noindent ';
     }
   return $result;    return $result;
 }  }
 sub start_endouttext {  sub start_endouttext {
Removed from v.1.77  
changed lines
  Added in v.1.90

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