--- loncom/homework/default_homework.lcpm	2014/06/25 10:48:39	1.167
+++ loncom/homework/default_homework.lcpm	2014/12/14 02:43:59	1.170
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run()
 #
-# $Id: default_homework.lcpm,v 1.167 2014/06/25 10:48:39 raeburn Exp $
+# $Id: default_homework.lcpm,v 1.170 2014/12/14 02:43:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1228,18 +1228,78 @@ sub sec {
 }
 
 sub submission {
-   my ($partid,$responseid,$subnumber,$encode)=@_;
+   my ($partid,$responseid,$subnumber,$encode,$cleanupnum,$mapalias)=@_;
    my $sub='';
    if ($subnumber) { $sub=$subnumber.':'; }
    my $output =
-       &EXT('user.resource.'.$sub.'resource.'.$partid.'.'.$responseid.'.submission');
-   if ($encode) {
-       $output =~ s/&/&/g;
-       $output =~ s/</&lt;/g;
-       $output =~ s/>/&gt;/g;
-       $output =~ s/"/&quot;/g;
+       &EXT('user.resource.'.$sub.'resource.'.$partid.'.'.$responseid.'.submission',$mapalias);
+   if (ref($output) eq 'ARRAY') {
+       my @items = @{$output};
+       if ($encode) {
+           @items = map { &encode_response($_); } @items;
+       }
+       if (ref($cleanupnum) eq 'HASH') {
+           @items = map { &cleanup_numerical_response($cleanupnum,$_); } @items;
+       }
+       return \@items;
+   } else {
+       if ($encode) {
+           $output = &encode_response($output);
+       }
+       if (ref($cleanupnum) eq 'HASH') {
+           $output = &cleanup_numerical_response($cleanupnum,$output);
+       }
+       return $output;
    }
-   return $output;
+}
+
+sub encode_response {
+    my ($value) = @_;
+    $value =~ s/&/&amp;/g;
+    $value =~ s/</&lt;/g;
+    $value =~ s/>/&gt;/g;
+    $value =~ s/"/&quot;/g;
+    return $value;
+}
+
+sub cleanup_numerical_response {
+    my ($cleanupnum,$value) = @_;
+    if (ref($cleanupnum) eq 'HASH') {
+        if ($cleanupnum->{exponent}) {
+            if ($value =~ m{^(.*)[\*xX]\s*10\s*\^\s*(\+|\-)?\s*(\d+)(.*)$}) {
+                my $pre_exp = $1;
+                my $sign = $2;
+                my $exponent = $3;
+                my $post_exp = $4;
+                if ($pre_exp !~ /\./) {
+                    $pre_exp .= '.';
+                }
+                if ($sign eq '') {
+                    $sign = '+';
+                }
+                $value = $pre_exp.'E'.$sign.$exponent.$post_exp;
+            }
+        }
+        if ($cleanupnum->{comma}) {
+            $value =~ s{(\d+),(\d+)}{$1$2};
+        }
+        if ($cleanupnum->{letterforzero}) {
+            $value =~ s/^\s*o(\.\d+)/0$1/i;
+        }
+        if ($cleanupnum->{spaces}) {
+            $value =~ s{^\s+|\s+$}{}g;
+            if ($value =~ m{^(.*)\.\s+(\d+)(.*)$}) {
+                my $pre_pt = $1;
+                my $decimal = $2;
+                my $post_dec = $3;
+                $value = $pre_pt.'.'.$decimal.$post_dec;
+            }
+        }
+        if ($cleanupnum->{format} =~ /^\d+s$/i) {
+            $value = &format_significant_figures($value,$cleanupnum->{format});
+        }
+    }
+    return $value;
 }
 
 sub currentpart {