Diff for /loncom/homework/structuretags.pm between versions 1.161 and 1.171

version 1.161, 2003/04/03 17:44:12 version 1.171, 2003/05/13 20:38:55
Line 38  use Apache::File(); Line 38  use Apache::File();
 use Apache::lonmenu;  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','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
 }  }
   
 sub start_web {  sub start_web {
Line 104  sub page_start { Line 104  sub page_start {
  }   }
  $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)=&Apache::lonxml::whichuser();      my ($symb,undef,undef,undef,$publicuser)=
     if ($symb eq '') {   &Apache::lonxml::whichuser();
       if ($symb eq '' && !$publicuser) {
  my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");   my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
  $help="Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored $help<br />";   $help="Browsing resource, all submissions are temporary.<br />";
  $body_tag_start.=$help;   $body_tag_start.=$help;
     }      }
  }   }
Line 135  sub get_resource_name { Line 136  sub get_resource_name {
 sub setup_rndseed {  sub setup_rndseed {
     my ($safeeval)=@_;      my ($safeeval)=@_;
     my $rndseed;      my $rndseed;
     if ($ENV{'request.state'} eq "construct") {      my ($symb)=&Apache::lonxml::whichuser();
       if ($ENV{'request.state'} eq "construct" || $symb eq '') {
  $rndseed=$ENV{'form.rndseed'};   $rndseed=$ENV{'form.rndseed'};
  if (!$rndseed) {   if (!$rndseed) {
       $rndseed=$Apache::lonhomework::history{'rndseed'};
       if (!$rndseed) {
    $rndseed=time;
    $ENV{'form.rndseed'}=$rndseed;
       }
    }
    if ($ENV{'form.resetdata'} eq 'New Problem Variation') {
     $rndseed=time;      $rndseed=time;
     $ENV{'form.rndseed'}=$rndseed;      $ENV{'form.rndseed'}=$rndseed;
  }   }
Line 186  sub problem_web_to_edit_header { Line 195  sub problem_web_to_edit_header {
   
 sub initialize_storage {  sub initialize_storage {
     %Apache::lonhomework::results=();      %Apache::lonhomework::results=();
       %Apache::lonhomework::history=();
     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' || $symb eq '') {
  %Apache::lonhomework::history=   %Apache::lonhomework::history=
     &Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name);      &Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name);
  my ($temp)=keys %Apache::lonhomework::history ;   my ($temp)=keys %Apache::lonhomework::history ;
Line 210  sub finalize_storage { Line 220  sub finalize_storage {
     my ($temp) = keys %Apache::lonhomework::results;      my ($temp) = keys %Apache::lonhomework::results;
     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' || $symb eq '') {
       $Apache::lonhomework::results{'rndseed'}=$ENV{'form.rndseed'};
     $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,      $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,
  $ENV{'request.uri'},'',$domain,$name);   $ENV{'request.uri'},'',$domain,$name);
     &Apache::lonxml::debug('Construct Store return message:'.$result);      &Apache::lonxml::debug('Construct Store return message:'.$result);
Line 260  sub start_problem { Line 271  sub start_problem {
     @Apache::structuretags::whileconds=();      @Apache::structuretags::whileconds=();
     @Apache::structuretags::whilebody=();      @Apache::structuretags::whilebody=();
     @Apache::structuretags::whileline=();      @Apache::structuretags::whileline=();
       $Apache::lonhomework::scantronmode=0;
       $Apache::lonhomework::problemstatus=
    &Apache::lonnet::EXT('resource.0.problemstatus');
   
       if (defined($ENV{'scantron.maxquest'})) {
    $Apache::lonhomework::scantronmode=1;
       }
   
     if ($target ne 'analyze') {      if ($target ne 'analyze') {
  &initialize_storage();   &initialize_storage();
Line 269  sub start_problem { Line 287  sub start_problem {
  $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');   $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
  &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::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+)$/) {
     $Apache::lonhomework::type=$1;      $Apache::lonhomework::type=$1;
Line 308  sub start_problem { Line 326  sub start_problem {
   
  #handle rand seed in construction space   #handle rand seed in construction space
  my $rndseed=&setup_rndseed($safeeval);   my $rndseed=&setup_rndseed($safeeval);
    my ($symb)=&Apache::lonxml::whichuser();
    if ($ENV{'request.state'} ne "construct" && $symb eq '') {
       $form_tag_start.='<input type="hidden" name="rndseed" value="'.
    $rndseed.'" />'.
       '<input type="submit" name="resetdata"
                                value="New Problem Variation" />'.
       '<input type="hidden" name="username"
                                value="'.$ENV{'form.username'}.'" />';
    }
  ($status,$accessmsg) = &Apache::lonhomework::check_access('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.'";';
Line 454  sub end_problem { Line 481  sub end_problem {
    ) {     ) {
     if ($status eq 'CAN_ANSWER') {      if ($status eq 'CAN_ANSWER') {
  if ($target ne 'tex') {   if ($target ne 'tex') {
     $result.="</form></body>\n";      if ($ENV{'form.print_answer'} ne 'yes') {$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' ) {       $status eq 'UNCHECKEDOUT' ) {
Line 478  sub end_problem { Line 505  sub end_problem {
     &finalize_storage();      &finalize_storage();
  }   }
  if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') ) {   if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') ) {
     $result.='</html>'; #normally we get it from xmlend, but in CSTR      if ($ENV{'form.print_answer'} ne 'yes') {
                         # we always show answer mode too.   $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') {
Line 583  sub end_block { Line 612  sub end_block {
     return $result;      return $result;
 }  }
   
   sub start_languageblock {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
       my $result;
   
       if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
    $target eq 'tex' || $target eq 'analyze') {
    my $include = $token->[2]->{'include'};
    my $exclude = $token->[2]->{'exclude'};
           my %languages=&Apache::loncommon::display_languages();
           $result='1';
    if ($include) {
               $result='';
               foreach (split(/\,/,$include)) {
                   if ($languages{$_}) { $result='1'; }
               }
    }
           if ($exclude) {
               foreach (split(/\,/,$exclude)) {
                   if ($languages{$_}) { $result='0'; }
               }
    }
    if ( ! $result ) {
       my $skip=&Apache::lonxml::get_all_text("/languageblock",$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('Include Language:','include',
     $token,40);
    $result .=&Apache::edit::text_arg('Exclude Language:','exclude',
     $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,'include',
        'exclude');
    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
       }
       return $result;
   }
   
   sub end_languageblock {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       if ($target eq "edit") {
    $result.= &Apache::edit::tag_end($target,$token,'');
       }
       return $result;
   }
   
   sub start_instructorcomment {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
       my $result;
   
       if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
    $target eq 'tex' || $target eq 'analyze') {
           $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);
    if ( ! $result ) {
       my $skip=&Apache::lonxml::get_all_text("/instructorcomment",$parser);
       &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
    }
    $result='';
       } elsif ($target eq 'edit') {
    $result .=&Apache::edit::tag_start($target,$token);
    $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
       }
       return $result;
   }
   
   sub end_instructorcomment {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       if ($target eq "edit") {
    $result.= &Apache::edit::tag_end($target,$token,'');
       }
       return $result;
   }
   
 sub start_while {  sub start_while {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
Line 737  sub start_part { Line 847  sub start_part {
     @Apache::inputtags::responselist = ();      @Apache::inputtags::responselist = ();
     @Apache::inputtags::previous=();      @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();      @Apache::inputtags::previous_version=();
       $Apache::lonhomework::problemstatus=
    &Apache::lonnet::EXT("resource.$id.problemstatus");
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);      my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
   
     if ($target eq 'meta') {      if ($target eq 'meta') {

Removed from v.1.161  
changed lines
  Added in v.1.171


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