Diff for /loncom/homework/structuretags.pm between versions 1.58 and 1.67

version 1.58, 2001/08/18 16:08:34 version 1.67, 2001/09/14 20:17:35
Line 2 Line 2
 # definition of tags that give a structure to a document  # definition of tags that give a structure to a document
 # 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 Gerd Kortemeyer  # 8/17,8/18,8/20 Gerd Kortemeyer
   
 package Apache::structuretags;   package Apache::structuretags; 
   
Line 63  sub page_start { Line 63  sub page_start {
   return ($result,$head_tag_start,$body_tag_start);    return ($result,$head_tag_start,$body_tag_start);
 }  }
   
   sub initialize_storage {
     %Apache::lonhomework::results=();
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
     if ($ENV{'request.state'} eq 'construct') {
       %Apache::lonhomework::history=
         &Apache::lonnet::restore($ENV{'request.uri'},'nohist_construct',$domain,$name);
       my ($temp)=keys %Apache::lonhomework::history ;
       &Apache::lonxml::debug("Return message of $temp");
     } else {
       %Apache::lonhomework::history=
         &Apache::lonnet::restore($symb,$courseid,$domain,$name);
     }
     #ignore error conditions
     my ($temp)=keys %Apache::lonhomework::history ;
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
   }
   
   # -------------------------------------------------------------finalize_storage
   # Stores away the result has to a student's environment
   # checks form.grade_ for specific values, other wises stores
   # to the running users environment
   sub finalize_storage {
     my $result;
     my ($temp) = keys %Apache::lonhomework::results;
     if ( $temp ne '' ) {
       my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
       if ($ENV{'request.state'} eq 'construct') {
         $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
         $ENV{'request.uri'},'nohist_construct',
         $domain,$name);
         &Apache::lonxml::debug('Construct Store return message:'.$result);
       } else {
         $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
         $symb,$courseid,$domain,$name);
         &Apache::lonxml::debug('Store return message:'.$result);
       }
     }
     return $result;
   }
   
   sub checkout_msg {
   return (<<ENDCHECKOUT);
   <h2>The resource needs to be checked out</h2>
   As a resource gets checked out, a unique timestamped ID is given to it, and a
   permanent record is left in the system.<p />
   <font color=red>
   Checking out resources is subject to course policies, and may exclude future
   credit even if done erroneously.<p />
   </font>  
   <form method=post>
   <input type=button name="doescheckout" 
   value="Check out Exam for Viewing" 
   onClick="if (confirm('Check out Exam?')) { this.form.submit(); }" />
   </form>
   ENDCHECKOUT
   }
   
 sub start_problem {  sub start_problem {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
Line 70  sub start_problem { Line 127  sub start_problem {
   $Apache::inputtags::part='0';    $Apache::inputtags::part='0';
   @Apache::inputtags::responselist = ();    @Apache::inputtags::responselist = ();
   @Apache::inputtags::previous=();    @Apache::inputtags::previous=();
     &initialize_storage();
   $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 '') {
Line 83  sub start_problem { Line 141  sub start_problem {
     }      }
   }    }
   
 #adeed vars to the scripting enviroment    #added vars to the scripting enviroment
   my $expression='$external::part='.$Apache::inputtags::part.';';    my $expression='$external::part='.$Apache::inputtags::part.';';
   &Apache::run::run($expression,$safeeval);    &Apache::run::run($expression,$safeeval);
   my $status;    my $status;
Line 93  sub start_problem { Line 151  sub start_problem {
   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 ($Apache::lonhomework::type eq 'exam') {  
       if ($target eq 'web') {  
           my $token=$Apache::lonhomework::history{"resource.0.outtoken"};  
           if (($ENV{'form.doescheckout'}) && (!$token)) {  
      $token=&Apache::lonxml::maketoken();  
           }  
           $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);  
       }  
       if ($target eq 'meta') {  
   print "Cool, I was called";  
   
   return (<<ENDSTORES);  
 <stores part="0" name="outtoken" type="string"   
  display="Document ID checked out" />  
 <stores part="0" name="checkouttime" type="date"  
  display="Time checked out" />  
 <stores part="0" name="outremote" type="string"   
  display="Client IP checked out from" />  
   
 <stores part="0" name="intoken" type="string"   
  display="Document ID checked in" />  
 <stores part="0" name="checkintime" type="date"  
  display="Time checked in" />  
 <stores part="0" name="inremote" type="string"   
  display="Client IP checked in from" />  
 ENDSTORES  
       }  
   }  
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade') {
       #handle exam checkout
       if ($Apache::lonhomework::type eq 'exam') {
         my $token=$Apache::lonhomework::history{"resource.0.outtoken"};
         if (($ENV{'form.doescheckout'}) && (!$token)) {
    $token=&Apache::lonxml::maketoken();
    $Apache::lonhomework::history{"resource.0.outtoken"}=$token;
         }
         $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
       }
   
       #handle rand seed in construction space
       my $rndseed;
       if ($ENV{'request.state'} eq "construct") {
         $rndseed=$ENV{'form.rndseed'};
         if (!$rndseed) {
    $rndseed=time;
    $ENV{'form.rndseed'}=$rndseed;
         }
         &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
       }
     ($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 138  ENDSTORES Line 189  ENDSTORES
         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.=(<<ENDCHECKOUT);              $msg.=&checkout_msg;
 <h2>The resource needs to be checked out</h2>  
 As a resource gets checked out, a unique timestamped ID is given to it, and a  
 permanent record is left in the system.<p />  
 <font color=red>  
 Checking out resources is subject to course policies, and may exclude future  
 credit even if done erroneously.<p />  
 </font>    
 <form method=post>  
 <input type=submit name="doescheckout"   
 value="Check out Exam for Viewing" />  
 </form>  
 ENDCHECKOUT  
         }          }
  return $result.$msg.'<br />';   $result.=$msg.'<br />';
       }        }
     }      } elsif ($target eq 'web') {
   }        my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
   if ($target eq 'web') {        if ($name eq '') { 
     my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);   $name=&Apache::lonnet::EXT('resource.title');
     if ($name eq '') {    if ($name eq 'con_lost') { $name = ''; }
       $name=&Apache::lonnet::EXT('resource.title');        }
       if ($name eq 'con_lost') { $name = ''; }        $Apache::lonhomework::name=$name;
     }        if ($status eq 'CAN_ANSWER') {
     $Apache::lonhomework::name=$name;   # create a page header and exit
     if ($status eq 'CAN_ANSWER') {   $result.="$head_tag_start<title>$name</title></head>\n
       # create a page header and exit  
       $result.="$head_tag_start<title>$name</title></head>\n  
               $body_tag_start\n                $body_tag_start\n
               <form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">".                <form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">".
  '<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.='<input type="hidden" name="problemmode" value="View" />    $result.=
                  <input type="submit" name="problemmode" value="Edit" /><hr />';      '<input type="hidden" name="problemmode" value="View" />
                <input type="submit" name="problemmode" value="Edit" />
                Random Seed:<input type="text" name="rndseed" width="10" value="'.
          $rndseed.'" /><hr />';
    }
    # if we are viewing someone else preserve that info
    if (defined $ENV{'form.grade_symb'}) {
     foreach my $field ('symb','courseid','domain','username') {
       $result .= '<input type="hidden" name="grade_'.$field.
         '" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
     }
    }
         } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'
          || $status eq 'CLOSED') {
    $result.=$head_tag_start.
     "<title>$name</title></head>\n$body_tag_start\n";
       }        }
       return $result;  
     } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') {  
       return $result.$head_tag_start."<title>$name</title></head>\n$body_tag_start\n";  
     }      }
   }    } elsif ($target eq 'edit') {
   if ($target eq 'edit') {  
     $result.=$head_tag_start."</head>".$body_tag_start.      $result.=$head_tag_start."</head>".$body_tag_start.
       '<form name="lonhomework" method="POST" action="'.$ENV{'request.uri'}.'">        '<form name="lonhomework" method="POST" action="'.
    $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="View" />
Line 189  ENDCHECKOUT Line 238  ENDCHECKOUT
       ';        ';
     my $temp=&Apache::edit::insertlist($target,$token);      my $temp=&Apache::edit::insertlist($target,$token);
     $result.=$temp;      $result.=$temp;
     return $result;    } elsif ($target eq 'modified') {
   }  
   if ($target eq 'modified') {  
     $result=$token->[4];      $result=$token->[4];
     $result.=&Apache::edit::handle_insert();      $result.=&Apache::edit::handle_insert();
     return $result;    } else {
       # page_start returned a starting result, delete it if we don't need it
       $result = '';
   }    }
   return '';    return $result;
 }  }
   
 sub end_problem {  sub end_problem {
Line 221  sub end_problem { Line 270  sub end_problem {
       }        }
       $result.=&Apache::lonxml::xmlend();        $result.=&Apache::lonxml::xmlend();
     }      }
   }      if ($target eq 'grade') { 
   if ($target eq 'meta') {        &Apache::lonhomework::showhash(%Apache::lonhomework::results);
         &finalize_storage();
       }
     } 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;
     }      }
   }    } elsif ($target eq 'edit') {
   if ($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" />';
   }    }

Removed from v.1.58  
changed lines
  Added in v.1.67


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