--- loncom/homework/default_homework.lcpm	2003/03/25 23:05:03	1.60
+++ loncom/homework/default_homework.lcpm	2003/05/23 07:04:44	1.62
@@ -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.60 2003/03/25 23:05:03 albertel Exp $
+# $Id: default_homework.lcpm,v 1.62 2003/05/23 07:04:44 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,6 +62,8 @@ sub caparesponse_check {
     $message .="no ws in :$response:\n";
   }
 
+  if (length($response) > 500) { return "TOO_LONG: Answer too long"; }
+
   if ($type eq '' ) {
     $message .= "Didn't find a type :$type:$expr: defaulting\n";
     if ( $answer eq ($answer *1.0)) { $type = 2;
@@ -82,7 +84,7 @@ sub caparesponse_check {
   #formula type setup the sample points
   if ($type eq '8') {
     ($id_list,$points)=split(/@/,$samples);
-    $message.="Found :$points: points\n";
+    $message.="Found :$id_list:$points: points in $samples\n";
   }
   if ($tol eq '') {
     $tol=0.0;
@@ -238,17 +240,22 @@ sub hinton {
 }
 
 sub random {
-  my ($start,$end,$step)=@_;
-  if ( ! $hidden::RANDOMINIT ) {
-    if ($external::randomseed == 0) { $external::randomseed=1; }
-    &random_set_seed(1,int(abs($external::randomseed)));
-    &math_random_uniform();
-    $hidden::RANDOMINIT=1;
-  }
-  if (!defined($step)) { $step=1; }
-  my $num=1+int(($end-$start)/$step);
-  my $result=$start + int(&math_random_uniform() * $num)*$step;
-  return $result;
+    my ($start,$end,$step)=@_;
+    if ( ! $hidden::RANDOMINIT ) {
+	if ($external::randomseed == 0) { $external::randomseed=1; }
+	if ($external::randomseed =~/,/) {
+	    my ($num1,$num2)=split(/,/,$seed);
+	    &random_set_seed(abs($num1),abs($num2));
+	} else {
+	    &random_set_seed(1,int(abs($external::randomseed)));
+	}
+	&math_random_uniform();
+	$hidden::RANDOMINIT=1;
+    }
+    if (!defined($step)) { $step=1; }
+    my $num=1+int(($end-$start)/$step);
+    my $result=$start + int(&math_random_uniform() * $num)*$step;
+    return $result;
 }
 
 sub random_normal {