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

Diff for /loncom/homework/structuretags.pm between versions 1.71 and 1.101

version 1.71, 2001/10/30 19:18:15 version 1.101, 2002/07/03 15:36:40
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
   #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 # 2/19 Guy  # 2/19 Guy
 # 6/26/2001 fixed extra web display at end of <web></web> tags  # 6/26/2001 fixed extra web display at end of <web></web> tags
 # 8/17,8/18,8/20 Gerd Kortemeyer  # 8/17,8/18,8/20 Gerd Kortemeyer
Line 8  package Apache::structuretags; Line 33  package Apache::structuretags;
   
 use strict;  use strict;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::File();
   
 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 42  sub end_tex { Line 68  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 68  sub initialize_storage { Line 109  sub initialize_storage {
   my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
   if ($ENV{'request.state'} eq 'construct') {    if ($ENV{'request.state'} eq 'construct') {
     %Apache::lonhomework::history=      %Apache::lonhomework::history=
       &Apache::lonnet::restore($ENV{'request.uri'},'nohist_construct',$domain,$name);        &Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name);
     my ($temp)=keys %Apache::lonhomework::history ;      my ($temp)=keys %Apache::lonhomework::history ;
     &Apache::lonxml::debug("Return message of $temp");      &Apache::lonxml::debug("Return message of $temp");
   } else {    } else {
Line 90  sub finalize_storage { Line 131  sub finalize_storage {
   if ( $temp ne '' ) {    if ( $temp ne '' ) {
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();      my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
     if ($ENV{'request.state'} eq 'construct') {      if ($ENV{'request.state'} eq 'construct') {
       $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,        $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,
       $ENV{'request.uri'},'nohist_construct',        $ENV{'request.uri'},'',$domain,$name);
       $domain,$name);  
       &Apache::lonxml::debug('Construct Store return message:'.$result);        &Apache::lonxml::debug('Construct Store return message:'.$result);
     } else {      } else {
       $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,        $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
Line 111  permanent record is left in the system.< Line 151  permanent record is left in the system.<
 <font color=red>  <font color=red>
 Checking out resources is subject to course policies, and may exclude future  Checking out resources is subject to course policies, and may exclude future
 credit even if done erroneously.<p />  credit even if done erroneously.<p />
 </font>    </font>
 <form method=post>  <form name="checkout" method="POST" action="$ENV{'request.uri'}">
 <input type=button name="doescheckout"   <input type="hidden" name="doescheckout" value="yes" />
 value="Check out Exam for Viewing"   <input type="button" name="checkoutbutton" value="Check out Exam for Viewing" onClick="javascript:if (confirm('Check out Exam?')) { document.checkout.submit(); }" />
 onClick="if (confirm('Check out Exam?')) { this.form.submit(); }" />  
 </form>  </form>
 ENDCHECKOUT  ENDCHECKOUT
 }  }
Line 123  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') {
   $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');      &initialize_storage();
   &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");      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:");
     }
   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 150  sub start_problem { Line 202  sub start_problem {
   #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,$head_tag_start,$body_tag_start)=    my ($result,$head_tag_start,$body_tag_start)=
     &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);      &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
     if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';}
   
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {  
     #handle exam checkout      #handle exam checkout
     if ($Apache::lonhomework::type eq 'exam') {      if ($Apache::lonhomework::type eq 'exam') {
       my $token=$Apache::lonhomework::history{"resource.0.outtoken"};        my $token=$Apache::lonhomework::history{"resource.0.outtoken"};
Line 210  sub start_problem { Line 262  sub start_problem {
   $result.=    $result.=
     '<input type="hidden" name="problemmode" value="View" />      '<input type="hidden" name="problemmode" value="View" />
              <input type="submit" name="problemmode" value="Edit" />               <input type="submit" name="problemmode" value="Edit" />
                <input type="submit" name="problemmode" value="EditXML" />
              Random Seed:<input type="text" name="rndseed" width="10" value="'.               Random Seed:<input type="text" name="rndseed" width="10" value="'.
        $rndseed.'" /><hr />';         $rndseed.'" />
                <input type="submit" name="changerandseed" value="Change" />
                <input type="submit" name="resetdata" value="Reset Submissions" />
                <input type="checkbox" name="showallfoils" ';
     if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
     $result.= ' /> Show All Foils
                <hr />';
  }   }
  # 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 225  sub start_problem { Line 284  sub start_problem {
  $result.=$head_tag_start.   $result.=$head_tag_start.
   "<title>$name</title></head>\n$body_tag_start\n";    "<title>$name</title></head>\n$body_tag_start\n";
       }        }
       } elsif ($target eq 'tex') {
    my $id = $Apache::inputtags::part;
    my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); 
    $duedate = POSIX::strftime("%c",localtime($duedate));
    my $temp_file;
    my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
           if (-e $filename) {
       $temp_file = Apache::File->new($filename); 
    } else {
       $temp_file = Apache::File->new('>>'.$filename); 
    }
    my @due_file_content = <$temp_file>;
    my $due_file_content = $due_file_content[$#due_file_content];
           chomp $due_file_content;
           if ($due_file_content ne $duedate) {    
    $temp_file = Apache::File->new('>'.$filename); 
       print $temp_file "$duedate\n";    
       if (not $ENV{'request.symb'} =~ m/\.page_/) {
    $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm';
       } else {
    $result .= '\parbox{\minipagewidth}{\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
       } 
    } else {
       if (not $ENV{'request.symb'} =~ m/\.page_/) {
    $result .= '\begin{document} \noindent \vskip 1 mm';
       } else {
    $result .= '\parbox{\minipagewidth}{\vskip 1mm \\\\\\\\';
       } 
    }
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=$head_tag_start."</head>".$body_tag_start.      $result.=$head_tag_start."</head>".$body_tag_start.
Line 232  sub start_problem { Line 320  sub start_problem {
  $ENV{'request.uri'}.'">   $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="Discard Edits and View" />
          <input type="submit" name="problemmode" value="EditXML" />
        <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 />         <input type="submit" name="submit" value="Submit Changes" />
          <input type="submit" name="submit" value="Submit Changes and View" /><br />
       ';        ';
     my $temp=&Apache::edit::insertlist($target,$token);      my $temp=&Apache::edit::insertlist($target,$token);
     $result.=$temp;      $result.=$temp;
Line 253  sub end_problem { Line 343  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' && 
         $status ne 'UNCHECKEDOUT') {
       # 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);
Line 268  sub end_problem { Line 358  sub end_problem {
        ) {         ) {
       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' ||
          $status eq 'UNCHECKEDOUT' ) {
  $result.="</body>\n";   $result.="</body>\n";
       }        }
       $result.=&Apache::lonxml::xmlend();        $result.=&Apache::lonxml::xmlend();
Line 283  sub end_problem { Line 374  sub end_problem {
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     &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 and Edit" />';
       $result.='<input type="submit" name="submit" value="Submit Changes and View" />';
     } elsif ($target eq 'tex') {
         $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
         if (not $ENV{'request.symb'} =~ m/\.page_/) {
     $result .= '\end{document} ';
         } else {
     $result .= '} ';
         }
   }    }
   return $result;    return $result;
 }  }
Line 379  sub end_while { Line 478  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 403  sub start_randomlist { Line 503  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 429  sub shuffle { Line 540  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 {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
   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; }    if ($id eq '') { $id = $Apache::lonxml::curdepth; }
   $Apache::inputtags::part=$id;    $Apache::inputtags::part=$id;
Line 441  sub start_part { Line 558  sub start_part {
   @Apache::inputtags::previous=();    @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' || $target eq 'answer') {    } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
     my ($status,$accessmsg) = &Apache::lonhomework::check_access($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.'";';
Line 450  sub start_part { Line 567  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 $accessmsg<br />";   $result="<br />Part is not open to be viewed. It $accessmsg<br />";
         } elsif ( $target eq 'tex' ) {
    $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\";
         }
       } else {
         if ($target eq 'tex') {
    $result='\vskip 0 mm';
       }        }
     }      }
   }    }
   return '';    return $result;
 }  }
   
 sub end_part {  sub end_part {
Line 549  sub end_startouttext { Line 672  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.71  
changed lines
  Added in v.1.101

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