--- loncom/homework/inputtags.pm 2001/12/04 15:17:56 1.47
+++ loncom/homework/inputtags.pm 2002/01/30 17:32:42 1.52
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.47 2001/12/04 15:17:56 albertel Exp $
+# $Id: inputtags.pm,v 1.52 2002/01/30 17:32:42 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,8 +30,8 @@
package Apache::inputtags;
use strict;
-sub BEGIN {
- &Apache::lonxml::register('Apache::inputtags',('textarea','textline','datasubmission'));
+BEGIN {
+ &Apache::lonxml::register('Apache::inputtags',('textfield','textline','datasubmission'));
}
@@ -71,7 +71,7 @@ sub end_input {
return '';
}
-sub start_textarea {
+sub start_textfield {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result = "";
my $id = &start_input($parstack,$safeeval);
@@ -89,13 +89,20 @@ sub start_textarea {
}
if ($oldresponse ne '') {
#get rid of any startup text if the user has already responded
- &Apache::lonxml::get_all_text("/textarea",$$parser[$#$parser]);
+ &Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
+ }
+ }
+ if ($target eq 'grade') {
+ my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
+ if ($seedtext eq $ENV{'form.HWVAL'.$Apache::inputtags::response[-1]}) {
+ # if the seed text is still there it wasn't a real submission
+ $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}='';
}
}
return $result;
}
-sub end_textarea {
+sub end_textfield {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web') {
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
@@ -123,8 +130,7 @@ sub start_textline {
$result=''.$oldresponse.'';
}
} elsif ($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('Size:','size',$token,'5')."";
$result.=&Apache::edit::end_table;
} elsif ($target eq 'modified') {
@@ -402,7 +408,7 @@ sub gradestatus {
}
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
if ( $showbutton ) {
- $button = '
';
+ $button = '
';
}
}
my $output= $previousmsg.$message.$trystr;