--- loncom/homework/structuretags.pm	2010/12/18 22:49:33	1.479
+++ loncom/homework/structuretags.pm	2011/01/13 18:11:45	1.485
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.479 2010/12/18 22:49:33 raeburn Exp $
+# $Id: structuretags.pm,v 1.485 2011/01/13 18:11:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,6 +128,7 @@ sub homework_js {
            &setmode_javascript().
 	<<'JS';
 <script type="text/javascript">
+// <![CDATA[
 function setSubmittedPart (part) {
    this.document.lonhomework.submitted.value="part_"+part;
 }
@@ -145,7 +146,7 @@ function image_response_click (which, e)
     input_element.value = click;
     img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;
 }
-
+// ]]>
 </script>
 JS
 }
@@ -153,49 +154,55 @@ JS
 sub setmode_javascript {
     return <<"ENDSCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function setmode(form,probmode) {
     form.problemmode.value = probmode;
     form.submit();
 }
+// ]]>
 </script>
 ENDSCRIPT
 }
 
 sub file_delchk_js {
-    my $delfilewarn = &mt('You have indicated you wish to delete some files previously included for submission.').'\\n'.
-                          &mt('Deleted files will not be graded.').' '.
-                          &mt('Submit Answer?');
+    my $delfilewarn = &mt('You have indicated you wish to remove some files previously included in your submission.').'\\n'.
+                      &mt('Continue submission with these files removed?');
     return <<"ENDSCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function file_deletion_check(formname) {
-    var str = new RegExp("^HWFILE.+_delete\$");
-    var delfilecount = 0;
     var elemnum = formname.elements.length;
     if (elemnum == 0) {
         return true;
     }
-    for (i=0; i<formname.elements.length; i++) {
+    var str = new RegExp("^HWFILE.+_delete\$");
+    var delboxes = new Array();
+    for (var i=0; i<formname.elements.length; i++) {
         var id = formname.elements[i].id;
         if (id != '') {
             if (str.test(id)) {
                 if (formname.elements[i].type == 'checkbox') {
                     if (formname.elements[i].checked) {
-                        delfilecount ++;
+                        delboxes.push(id);
                     }
                 }
             }
         }
     }
-    if (delfilecount > 0) {
+    if (delboxes.length > 0) {
         if (confirm("$delfilewarn")) {
             return true;
         } else {
+            for (var j=0; j<delboxes.length; j++) {
+                formname.elements[delboxes[j]].checked = false;
+            }
             return false;
         }
     } else {
         return true;
     }
 }
+// ]]>
 </script>
 ENDSCRIPT
 }
@@ -393,6 +400,7 @@ sub setup_rndseed {
             if ($tries) {
                 $rndseed += $tries;
             }
+            $env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
         }
 	if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')
 	      && $env{'form.submitted'} eq 'yes')  ||
@@ -717,13 +725,6 @@ sub finalize_storage {
 					      $namespace,'',$domain,$name);
 	    &Apache::lonxml::debug('Construct Store return message:'.$result);
 	} else {
-            if ($Apache::lonhomework::type eq 'randomizetry') {
-                foreach my $key (keys(%Apache::lonhomework::results)) {
-                    if ($key =~ /^resource\.([^\.]+)\.tries/) {
-                        $Apache::lonhomework::results{'resource.'.$1.'.rndseed'}=$env{'form.'.$1.'.rndseed'};
-                    }
-                }
-            }
 	    $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
 					    $symb,$courseid,$domain,$name);
 	    &Apache::lonxml::debug('Store return message:'.$result);
@@ -804,12 +805,12 @@ sub store_aggregates {
                             $cdomain,$cname);
     }
     if (keys(%anoncounter) > 0) {
-        &Apache::lonnet::cinc('nohist_anonsurveys',\%anoncounter,
-                            $cdomain,$cname);
+        &Apache::lonnet::cput('nohist_anonsurveys',\%anoncounter,
+                              $cdomain,$cname);
     }
     if (keys(%randtrycounter) > 0) {
-        &Apache::lonnet::cinc('nohist_randomizetry',\%randtrycounter,
-                            $cdomain,$cname);
+        &Apache::lonnet::cput('nohist_randomizetry',\%randtrycounter,
+                              $cdomain,$cname);
     }
 }