Diff for /loncom/homework/response.pm between versions 1.49 and 1.60

version 1.49, 2001/10/01 20:18:31 version 1.60, 2002/02/15 22:16:04
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # various response type definitons response definition  # various response type definitons response definition
   #
   # $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/
   #
 # 11/23,11/24,11/28 Gerd Kortemeyer  # 11/23,11/24,11/28 Gerd Kortemeyer
 # Guy Albertelli  # Guy Albertelli
 # 08/04,08/07 Gerd Kortemeyer  # 08/04,08/07 Gerd Kortemeyer
Line 8 Line 32
 package Apache::response;  package Apache::response;
 use strict;  use strict;
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::response',('responseparam','caparesponse','numericalresponse','formularesponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse'));    &Apache::lonxml::register('Apache::response',('responseparam','parameter','caparesponse','numericalresponse','formularesponse','stringresponse','radiobuttonresponse','optionresponse','imageresponse','essayresponse','dataresponse','externalresponse'));
 }  }
   
 sub start_response {  sub start_response {
   my ($parstack,$safeeval)=@_;    my ($parstack,$safeeval)=@_;
   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; }
     if ($#Apache::inputtags::import > -1) {
       &Apache::lonxml::debug("Turning :$id: into");
       $id = join('_',@Apache::inputtags::import).'_'.$id;
       &Apache::lonxml::debug("New  :$id:");
     }
   push (@Apache::inputtags::response,$id);    push (@Apache::inputtags::response,$id);
   push (@Apache::inputtags::responselist,$id);    push (@Apache::inputtags::responselist,$id);
   @Apache::inputtags::inputlist=();    @Apache::inputtags::inputlist=();
Line 33  sub start_hintresponse { Line 62  sub start_hintresponse {
   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; }
   push (@Apache::inputtags::response,$id);    push (@Apache::inputtags::response,$id);
     push (@Apache::inputtags::paramstack,[%Apache::inputtags::params]);
   return $id;    return $id;
 }  }
   
 sub end_hintresponse {  sub end_hintresponse {
   pop @Apache::inputtags::response;    pop @Apache::inputtags::response;
     %Apache::inputtags::params=@{pop(@Apache::inputtags::paramstack)};
   return '';    return '';
 }  }
   
Line 49  sub setrandomnumber { Line 80  sub setrandomnumber {
     $rndseed=$ENV{'form.rndseed'};      $rndseed=$ENV{'form.rndseed'};
     if (!$rndseed) { $rndseed=time; }      if (!$rndseed) { $rndseed=time; }
   } else {    } else {
     $rndseed=&Apache::lonnet::rndseed();      my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
       $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
   }    }
   &Apache::lonxml::debug("randseed $rndseed");    &Apache::lonxml::debug("randseed $rndseed");
 #  $rndseed=unpack("%32i",$rndseed);  #  $rndseed=unpack("%32i",$rndseed);
Line 164  sub check_for_previous { Line 196  sub check_for_previous {
   return %previous;    return %previous;
 }  }
   
   sub handle_previous {
     my ($previous,$ad)=@_;
     if ($$previous{'used'} && ($$previous{'award'} eq $ad) ) {
       if ($$previous{'last'}) {
         push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');
       } else {
         push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
       }
     }
   }
   
 sub start_caparesponse {  sub start_caparesponse {
   require Apache::caparesponse;     require Apache::caparesponse; 
   import Apache::caparesponse;     import Apache::caparesponse; 
Line 222  sub start_essayresponse { Line 265  sub start_essayresponse {
   return &Apache::essayresponse::start_essayresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);    return &Apache::essayresponse::start_essayresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
 }  }
   
   sub start_externalresponse {
     require Apache::externalresponse; 
     import Apache::externalresponse; 
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     return &Apache::externalresponse::start_externalresponse($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
   }
   
 sub view_or_modify {  sub view_or_modify {
   my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
   my $myself=0;    my $myself=0;
Line 293  sub start_responseparam { Line 343  sub start_responseparam {
     $token->[2]->{'default'},      $token->[2]->{'default'},
     $token->[2]->{'description'});      $token->[2]->{'description'});
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,      $result.=&Apache::edit::tag_start($target,$token);
       &Apache::lonxml::description($token));  
     $result.=&Apache::edit::text_arg('Name:','name',$token).      $result.=&Apache::edit::text_arg('Name:','name',$token).
       &Apache::edit::text_arg('Type:','type',$token).        &Apache::edit::text_arg('Type:','type',$token).
  &Apache::edit::text_arg('Description:','description',$token).   &Apache::edit::text_arg('Description:','description',$token).
Line 309  sub start_responseparam { Line 358  sub start_responseparam {
       $result = &Apache::edit::rebuild_tag($token);        $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();        $result.=&Apache::edit::handle_insert();
     }      }
     } elsif ($target eq 'grade' || $target eq 'answer' ||
      $target eq 'web'   || $target eq 'tex') {
       if ($ENV{'request.state'} eq 'construct') {
         my $name    = &Apache::lonxml::get_param('name',$parstack,$safeeval);
         my $default = &Apache::lonxml::get_param('default',$parstack,$safeeval);
         $Apache::inputtags::params{$name}=$default;
       }
   }    }
   return $result;    return $result;
 }  }
Line 319  sub end_responseparam { Line 375  sub end_responseparam {
   return '';    return '';
 }  }
   
   sub start_parameter {
     my $result = &start_responseparam(@_);
     return $result;
   }
   
   sub end_parameter {
     my $result = &end_responseparam(@_);
     return $result;
   }
   
 sub setup_params {  sub setup_params {
   my ($tag) = @_;    my ($tag) = @_;
   
   @Apache::inputtags::params=();    if ($ENV{'request.state'} eq 'construct') { return; }
     %Apache::inputtags::params=();
   my %paramlist=();    my %paramlist=();
   foreach my $key (keys(%Apache::lonnet::packagetab)) {    foreach my $key (keys(%Apache::lonnet::packagetab)) {
     if ($key =~ /^$tag/) {      if ($key =~ /^$tag/) {
Line 352  sub setup_params { Line 419  sub setup_params {
 sub answer_header {  sub answer_header {
   my ($type) = @_;    my ($type) = @_;
   my $result;    my $result;
   if ($type eq 'optionresponse') {    if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse' ) {
     $result = '<table border="1"><tr><th>Answer for Part:'.      $result = '<table border="1"><tr><th>Answer for Part:'.
       $Apache::inputtags::part. '</th></tr><tr>'."\n";        $Apache::inputtags::part. '</th></tr><tr>'."\n";
   } else {    } else {
Line 365  sub answer_header { Line 432  sub answer_header {
 sub answer_part {  sub answer_part {
   my ($type,$answer) = @_;    my ($type,$answer) = @_;
   my $result;    my $result;
   if ($type eq 'optionresponse') {    if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
     $result = '<td>'.$answer.'</td>';      $result = '<td>'.$answer.'</td>';
   } else {    } else {
     $result = '<td>'.$answer.'</td>';      $result = '<td>'.$answer.'</td>';
Line 376  sub answer_part { Line 443  sub answer_part {
 sub answer_footer {  sub answer_footer {
   my ($type) = @_;    my ($type) = @_;
   my $result;    my $result;
   if ($type eq 'optionresponse') {    if ($type eq 'optionresponse' || $type eq 'radiobuttonresponse') {
     $result = '</tr></table>';      $result = '</tr></table>';
   } else {    } else {
     $result = '</tr></table>';      $result = '</tr></table>';

Removed from v.1.49  
changed lines
  Added in v.1.60


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