--- loncom/homework/structuretags.pm	2005/04/29 21:22:33	1.291
+++ loncom/homework/structuretags.pm	2005/06/13 20:20:33	1.294
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.291 2005/04/29 21:22:33 albertel Exp $
+# $Id: structuretags.pm,v 1.294 2005/06/13 20:20:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -372,13 +372,19 @@ sub store_aggregates {
         }
         if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {
             $aggregate{$symb."\0".$part."\0users"} = 1;
+        } else {
+            my (undef,$last_reset) = &Apache::grades::get_last_resets($symb,$env{'request.course.id'},[$part]); 
+            if ($last_reset) {
+                if (&Apache::grades::get_num_tries(\%Apache::lonhomework::history,$last_reset,$part) == 0) {
+                    $aggregate{$symb."\0".$part."\0users"} = 1;
+                }
+            }
         }
         $aggregate{$symb."\0".$part."\0attempts"} = 1;
     }
-    if (%aggregate) {
+    if (keys (%aggregate) > 0) {
 	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
-			      $cdomain,$cname); 
-
+                            $cdomain,$cname);
     }
 }
 
@@ -745,7 +751,8 @@ sub end_problem {
 	}
 	if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
 	    && $env{'form.answer_output_mode'} ne 'tex') {
-	    $result.='</html>'; # normally we get it from xmlend, but in CSTR
+	    $result.=&Apache::lonxml::xmlend().'</html>';
+	                        # normally we get it from above, but in CSTR
 	                        # we always show answer mode too.
 	}
     } elsif ($target eq 'meta') {