--- loncom/homework/structuretags.pm	2005/04/07 06:56:22	1.284
+++ loncom/homework/structuretags.pm	2005/04/18 22:39:35	1.288
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.284 2005/04/07 06:56:22 albertel Exp $
+# $Id: structuretags.pm,v 1.288 2005/04/18 22:39:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -317,6 +317,8 @@ sub initialize_storage {
 # Stores away the result has to a student's environment
 # checks form.grade_ for specific values, other wises stores
 # to the running users environment
+# Will increment totals for attempts, students, and corrects
+# if running user has student role.  
 sub finalize_storage {
     my $result;
     my ($temp) = keys %Apache::lonhomework::results;
@@ -331,11 +333,45 @@ sub finalize_storage {
 	    $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
 					    $symb,$courseid,$domain,$name);
 	    &Apache::lonxml::debug('Store return message:'.$result);
+            if ($env{'request.role'} =~/^st/) {
+                &store_aggregates($symb,$courseid);
+            }
 	}
     }
     return $result;
 }
 
+# -------------------------------------------------------------store_aggregates
+# Sends hash of values to be incremented in nohist_resourcetracker.db
+# for the course. Increments total number of attempts, unique students 
+# and corrects for each part for an instance of a problem, as appropriate.
+sub store_aggregates {
+    my ($symb,$courseid) = @_;
+    my %aggregate;
+    my @parts;
+    my $cdomain = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};
+    foreach my $key (keys(%Apache::lonhomework::results)) {
+        if ($key =~ /resource\.([^\.]+)\.tries/) {
+            push(@parts, $1);
+        }
+    }
+    foreach my $part (@parts) {
+        if ($Apache::lonhomework::results{'resource.'.$part.'.award'}
+	    eq 'APPROX_ANS' ||
+	    $Apache::lonhomework::results{'resource.'.$part.'.award'}
+	    eq 'EXACT_ANS') {
+            $aggregate{$symb."\0".$part."\0correct"} = 1;
+        }
+        if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {
+            $aggregate{$symb."\0".$part."\0users"} = 1;
+        }
+        $aggregate{$symb."\0".$part."\0attempts"} = 1;
+    }
+    &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
+			  $cdomain,$cname); 
+}
+
 sub checkout_msg {
     my %lt=&Apache::lonlocal::texthash( 
 		'resource'=>'The resource needs to be checked out',