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

Diff for /loncom/homework/structuretags.pm between versions 1.114 and 1.156

version 1.114, 2002/09/16 20:40:38 version 1.156, 2003/03/14 23:23:45
Line 29 Line 29
 # 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
   
   
 package Apache::structuretags;   package Apache::structuretags; 
   
 use strict;  use strict;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::File();  use Apache::File();
   use Apache::lonmenu;
   
 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'));
Line 42  BEGIN { Line 44  BEGIN {
   
 sub start_web {  sub start_web {
   my ($target,$token,$tagstack,$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);
   if ($target eq 'web') {    if ($target eq 'web') {
     return $bodytext;      return $bodytext;
   }     } 
Line 55  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 $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);    my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
   if ($target eq 'tex') {    if ($target eq 'tex') {
       return $bodytext.' ';        return $bodytext.' ';
   }    }
Line 80  sub page_start { Line 82  sub page_start {
   if (!defined($found{'html'})) {    if (!defined($found{'html'})) {
     $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,      $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,
    $parser,$safeeval);     $parser,$safeeval);
     $head_tag_start='<head>'.&Apache::lonxml::registerurl(undef,$target);      $head_tag_start='<head>'.&Apache::lonmenu::registerurl(undef,$target);
   }    }
   my $body_tag_start;    my $body_tag_start;
   if (!defined($found{'body'})) {    if (!defined($found{'body'})) {
     $body_tag_start='<body onLoad="'.&Apache::lonxml::loadevents().'" '.      $body_tag_start='<body onLoad="'.&Apache::lonmenu::loadevents().'" '.
       'onUnload="'.&Apache::lonxml::unloadevents().'" ';        'onUnload="'.&Apache::lonmenu::unloadevents().'" ';
     my $background=&Apache::lonxml::get_param('background',$parstack,$safeeval);      my $background=&Apache::lonxml::get_param('background',$parstack,$safeeval);
     if ($background) {      if ($background) {
       $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=        $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
Line 99  sub page_start { Line 101  sub page_start {
  $body_tag_start.='bgcolor="#ffffff"';   $body_tag_start.='bgcolor="#ffffff"';
       }        }
     }      }
     $body_tag_start.='>';      $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
       if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
    my ($symb)=&Apache::lonxml::whichuser();
    if ($symb eq '') {
       my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
       $help="Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored $help<br />";
       $body_tag_start.=$help;
    }
       }
   }    }
   my $form_tag_start;    my $form_tag_start;
   if (!defined($found{'form'})) {    if (!defined($found{'form'})) {
Line 109  sub page_start { Line 119  sub page_start {
   return ($result,$head_tag_start,$body_tag_start,$form_tag_start);    return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
 }  }
   
   #use Time::HiRes();
 sub get_resource_name {  sub get_resource_name {
   my ($parstack,$safeeval)=@_;    my ($parstack,$safeeval)=@_;
   my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);    my $name=&Apache::lonnet::gettitle();
   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 129  sub setup_rndseed { Line 140  sub setup_rndseed {
       $rndseed=time;        $rndseed=time;
       $ENV{'form.rndseed'}=$rndseed;        $ENV{'form.rndseed'}=$rndseed;
     }      }
       &Apache::lonxml::debug("Setting rndseed to $rndseed");
     &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);      &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
   }    }
   return $rndseed;    return $rndseed;
Line 140  sub problem_edit_header { Line 152  sub problem_edit_header {
        <input type="submit" name="problemmode" value="Discard Edits and View" />         <input type="submit" name="problemmode" value="Discard Edits and View" />
        <input type="submit" name="problemmode" value="EditXML" />         <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" />         <input type="submit" name="submit" value="Submit Changes and Edit" />
        <input type="submit" name="submit" value="Submit Changes and View" /><br />         <input type="submit" name="submit" value="Submit Changes and View" /><br /><p>&nbsp;</p><table border="0"><tr><td bgcolor="#DDDDDD">
       ';        ';
 }  }
   
 sub problem_edit_footer {  sub problem_edit_footer {
   return '<br /><input type="submit" name="submit" value="Submit Changes and Edit" />    return '</td></tr></table><br /><input type="submit" name="submit" value="Submit Changes and Edit" />
     <input type="submit" name="submit" value="Submit Changes and View" />';      <input type="submit" name="submit" value="Submit Changes and View" />';
 }  }
   
Line 161  sub problem_web_to_edit_header { Line 173  sub problem_web_to_edit_header {
              <input type="submit" name="resetdata" value="Reset Submissions" />               <input type="submit" name="resetdata" value="Reset Submissions" />
              <input type="checkbox" name="showallfoils" ';               <input type="checkbox" name="showallfoils" ';
   if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }    if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
   $result.= ' /> Show All Foils    $result.= ' />&nbsp;Show&nbsp;All&nbsp;Foils
              <hr />';               <hr />';
     my $numtoanalyze=$ENV{'form.numtoanalyze'};
     if (!$numtoanalyze) { $numtoanalyze=100; }
     $result.= '<input type="submit" name="problemmode" value="Answer Distribution" />
                <input type="text" name="numtoanalyze" value="'.
          $numtoanalyze.'" size="5" /> <hr />';
     return $result;
 }  }
   
 sub initialize_storage {  sub initialize_storage {
Line 223  ENDCHECKOUT Line 241  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;
   # meta is called from lonpublisher, which doesn't uses the normal    # meta is called from lonpublisher, which doesn't uses the normal
   # lonhomework method of parsing the file which means that inputtags     # lonhomework method of parsing the file which means that inputtags 
   # won't get reset    # won't get reset
   if ( $Apache::inputtags::part ne '' && $target != 'meta' ) {    if ( $Apache::inputtags::part ne '' && $target != 'meta' ) {
     &Apache::lonxml::error('Only one problem allowed in a .problem file');      &Apache::lonxml::error('Only one problem allowed in a .problem file');
     my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[-1]);      my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
     return '';      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=();
     @Apache::inputtags::previous_version=();
     $Apache::structuretags::printanswer='No';
   if ($target ne 'analyze') {    if ($target ne 'analyze') {
     &initialize_storage();      &initialize_storage();
     if ($target eq 'web') {      if ($target eq 'web') {
Line 265  sub start_problem { Line 286  sub start_problem {
     &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 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';}
   
     if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
     #handle exam checkout      #handle exam checkout
     if ($Apache::lonhomework::type eq 'exam') {      if ($Apache::lonhomework::type eq 'exam') {
Line 283  sub start_problem { Line 305  sub start_problem {
     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);
       &Apache::lonxml::debug("Got $status");
     if (( $status eq 'CLOSED' ) ||      if (( $status eq 'CLOSED' ) ||
         ( $status eq 'UNCHECKEDOUT') ||          ( $status eq 'UNCHECKEDOUT') ||
         ( $status eq 'BANNED')) {          ( $status eq 'BANNED') ||
       my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);          ( $status eq 'UNAVAILABLE')) {
         my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
       if ( $target eq "web" ) {        if ( $target eq "web" ) {
  $result.= $head_tag_start.'</head>';   $result.= $head_tag_start.'</head>';
         my $msg=$body_tag_start.          my $msg=$body_tag_start;
     '<h1>Not open to be viewed</h1>';   if ($status eq 'UNAVAILABLE') {
       $result.='<h1>Unable to determine if this resource is open due to network problems. Please try again later.</h1>';
    } else {
       $result.='<h1>Not open to be viewed</h1>';
    }
         if ($status eq 'CLOSED') {          if ($status eq 'CLOSED') {
     $msg.='The problem '.$accessmsg;      $msg.='The problem '.$accessmsg;
  } elsif ($status eq 'UNCHECKEDOUT') {   } elsif ($status eq 'UNCHECKEDOUT') {
             $msg.=&checkout_msg;              $msg.=&checkout_msg;
         }          }
  $result.=$msg.'<br />';   $result.=$msg.'<br />';
         } elsif ($target eq 'tex') {
     $result.='\begin{document}\noindent \vskip 1 mm  \begin{minipage}{\textwidth}\vskip 0 mm';
    if ($status eq 'UNAVAILABLE') {
       $result.='Unable to determine if this resource is open due to network problems. Please try again later.\vskip 0 mm ';
    } else {
       $result.="Problem is not open to be viewed. It $accessmsg \\vskip 0 mm ";
    }
       }        }
     } elsif ($target eq 'web') {      } elsif ($target eq 'web') {
       my $name= &get_resource_name($parstack,$safeeval);        my $name= &get_resource_name($parstack,$safeeval);
Line 316  sub start_problem { Line 351  sub start_problem {
   }    }
  }   }
       } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'        } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'
        || $status eq 'CLOSED') {         || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE') {
  $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";
       }        }
Line 328  sub start_problem { Line 363  sub start_problem {
  }   }
  $Apache::lonhomework::name=$name;   $Apache::lonhomework::name=$name;
  my $id = $Apache::inputtags::part;   my $id = $Apache::inputtags::part;
    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
    my $allkeys = &Apache::lonnet::metadata($ENV{'request.uri'},'keys');
    my @allkeys = split /,/,$allkeys;
           my $allow_print_points = 0;
    foreach my $partial_key (@allkeys) {
       if ($partial_key=~m/weight/) {
    $allow_print_points++;
       }
    }
  my $duedate = &Apache::lonnet::EXT("resource.$id.duedate");    my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); 
  $duedate = POSIX::strftime("%c",localtime($duedate));   $duedate = POSIX::strftime("%c",localtime($duedate));
  my $temp_file;   my $temp_file;
Line 340  sub start_problem { Line 384  sub start_problem {
  my @due_file_content = <$temp_file>;   my @due_file_content = <$temp_file>;
  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);
         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/) {   if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
     $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm';      $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 \begin{minipage}{\textwidth}';
  } else {   } else {
     $result .= '\begin{document} \noindent \vskip 1 mm';      $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\begin{minipage}{\textwidth}';
       if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
  }   }
     } else {      } else {
  $result .= '\parbox{\minipagewidth}{\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';   $result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
     }       } 
  } else {   } else {
     if (not $ENV{'request.symb'} =~ m/\.page_/) {      if (not $ENV{'request.symb'} =~ m/\.page_/) {
  $result .= '\begin{document} \noindent \vskip 1 mm';   $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\begin{minipage}{\textwidth}';
    if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
     } else {      } else {
  $result .= '\parbox{\minipagewidth}{\vskip 1mm \\\\\\\\';   $result .= '\vskip 1mm \\\\\\\\';
     }       } 
  }   }
     }      }
Line 380  sub end_problem { Line 427  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' || $target eq 'tex') {    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
     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' || $target eq 'tex') && $Apache::inputtags::part eq '0' &&       } elsif ( ($target eq 'web' || $target eq 'tex') && $Apache::inputtags::part eq '0' && 
       $status ne 'UNCHECKEDOUT') {        $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
       my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part);        my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
       #FIXME this is ugly we should just generate tex in inputtags        if ($Apache::lonhomework::type ne 'exam') {$result.= $gradestatus;}
       if ($target eq 'tex') { $gradestatus=&html_to_tex($gradestatus); }  
       $result.= $gradestatus;  
     }      }
     if (      if (
  (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||   (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
Line 406  sub end_problem { Line 451  sub end_problem {
       $result.="</body>\n";        $result.="</body>\n";
   }    }
       }        }
       if ($target ne 'tex') {        if ($target eq 'web') {
   $result.=&Apache::lonxml::xmlend();    $result.=&Apache::lonxml::xmlend();
       } else {        } elsif ($target eq 'tex') {
       $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';    $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
       if (not $ENV{'request.symb'} =~ m/\.page_/) {    if (not $ENV{'request.symb'} =~ m/\.page_/) {
   $result .= '\end{document} ';        $result .= '\end{minipage}\end{document} ';
       } else {    } else {
   $result .= '} ';        $result .= '';
       }    }
       }        }
     }      }
     if ($target eq 'grade') {       if ($target eq 'grade') { 
       &Apache::lonhomework::showhash(%Apache::lonhomework::results);        &Apache::lonhomework::showhash(%Apache::lonhomework::results);
       &finalize_storage();        &finalize_storage();
     }      }
       if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') ) {
    $result.='</html>'; #normally we get it from xmlend, but in CSTR
                               # we always show answer mode too.
       }
   } elsif ($target eq 'meta') {    } elsif ($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 428  sub end_problem { Line 477  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 = &problem_edit_footer();      $result = &problem_edit_footer();
   }     }
   
     undef(%Apache::lonhomework::history);
     undef(%Apache::lonhomework::results);
     undef($Apache::inputtags::part);
     undef($Apache::lonhomework::parsing_a_problem);
   
   return $result;    return $result;
 }  }
   
 #FIXME I am ugly shoot me  
 sub html_to_tex {  
   my ($string)=@_;  
   $string =~ s/<table>//;  
   $string =~ s/<\/table>//;  
   $string =~ s/<tr([^>]*)>//g;  
   $string =~ s/<\/tr>//g;  
   $string =~ s/<td([^>]*)>//g;  
   $string =~ s/<\/td>//g;  
   $string =~ s/<b>/\\textbf{/g;  
   $string =~ s/<\/b>/}/g;  
   $string =~ s/<br \/>/\\vskip 0 mm /g;  
   $string =~ s/<input([^>]*)>//g;  
   return $string;  
 }  
   
 sub start_library {  sub start_library {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
Line 489  sub end_library { Line 529  sub end_library {
 }  }
   
 sub start_block {  sub start_block {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {      my $result;
     my $code = @$parstack[$#$parstack];  
     $code =~ s/\"//g;      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || 
     $code .=';return $condition;';   $target eq 'tex' || $target eq 'analyze') {
     #  print "<br />$code<br />";   my $code = @$parstack[$#$parstack];
     my $result = &Apache::run::run($code,$safeeval);   if ($code) {
     &Apache::lonxml::debug("block :$code: returned :$result:");      $code =~ s/\"//g;
     if ( ! $result ) {       $code .=';return $condition;';
       my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);      if (!$Apache::lonxml::default_homework_loaded) {
       &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");   &Apache::lonxml::default_homework_load($safeeval);
       }
       $result = &Apache::run::run($code,$safeeval);
       &Apache::lonxml::debug("block :$code: returned :$result:");
    } else {
       $result='1';
    }
    if ( ! $result ) {
       my $skip=&Apache::lonxml::get_all_text("/block",$parser);
       &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
    }
    $result='';
       } elsif ($target eq 'edit') {
    $result .=&Apache::edit::tag_start($target,$token);
    $result .=&Apache::edit::text_arg('Test Condition:','condition',
     $token,40);
    $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
       } elsif ($target eq 'modified') {
    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
        $safeeval,'condition');
    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }      }
   }      return $result;
   return "";  
 }  }
   
 sub end_block {  sub end_block {
Line 518  sub start_while { Line 577  sub start_while {
   $code .=';return $condition;';    $code .=';return $condition;';
   
   push( @Apache::structuretags::whileconds, $code);     push( @Apache::structuretags::whileconds, $code); 
     if (!$Apache::lonxml::default_homework_loaded) {
         &Apache::lonxml::default_homework_load($safeeval);
     }
   my $result = &Apache::run::run($code,$safeeval);    my $result = &Apache::run::run($code,$safeeval);
   my $bodytext=$$parser[$#$parser]->get_text("/while");    my $bodytext=$$parser[$#$parser]->get_text("/while");
   push( @Apache::structuretags::whilebody, $bodytext);    push( @Apache::structuretags::whilebody, $bodytext);
Line 548  sub start_randomlist { Line 610  sub start_randomlist {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result;    my $result;
   if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||    if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||
       $target eq 'tex') {        $target eq 'tex' || $target eq 'analyze') {
     my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);      my $body= &Apache::lonxml::get_all_text("/randomlist",$parser);
     my $b_parser= HTML::TokeParser->new(\$body);      my $b_parser= HTML::TokeParser->new(\$body);
     my $b_tok;      my $b_tok;
     my @randomlist;      my @randomlist;
Line 601  sub shuffle { Line 663  sub shuffle {
     if (defined(@$a)) {      if (defined(@$a)) {
       &Apache::response::setrandomnumber();        &Apache::response::setrandomnumber();
       for($i=@$a;--$i;) {        for($i=@$a;--$i;) {
  my $j=int rand($i+1);   my $j=int(&Math::Random::random_uniform() * ($i+1));
  next if $i == $j;   next if $i == $j;
  @$a[$i,$j] = @$a[$j,$i];   @$a[$i,$j] = @$a[$j,$i];
       }        }
Line 625  sub start_part { Line 687  sub start_part {
   $Apache::inputtags::part=$id;    $Apache::inputtags::part=$id;
   @Apache::inputtags::responselist = ();    @Apache::inputtags::responselist = ();
   @Apache::inputtags::previous=();    @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
   
   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' || $target eq 'tex') {    } elsif ($target eq 'web' || $target eq 'grade' ||
     my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);     $target eq 'answer' || $target eq 'tex') {
     push (@Apache::inputtags::status,$status);        if ($hidden) {
     my $expression='$external::datestatus="'.$status.'";';    my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
     $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';        } else {
     &Apache::run::run($expression,$safeeval);    my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
     if ( $status eq 'CLOSED' ) {    push (@Apache::inputtags::status,$status);
       my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);    my $expression='$external::datestatus="'.$status.'";';
       if ( $target eq "web" ) {    $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
  $result="<br />Part is not open to be viewed. It $accessmsg<br />";    &Apache::run::run($expression,$safeeval);
       } elsif ( $target eq 'tex' ) {    if ( $status eq 'CLOSED' ) {
  $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\";        my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
         if ( $target eq "web" ) {
     $result="<br />Part is not open to be viewed. It $accessmsg<br />";
         } elsif ( $target eq 'tex' ) {
     $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}";
         }
     } else {
         if ($target eq 'tex') {
    $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
    if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';}
         }
     }
       }        }
     } else {    } elsif ($target eq 'edit') {
       if ($target eq 'tex') {        $result.=&Apache::edit::tag_start($target,$token);
  $result='\vskip 0 mm';        $result.=&Apache::edit::text_arg('Part ID:','id',$token).
     &Apache::loncommon::help_open_topic("Part_Tag_Edit_Help").
         &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   
     } elsif ($target eq 'modified') {
         my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
      'id');
         if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);
     $result.=&Apache::edit::handle_insert();
       }        }
     }  
   }    }
   return $result;    return $result;
 }  }
Line 653  sub end_part { Line 738  sub end_part {
   my ($target,$token,$tagstack,$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;    my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
   if ( $target eq 'meta' ) { return ''; }    my $result='';
   if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {    if ( $target eq 'meta' ) {
     return &Apache::inputtags::grade;        $result='';
   }    } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER' && !$hidden) {
   if ($target eq 'web' || $target eq 'tex' ) {      $result=&Apache::inputtags::grade;
     my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part);    } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {
     #FIXME this is ugly we should just generate tex in inputtags      my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
     if ($target eq 'tex') { $gradestatus=&html_to_tex($gradestatus); }      $target);
     return $gradestatus;      if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
       $result=$gradestatus;
   }    }
   return '';    pop @Apache::inputtags::status;
     $Apache::inputtags::part='';
     return $result;
 }  }
   
 sub start_preduedate {  sub start_preduedate {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
     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' && 
       &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);          $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
         &Apache::lonxml::get_all_text("/preduedate",$parser);
     }      }
   }    }
   return '';    return '';
Line 686  sub start_postanswerdate { Line 775  sub start_postanswerdate {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {
     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);
     }      }
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
       return '\vskip 0 mm \noindent';        return '\vskip 0 mm \noindent';
Line 705  sub start_notsolved { Line 794  sub start_notsolved {
     &Apache::lonxml::debug("not solved has :$gradestatus:");      &Apache::lonxml::debug("not solved has :$gradestatus:");
     if ($gradestatus =~ /^correct/) {      if ($gradestatus =~ /^correct/) {
       &Apache::lonxml::debug("skipping");        &Apache::lonxml::debug("skipping");
       &Apache::lonxml::get_all_text("/notsolved",$$parser[$#$parser]);        &Apache::lonxml::get_all_text("/notsolved",$parser);
     }      }
   }    }
   return '';    return '';
Line 720  sub start_solved { Line 809  sub start_solved {
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
     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/) {
       &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]);        &Apache::lonxml::get_all_text("/solved",$parser);
     }      }
   }    }
   return '';    return '';
Line 742  sub end_startouttext { Line 831  sub end_startouttext {
   my $text='';    my $text='';
   
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $text=&Apache::lonxml::get_all_text("endouttext",$$parser[-1]);      $text=&Apache::lonxml::get_all_text("endouttext",$parser);
     $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).
     &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n".      &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n"
       &Apache::edit::editfield($token->[1],$text,"",50,4);   .'<table><tr><td>'.
       &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);
   }    }
   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);
     $result='<startouttext />'.&Apache::edit::modifiedfield();      $result='<startouttext />'.&Apache::edit::modifiedfield();
   }    }
   if ($target eq 'tex') {    if ($target eq 'tex') {
Line 765  sub start_endouttext { Line 861  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="</td></tr>".&Apache::edit::end_table()."\n"; }    if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; }
   if ($target eq "modified") { $result='<endouttext />'; }    if ($target eq "modified") { 
        $result='<endouttext />'.
        &Apache::edit::handle_insertafter('startouttext'); }
   return $result;    return $result;
 }  }
 sub end_endouttext {  sub end_endouttext {
Line 776  sub end_endouttext { Line 874  sub end_endouttext {
 }  }
 sub delete_startouttext {  sub delete_startouttext {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 #  my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);  #  my $text=&Apache::lonxml::get_all_text("endouttext",$parser);
   my $text=$$parser['-1']->get_text("/endouttext");    my $text=$$parser['-1']->get_text("/endouttext");
   my $ntoken=$$parser['-1']->get_token();    my $ntoken=$$parser['-1']->get_token();
   &Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext");    &Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext");
Removed from v.1.114  
changed lines
  Added in v.1.156

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