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

Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.46 and 1.50

version 1.46, 2001/12/04 14:54:47 version 1.50, 2002/01/17 12:23:31
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # caparesponse definition  # caparesponse 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/
   #
   
 package Apache::caparesponse;  package Apache::caparesponse;
 use strict;  use strict;
 use capa;  use capa;
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));    &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
 }  }
   
Line 57  sub start_numericalresponse { Line 82  sub start_numericalresponse {
   my $id = &Apache::response::start_response($parstack,$safeeval);    my $id = &Apache::response::start_response($parstack,$safeeval);
   my $result;    my $result;
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));      $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Answer:','answer',$token);      $result.=&Apache::edit::text_arg('Answer:','answer',$token);
     if ($token->[1] eq 'numericalresponse') {      if ($token->[1] eq 'numericalresponse') {
       $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);        $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
       $result.=&Apache::edit::text_arg('Format:','format',$token,4);        $result.=&Apache::edit::text_arg('Format:','format',$token,4);
     } elsif ($token->[1] eq 'stringresponse') {      } elsif ($token->[1] eq 'stringresponse') {
       $result.=&Apache::edit::select_arg('Type:','type',        $result.=&Apache::edit::select_arg('Type:','type',
  ['cs','ci','mc'],$token)   ['cs','ci','mc'],$token);
     } elsif ($token->[1] eq 'formularesponse') {      } elsif ($token->[1] eq 'formularesponse') {
       $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);        $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
     }      }
     $result.='</td></tr><tr><td colspan="3">';      $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $constructtag;      my $constructtag;
     if ($token->[1] eq 'numericalresponse') {      if ($token->[1] eq 'numericalresponse') {
Line 124  sub end_numericalresponse { Line 149  sub end_numericalresponse {
  $result = &Apache::run::run($expression,$safeeval);   $result = &Apache::run::run($expression,$safeeval);
  my ($awards) = split /:/ , $result;   my ($awards) = split /:/ , $result;
  my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);   my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
  if ( $previous{'used'} && ($previous{'award'} eq $ad) ) {   &Apache::response::handle_previous(\%previous,$ad);
   if ($previous{'last'}) {  
     push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');  
   } else {  
     push(@Apache::inputtags::previous,'PREVIOUSLY_USED');  
   }  
  }  
  $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;   $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
  &Apache::lonxml::debug("$expression");   &Apache::lonxml::debug("$expression");
  &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");   &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
Removed from v.1.46  
changed lines
  Added in v.1.50

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