--- loncom/homework/inputtags.pm	2003/05/06 15:31:45	1.98
+++ loncom/homework/inputtags.pm	2003/06/07 03:57:28	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.98 2003/05/06 15:31:45 albertel Exp $
+# $Id: inputtags.pm,v 1.104 2003/06/07 03:57:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,6 +52,8 @@ sub initialize_inputtags {
   @Apache::inputtags::previous_version=();
   # id of current part, 0 means that no part is current (inside <problem> only
   $Apache::inputtags::part='';
+  # list of all part ids seen
+  @Apache::inputtags::partlist=();
   # list of problem date statuses, the first element is for <problem>
   # if there is a second element it is for the current <part>
   @Apache::inputtags::status=();
@@ -59,6 +61,26 @@ sub initialize_inputtags {
   %Apache::inputtags::params=();
   # list of all ids, for <import>, these get join()ed and prepended
   @Apache::inputtags::import=();
+  # list of all import ids seen
+  @Apache::inputtags::importlist=();
+}
+
+sub check_for_duplicate_ids {
+    my %check;
+    foreach my $id (@Apache::inputtags::partlist,
+		    @Apache::inputtags::responselist,
+		    @Apache::inputtags::importlist) {
+	$check{$id}++;
+    }
+    my @duplicates;
+    foreach my $id (sort(keys(%check))) {
+	if ($check{$id} > 1) {
+	    push(@duplicates,$id);
+	}
+    }
+    if (@duplicates) {
+	&Apache::lonxml::error("Duplicated ids found, problem will operate incorrectly. Duplicated ids seen: ",join(', ',@duplicates));
+    }
 }
 
 sub start_input {
@@ -160,14 +182,14 @@ sub start_textline {
   my $result = "";
   if ($target eq 'web') {
     $Apache::lonxml::evaluate--;
+    my $partid=$Apache::inputtags::part;
+    my $id=$Apache::inputtags::response[-1];
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
       my $maxlength;
       if ($size eq '') { $size=20; } else {
 	if ($size < 20) { $maxlength=$size; }
       }
-      my $partid=$Apache::inputtags::part;
-      my $id=$Apache::inputtags::response[-1];
       my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
       if ($Apache::lonhomework::type ne 'exam') {
         $result= '<input type="text" name="HWVAL_'.$id.'" value="'.
@@ -251,7 +273,9 @@ sub finalizeawards {
   if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'NO_RESPONSE') {$result='NO_RESPONSE'; last;} }
   }
-
+  if ($result eq '' ) {
+    foreach $award (@_) { if ($award eq 'TOO_LONG') {$result='TOO_LONG'; last;}}
+  }
   if ($result eq '' ) {
     foreach $award (@_) { 
       if ($award eq 'UNIT_FAIL' ||
@@ -312,7 +336,7 @@ sub decideoutput {
 	  } else {
 	      $message = "<b>You are correct.</b>";
 	  }
-	  $message=' Your receipt is '.&Apache::lonnet::receipt;
+	  $message.=' Your receipt is '.&Apache::lonnet::receipt;
       }
       $button=0;
       $previousmsg='';
@@ -336,6 +360,12 @@ sub decideoutput {
   } elsif ($award eq 'MISSING_ANSWER') {
       $message = 'Some parts were not submitted';
       $button = 1;
+  } elsif ($award eq 'ERROR') {
+      $message = 'An error occured while trying to grade answer.';
+      $button = 1;
+  } elsif ($award eq 'TOO_LONG') {
+      $message = "The submitted answer was too long.";
+      $button=1;
   } elsif ($award eq 'WANTED_NUMERIC') {
       $message = "This question expects a numeric answer";
       $button=1;
@@ -404,7 +434,8 @@ sub setgradedata {
     $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
     return '';
   } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
-       /^correct/ || $Apache::lonhomework::scantronmode) {
+       /^correct/ || $Apache::lonhomework::scantronmode ||
+	    lc($Apache::lonhomework::problemstatus) eq 'no') {
     #handle assignment of tries and solved status
     my $solvemsg;
     if ($Apache::lonhomework::scantronmode) {
@@ -420,10 +451,9 @@ sub setgradedata {
 	    $Apache::lonhomework::history{"resource.$id.tries"} + 1;
 	$Apache::lonhomework::results{"resource.$id.solved"} =
 	    $solvemsg;
-	my $numawards=scalar(@Apache::inputtags::responselist);
-	&Apache::lonxml::debug("Whaaa!");
+	my $numawards=scalar(@Apache::inputtags::response);
 	$Apache::lonhomework::results{"resource.$id.awarded"} = 0;
-	foreach my $res (@Apache::inputtags::responselist) {
+	foreach my $res (@Apache::inputtags::response) {
 	    $Apache::lonhomework::results{"resource.$id.awarded"}+=
 	       $Apache::lonhomework::results{"resource.$id.$res.awarded"};
 	}
@@ -456,13 +486,19 @@ sub setgradedata {
     } else {
       $Apache::lonhomework::results{"resource.$id.solved"} =
 	'incorrect_attempted';
+      if (lc($Apache::lonhomework::problemstatus) eq 'no') {
+	  $Apache::lonhomework::results{"resource.$id.tries"} =
+	      $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+      }
     }
 
     # check if this was a previous submission if it was delete the
     # unneeded data and update the previously_used attribute
     if ( $previously_used eq 'PREVIOUSLY_USED') {
-      delete($Apache::lonhomework::results{"resource.$id.tries"});
-      $Apache::lonhomework::results{"resource.$id.previous"} = '1';
+	if (lc($Apache::lonhomework::problemstatus) ne 'no') {
+	    delete($Apache::lonhomework::results{"resource.$id.tries"});
+	    $Apache::lonhomework::results{"resource.$id.previous"} = '1';
+	}
     } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
       #delete all data as they student didn't do anything, but save
       #the list of collaborators.
@@ -488,7 +524,7 @@ sub grade {
   my $response='';
   if ( defined $ENV{'form.submitted'}) {
     my @awards = ();
-    foreach $response (@Apache::inputtags::responselist) {
+    foreach $response (@Apache::inputtags::response) {
       &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");
       my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"};
       &Apache::lonxml::debug("keeping $value from $response for $id");