--- loncom/homework/structuretags.pm	2017/03/14 12:20:57	1.512.2.13
+++ loncom/homework/structuretags.pm	2019/08/07 21:44:28	1.512.2.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.512.2.13 2017/03/14 12:20:57 raeburn Exp $
+# $Id: structuretags.pm,v 1.512.2.17 2019/08/07 21:44:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -496,7 +496,9 @@ sub page_start {
             }
         }
         if ($needs_upload) {
-            $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js();
+            $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js().
+                           '<script type="text/javascript" '.
+                           'src="/res/adm/includes/file_upload.js"></script>';
         }
     }
 
@@ -650,10 +652,11 @@ sub setup_rndseed {
     unless (defined($questiontype)) {
         $questiontype = $Apache::lonhomework::type;
     }
-    if ($env{'request.state'} eq "construct" 
-	|| $symb eq '' 
-	|| $Apache::lonhomework::type eq 'practice'
-	|| $Apache::lonhomework::history{'resource.CODE'}) {
+    if (($env{'request.state'} eq "construct") 
+        || ($symb eq '')
+        || ($Apache::lonhomework::type eq 'practice')
+        || ($Apache::lonhomework::history{'resource.CODE'}) 
+        || (($env{'form.code_for_randomlist'}) && ($target eq 'analyze'))) {
 	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 						['rndseed']);
 	$rndseed=$env{'form.rndseed'};
@@ -662,7 +665,9 @@ sub setup_rndseed {
 	    if (!$rndseed) {
 		$rndseed=time;
 	    }
-	    $env{'form.rndseed'}=$rndseed;
+            unless ($env{'form.code_for_randomlist'}) {
+                $env{'form.rndseed'}=$rndseed;
+            }
 	}
         if (($env{'request.state'} eq "construct") && 
             ($Apache::lonhomework::type eq 'randomizetry')) {
@@ -690,7 +695,11 @@ sub setup_rndseed {
 	       $rndseed=join(':',&Apache::lonnet::digest($rndseed));
             }
         }
-        if ($Apache::lonhomework::history{'resource.CODE'}) {
+        if (($env{'form.code_for_randomlist'}) && ($target eq 'analyze')) {
+            $env{'form.CODE'} = $env{'form.code_for_randomlist'};
+            $rndseed=&Apache::lonnet::rndseed();
+            undef($env{'form.CODE'});
+        } elsif ($Apache::lonhomework::history{'resource.CODE'}) {
 	   $rndseed=&Apache::lonnet::rndseed();
 	}
         $set_safespace = 1;
@@ -1519,13 +1528,16 @@ sub start_problem {
     my $resource_due;
 
     my $name= &get_resource_name($parstack,$safeeval);
-    my ($result,$form_tag_start,$slot_name,$slot,$probpartlist);
+    my ($result,$form_tag_start,$slot_name,$slot,$probpartlist,$firstaccres);
 
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
         $target eq 'tex') {
         if ($env{'form.markaccess'}) {
             my @interval=&Apache::lonnet::EXT("resource.0.interval");
-            &Apache::lonnet::set_first_access($interval[1],$interval[0]);
+            my $is_set = &Apache::lonnet::set_first_access($interval[1],$interval[0]);
+            unless (($is_set eq 'ok') || ($is_set eq 'already_set')) {
+                $firstaccres = $is_set;
+            }
         }
 
         ($status,$accessmsg,$slot_name,$slot) =
@@ -1639,6 +1651,10 @@ sub start_problem {
 		} elsif ($status eq 'UNCHECKEDOUT') {
 		    $msg.=&checkout_msg();
 		} elsif ($status eq 'NOT_YET_VIEWED') {
+                    if ($firstaccres) {
+                        $msg .= '<p class="LC_error">'.
+                                &mt('A problem occurred when trying to start the timer.').'</p>';
+                    }
 		    $msg.=&firstaccess_msg($accessmsg,$symb);
 		} elsif ($status eq 'NOT_IN_A_SLOT') {
 		    $msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");
@@ -2009,6 +2025,8 @@ sub end_library {
 	     && ($#$tagstack eq 0 && $$tagstack[0] eq 'library') 
 	     && $env{'request.state'} eq "construct") {
 	$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
+    } elsif ($target eq 'meta') {
+        $result.=&Apache::response::meta_response_order();
     }
     if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {
 	&reset_problem_globals('library');
@@ -2491,7 +2509,12 @@ sub start_randomlist {
 	}
 	if (@randomlist) {
 	    my @idx_arr = (0 .. $#randomlist);
-	    &Apache::structuretags::shuffle(\@idx_arr);
+            if ($env{'form.code_for_randomlist'}) {
+                &Apache::structuretags::shuffle(\@idx_arr,$target);
+                undef($env{'form.code_for_randomlist'});
+            } else {
+                &Apache::structuretags::shuffle(\@idx_arr);
+            }
 	    my $bodytext = '';
 	    my $show=$#randomlist;
 	    my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
@@ -2530,10 +2553,10 @@ sub start_randomlist {
 }
 
 sub shuffle {
-    my $a=shift;
+    my ($a,$target) = @_;
     my $i;
     if (ref($a) eq 'ARRAY' && @$a) {
-	&Apache::response::pushrandomnumber();
+	&Apache::response::pushrandomnumber(undef,$target);
 	for($i=@$a;--$i;) {
 	    my $j=int(&Math::Random::random_uniform() * ($i+1));
 	    next if $i == $j;