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

Diff for /loncom/homework/structuretags.pm between versions 1.179 and 1.203

version 1.179, 2003/06/04 14:49:20 version 1.203, 2003/08/13 17:54:12
Line 38  use Apache::File(); Line 38  use Apache::File();
 use Apache::lonmenu;  use Apache::lonmenu;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));      &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext',
   'simpleeditbutton','definetag'));
 }  }
   
 sub start_web {  sub start_web {
Line 56  sub end_web { Line 57  sub end_web {
   
 sub start_tex {  sub start_tex {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result='';
     my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);      my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
     if ($target eq 'tex') {      if ($target eq 'tex') {
  return $bodytext.' ';   return $bodytext.' ';
     }      }
     return '';      return $result;;
 }  }
   
 sub end_tex {  sub end_tex {
Line 89  sub page_start { Line 91  sub page_start {
     'onUnload="'.&Apache::lonmenu::unloadevents().'" ';      'onUnload="'.&Apache::lonmenu::unloadevents().'" ';
  my $background=&Apache::lonxml::get_param('background',$parstack,   my $background=&Apache::lonxml::get_param('background',$parstack,
   $safeeval);    $safeeval);
    if ($ENV{'browser.imagesuppress'} eq 'on') { $background=''; }
  if ($background) {   if ($background) {
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=      $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
  $background;   $background;
Line 96  sub page_start { Line 99  sub page_start {
  } else {   } else {
     my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,      my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
    $safeeval);     $safeeval);
     if ($bgcolor) {      if (($bgcolor) && ($ENV{'browser.blackwhite'} ne 'on')) {
  $body_tag_start.='bgcolor="'.$bgcolor.'" ';   $body_tag_start.='bgcolor="'.$bgcolor.'" ';
     } else {      } else {
  $body_tag_start.='bgcolor="#ffffff"';   $body_tag_start.='bgcolor="#ffffff"';
     }      }
  }   }
    if ($ENV{'browser.fontenhance'} eq 'on') {
       $body_tag_start.=' style="font-size: x-large;" ';
    }
  $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);   $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
  if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {   if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
     my ($symb,undef,undef,undef,$publicuser)=      my ($symb,undef,undef,undef,$publicuser)=
Line 148  sub setup_rndseed { Line 154  sub setup_rndseed {
  }   }
  if ($ENV{'form.resetdata'} eq 'New Problem Variation' ||   if ($ENV{'form.resetdata'} eq 'New Problem Variation' ||
     $ENV{'form.newrandomization'} eq 'New Randomization') {      $ENV{'form.newrandomization'} eq 'New Randomization') {
     $rndseed=time;      srand(time);
     if ($rndseed eq $ENV{'form.rndseed'}) {      $rndseed=int(rand(2100000000));
  srand($rndseed);  
  $rndseed=int(rand(1000000000));  
     }  
     $ENV{'form.rndseed'}=$rndseed;      $ENV{'form.rndseed'}=$rndseed;
       delete($ENV{'form.resetdata'});
       delete($ENV{'form.newrandomization'});
  }   }
    if (defined($rndseed) && $rndseed ne int($rndseed)) {
      $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));
           }
  &Apache::lonxml::debug("Setting rndseed to $rndseed");   &Apache::lonxml::debug("Setting rndseed to $rndseed");
  &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);   &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
     }      }
Line 263  ENDCHECKOUT Line 271  ENDCHECKOUT
 sub start_problem {  sub start_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
     $Apache::lonhomework::parsing_a_problem=1;      if ( $Apache::inputtags::part ne '' ||
     # meta is called from lonpublisher, which doesn't uses the normal   $Apache::lonhomework::parsing_a_problem) {
     # lonhomework method of parsing the file which means that inputtags    &Apache::lonxml::error('Only one <problem> allowed in a .problem file');
     # won't get reset   #my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
     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);  
  return '';   return '';
     }      }
   
       $Apache::lonhomework::parsing_a_problem=1;
 #initialize globals  #initialize globals
     $Apache::inputtags::part='0';      $Apache::inputtags::part='0';
     @Apache::inputtags::partlist=('0');      @Apache::inputtags::partlist=('0');
Line 345  sub start_problem { Line 352  sub start_problem {
     '<input type="submit" name="resetdata"      '<input type="submit" name="resetdata"
                              value="New Problem Variation" />'.                               value="New Problem Variation" />'.
     '<input type="hidden" name="username"      '<input type="hidden" name="username"
                              value="'.$ENV{'form.username'}.'" />';                               value="'.$ENV{'form.username'}.'" /> <br />';
  }   }
  ($status,$accessmsg) = &Apache::lonhomework::check_access('0');   ($status,$accessmsg) = &Apache::lonhomework::check_access('0');
  push (@Apache::inputtags::status,$status);   push (@Apache::inputtags::status,$status);
Line 388  sub start_problem { Line 395  sub start_problem {
               $body_tag_start \n $form_tag_start".                $body_tag_start \n $form_tag_start".
   '<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.= &problem_web_to_edit_header($rndseed);      $result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
  }   }
  # if we are viewing someone else preserve that info   # if we are viewing someone else preserve that info
  if (defined $ENV{'form.grade_symb'}) {   if (defined $ENV{'form.grade_symb'}) {
Line 404  sub start_problem { Line 411  sub start_problem {
     }      }
  } elsif ($target eq 'tex') {   } elsif ($target eq 'tex') {
     my $startminipage = '';      my $startminipage = '';
     if ($ENV{'form.problem_split'} ne 'yes') {      if (not $ENV{'form.problem_split'}=~/yes/) {
  $startminipage = '\begin{minipage}{\textwidth}';   $startminipage = '\begin{minipage}{\textwidth}';
     }      }
     my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);      my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
Line 436  sub start_problem { Line 443  sub start_problem {
     my $due_file_content = $due_file_content[$#due_file_content];      my $due_file_content = $due_file_content[$#due_file_content];
     chomp $due_file_content;      chomp $due_file_content;
     my $name_of_resourse= &get_resource_name($parstack,$safeeval);      my $name_of_resourse= &get_resource_name($parstack,$safeeval);
       if (not $name_of_resourse=~/\S+/) {
    $name_of_resourse=$ENV{'request.uri'};
    $name_of_resourse=~/\/([^\/]+)$/;
    $name_of_resourse=$1;
       }
     if ($due_file_content ne $duedate) {      if ($due_file_content ne $duedate) {
  $temp_file = Apache::File->new('>'.$filename);   $temp_file = Apache::File->new('>'.$filename);
  print $temp_file "$duedate\n";   print $temp_file "$duedate\n";
  if (not $ENV{'request.symb'} =~ m/\.page_/) {   if (not $ENV{'request.symb'} =~ m/\.page_/) {
     if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {      if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
  $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage;   $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage;
     } else {      } else {
  $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage;   $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \noindent \vskip 1 mm \noindent'.$startminipage;
  if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}   if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
     }      }
  } else {   } else {
Line 451  sub start_problem { Line 463  sub start_problem {
  }   }
     } else {      } else {
  if (not $ENV{'request.symb'} =~ m/\.page_/) {   if (not $ENV{'request.symb'} =~ m/\.page_/) {
     $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage;      $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \noindent \vskip 1 mm\noindent'.$startminipage;
     if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}      if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
  } else {   } else {
     $result .= '\vskip 1mm \\\\\\\\';      $result .= '\vskip 1mm \\\\\\\\';
Line 502  sub end_problem { Line 514  sub end_problem {
  }   }
     } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||      } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
      $status eq 'UNCHECKEDOUT' ) {       $status eq 'UNCHECKEDOUT' ) {
  if ($target ne 'tex') {   if ($target ne 'tex' &&
       $ENV{'form.answer_output_mode'} ne 'tex') {
     $result.="</body>\n";      $result.="</body>\n";
  }   }
     }      }
Line 510  sub end_problem { Line 523  sub end_problem {
  $result.=&Apache::lonxml::xmlend();   $result.=&Apache::lonxml::xmlend();
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $endminipage = '';   my $endminipage = '';
  if ($ENV{'form.problem_split'} ne 'yes') {   if (not $ENV{'form.problem_split'}=~/yes/) {
     $endminipage = '\end{minipage}';      $endminipage = '\end{minipage}';
  }   }
  $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';   $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
Line 592  sub end_library { Line 605  sub end_library {
     return $result;      return $result;
 }  }
   
 sub start_block {  sub start_definetag {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
     my $result;      my $result;
   
       my $name = $token->[2]->{'name'};
       my $skip=&Apache::lonxml::get_all_text("/definetag",$parser);
       if ($name=~/^\//) {
    $result=
    '<br /><table bgcolor="#FFBBBB"><tr><th>END <tt>'.$name.'</tt></th></tr>';
       } else {
    $result=
    '<br /><table bgcolor="#BBFFBB"><tr><th>BEGIN <tt>'.$name.'</tt></th></tr>';
       }
       $skip=~s/\</\&lt\;/gs;
       $skip=~s/\>/\&gt\;/gs;
       $result.='<tr><td><pre>'.$skip.'</pre></td></tr></table>';
       return $result;
   }
   
   sub end_definetag {
       return '';
   }
   
   sub start_block {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
       my $result;
   
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  my $code = $token->[2]->{'condition'};   my $code = $token->[2]->{'condition'};
  if ($code) {   if (defined($code)) {
     if (!$Apache::lonxml::default_homework_loaded) {      if (!$Apache::lonxml::default_homework_loaded) {
  &Apache::lonxml::default_homework_load($safeeval);   &Apache::lonxml::default_homework_load($safeeval);
     }      }
Line 610  sub start_block { Line 647  sub start_block {
     $result='1';      $result='1';
  }   }
  if ( ! $result ) {   if ( ! $result ) {
     my $skip=&Apache::lonxml::get_all_text("/block",$parser);      my $skip=&Apache::lonxml::get_all_text("/block",$parser,$style);
     &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");      &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
  }   }
  $result='';   $result='';
Line 637  sub end_block { Line 674  sub end_block {
 }  }
   
 sub start_languageblock {  sub start_languageblock {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
     my $result;      my $result;
   
Line 659  sub start_languageblock { Line 696  sub start_languageblock {
             }              }
  }   }
  if ( ! $result ) {   if ( ! $result ) {
     my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser);      my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser,
      $style);
     &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");      &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
  }   }
  $result='';   $result='';
Line 689  sub end_languageblock { Line 727  sub end_languageblock {
 }  }
   
 sub start_instructorcomment {  sub start_instructorcomment {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
     my $result;      my $result;
   
Line 697  sub start_instructorcomment { Line 735  sub start_instructorcomment {
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
         $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);          $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);
  if ( ! $result ) {   if ( ! $result ) {
     my $skip=&Apache::lonxml::get_all_text("/instructorcomment",$parser);      my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
      $parser,$style);
     &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");      &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
  }   }
  $result='';   $result='';
Line 893  sub start_part { Line 932  sub start_part {
  if ( $target eq "web" ) {   if ( $target eq "web" ) {
     $result="<br />Part is not open to be viewed. It $accessmsg<br />";      $result="<br />Part is not open to be viewed. It $accessmsg<br />";
  } elsif ( $target eq 'tex' ) {   } elsif ( $target eq 'tex' ) {
     $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}";      if (not $ENV{'form.problem_split'}=~/yes/) {
    $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}";
       } else {
    $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\";
       }
  }   }
     } else {      } else {
  if ($target eq 'tex') {   if ($target eq 'tex') {
     $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';      if (not $ENV{'form.problem_split'}=~/yes/) {
    $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
       }
     my $weight = &Apache::lonnet::EXT("resource.$id.weight");      my $weight = &Apache::lonnet::EXT("resource.$id.weight");
     if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';}      if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';}
  }   }
Line 934  sub end_part { Line 979  sub end_part {
  $target);   $target);
  if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}   if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
  $result=$gradestatus;   $result=$gradestatus;
       } elsif ($target eq 'edit') {
    $result=&Apache::edit::end_table();
     }      }
     pop @Apache::inputtags::status;      pop @Apache::inputtags::status;
     $Apache::inputtags::part='';      $Apache::inputtags::part='';
Line 1028  sub end_startouttext { Line 1075  sub end_startouttext {
                  &Apache::edit::insertlist($target,$token).                   &Apache::edit::insertlist($target,$token).
  &Apache::edit::end_row().   &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n"                   &Apache::edit::start_spanning_row()."\n"
  .'<table><tr><td>'.   . &Apache::loncommon::helpLatexCheatsheet () .
  &Apache::loncommon::help_open_topic("Greek_Symbols",  
      'Greek Symbols',  
      undef,undef,600)  
  .'</td><td>'.  
  &Apache::loncommon::help_open_topic("Other_Symbols",  
      'Other Symbols',  
      undef,undef,600)  
  .'</td></tr></table>'.  
  &Apache::edit::editfield($token->[1],$text,"",80,4);   &Apache::edit::editfield($token->[1],$text,"",80,4);
     }      }
     if ($target eq 'modified') {      if ($target eq 'modified') {
Line 1080  sub delete_startouttext { Line 1119  sub delete_startouttext {
     return 1;      return 1;
 }  }
   
   sub start_simpleeditbutton {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result='';
       if (($target eq 'web') &&
           (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
           my $url=$ENV{'REQUEST_URI'};
           $url=~s/\?.*$//;
    $result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
                   '<a href="'.$url.'/smpedit">Simple Problem Editor</a> - Note: it can take up to 10 minutes for changes to take effect for all users.'.
   &Apache::loncommon::help_open_topic('Caching').'</td></tr></table><br />';
       }
       return $result;
   }
   
   sub end_simpleeditbutton {
       return '';
   }
   
 1;  1;
 __END__  __END__
Removed from v.1.179  
changed lines
  Added in v.1.203

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