--- loncom/homework/structuretags.pm	2016/09/14 19:36:30	1.512.2.11
+++ loncom/homework/structuretags.pm	2018/09/14 23:09:43	1.512.2.15
@@ -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.11 2016/09/14 19:36:30 raeburn Exp $
+# $Id: structuretags.pm,v 1.512.2.15 2018/09/14 23:09:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -390,8 +390,10 @@ sub setmode_javascript {
 <script type="text/javascript">
 // <![CDATA[
 function setmode(form,probmode) {
+    var initial = form.problemmode.value;
     form.problemmode.value = probmode;
     form.submit();
+    form.problemmode.value = initial;
 }
 // ]]>
 </script>
@@ -417,9 +419,13 @@ sub page_start {
     $extra_head .= &homework_js().
                    &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
     if (&Apache::lonhtmlcommon::htmlareabrowser()) {
-        my %textarea_args = (
+        my %textarea_args;
+        if (($env{'request.state'} ne 'construct') ||
+            ($env{'environment.nocodemirror'})) {
+            %textarea_args = (
                                 dragmath => 'math',
                               );
+        }
         $extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
     }
     my $is_task = ($env{'request.uri'} =~ /\.task$/);
@@ -644,10 +650,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'};
@@ -656,7 +663,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')) {
@@ -684,7 +693,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;
@@ -2003,6 +2016,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');
@@ -2485,7 +2500,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);
@@ -2524,10 +2544,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;
@@ -2933,9 +2953,13 @@ sub end_startouttext {
                  .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
                  .&Apache::edit::deletelist($target,$token)
                  .'</span></td>'
-	         .'<td><span id="math_'.$areaid.'">'
-		 .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
-		 .'</span></td>'
+	         .'<td><span id="math_'.$areaid.'">';
+	if ($env{'environment.nocodemirror'}) {
+	    $result.=&Apache::lonhtmlcommon::dragmath_button($areaid,1);
+	} else {
+	    $result.='&nbsp;';
+	}
+	$result.='</span></td>'
 		 .'<td>'
 		 .&Apache::edit::insertlist($target,$token)
 		 .'</td>'