--- loncom/homework/structuretags.pm	2015/01/19 15:35:53	1.527
+++ loncom/homework/structuretags.pm	2015/02/22 01:34:48	1.528
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.527 2015/01/19 15:35:53 goltermann Exp $
+# $Id: structuretags.pm,v 1.528 2015/02/22 01:34:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -347,7 +347,7 @@ sub page_start {
         $extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
     }
     my $is_task = ($env{'request.uri'} =~ /\.task$/);
-    my $needs_upload;
+    my ($needs_upload,$partlist);
     my ($symb)= &Apache::lonnet::whichuser();
     my ($map,$resid,$resurl)=&Apache::lonnet::decode_symb($symb);
     if ($is_task) {
@@ -365,6 +365,12 @@ sub page_start {
                     unless ($is_page) {
                         $needs_upload = 1;
                     }
+                    if ((ref($tagstack) eq 'ARRAY') && ($tagstack->[-1] eq 'problem')) {
+                        my $res = $navmap->getBySymb($symb);
+                        if (ref($res)) {
+                            $partlist = $res->parts();
+                        }
+                    }
                 }
             }
         } else {
@@ -376,10 +382,17 @@ sub page_start {
                     if (ref($mapres)) {
                         $is_page = $mapres->is_page();
                     }
-                    unless ($is_page) {
+                    if ($is_page) {
+                        if ((ref($tagstack) eq 'ARRAY') && ($tagstack->[-1] eq 'problem')) {
+                            my $res = $navmap->getBySymb($symb);
+                            if (ref($res)) {
+                                $partlist = $res->parts();
+                            }
+                        }
+                    } else {
                         my $res = $navmap->getBySymb($symb);
                         if (ref($res)) {
-                            my $partlist = $res->parts();
+                            $partlist = $res->parts();
                             if (ref($partlist) eq 'ARRAY') {
                                 foreach my $part (@{$partlist}) {
                                     my @types = $res->responseType($part);
@@ -515,7 +528,7 @@ sub page_start {
 		"\t".'<input type="hidden" name="symb" value="'.$symb.'" />'."\n";
 	}
     }
-    return ($page_start,$form_tag_start);
+    return ($page_start,$form_tag_start,$partlist);
 }
 
 #use Time::HiRes();
@@ -546,7 +559,7 @@ sub get_resource_name {
 }
 
 sub setup_rndseed {
-    my ($safeeval,$target)=@_;
+    my ($safeeval,$target,$probpartlist)=@_;
     my ($symb)=&Apache::lonnet::whichuser();
     my ($questiontype,$set_safespace,$rndseed);
     if ($target eq 'analyze') {
@@ -607,7 +620,13 @@ sub setup_rndseed {
         }
         unless (($target eq 'analyze') && (defined($rndseed))) {
             $rndseed=&Apache::lonnet::rndseed();
-            my $curr_try = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
+            my $partfortries = $Apache::inputtags::part;
+            if (ref($probpartlist) eq 'ARRAY') {
+                if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $Apache::inputtags::part)) {
+                    $partfortries = $probpartlist->[0];
+                }
+            }
+            my $curr_try = $Apache::lonhomework::history{"resource.$partfortries.tries"};
             if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
                 $curr_try ++;
             }
@@ -615,7 +634,7 @@ sub setup_rndseed {
                 $rndseed = $1;
             }
             if ($curr_try) {
-                my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+                my $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries");
                 if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
                     my $inc = int(($curr_try-1)/$reqtries);
                     $rndseed += $inc;
@@ -625,6 +644,9 @@ sub setup_rndseed {
             }
         }
         $set_safespace = 1;
+        if ($target eq 'grade') {
+            $Apache::lonhomework::rawrndseed = $rndseed;
+        }
     }
     if ($set_safespace) {
         if ($safeeval) {
@@ -1512,6 +1534,8 @@ sub reset_problem_globals {
     undef($Apache::inputtags::part);
     if ($type eq 'Task') {
         undef($Apache::inputtags::slot_name);
+    } elsif ($type eq 'problem') {
+        undef($Apache::lonhomework::rawrndseed);
     }
 #don't undef this, lonhomework.pm takes care of this, we use this to 
 #detect if we try to do 2 problems in one file
@@ -1613,7 +1637,7 @@ sub start_problem {
     my $resource_due;
 
     my $name= &get_resource_name($parstack,$safeeval);
-    my ($result,$form_tag_start,$slot_name,$slot);
+    my ($result,$form_tag_start,$slot_name,$slot,$probpartlist);
 
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
         $target eq 'tex') {
@@ -1629,9 +1653,18 @@ sub start_problem {
 
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
 	|| $target eq 'edit') {
-	($result,$form_tag_start) =
+	($result,$form_tag_start,$probpartlist) =
 	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
 			$name);
+    } elsif (($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) {
+        my ($symb)= &Apache::lonnet::whichuser();
+        my $navmap = Apache::lonnavmaps::navmap->new();
+        if (ref($navmap)) {
+            my $res = $navmap->getBySymb($symb);
+            if (ref($res)) {
+                $probpartlist = $res->parts();
+            }
+        }
     }
 
     if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}
@@ -1641,7 +1674,20 @@ sub start_problem {
 	$target eq 'tex') {
 
 	#handle rand seed in construction space
-	my $rndseed=&setup_rndseed($safeeval,$target);
+	my $rndseed=&setup_rndseed($safeeval,$target,$probpartlist);
+        if (($target eq 'grade') && &Apache::response::submitted()) {
+            if ($Apache::lonhomework::type eq 'randomizetry') {
+                $Apache::lonhomework::results{'resource.0.rawrndseed'}=$rndseed;
+            } else {
+                my @parts;
+                if (ref($probpartlist) eq 'ARRAY') {
+                    @parts = @{$probpartlist};
+                }
+                unless (@parts) {
+                    $Apache::lonhomework::results{'resource.0.rawrndseed'}=$Apache::lonhomework::rawrndseed;
+                }
+            }
+        }
 	my ($symb)=&Apache::lonnet::whichuser();
 
 	if ($env{'request.state'} ne "construct" && 
@@ -2698,6 +2744,14 @@ sub start_part {
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
     my $newtype=&Apache::lonnet::EXT("resource.$id.type");
     if ($newtype) { $Apache::lonhomework::type=$newtype; }
+    if ($Apache::lonhomework::type eq 'randomizetry') {
+        my $rndseed=&setup_rndseed($safeeval,$target);
+        if (($target eq 'grade') && &Apache::response::submitted()) {
+            $Apache::lonhomework::results{"resource.$id.rawrndseed"}=$rndseed;
+        }
+    } elsif (($target eq 'grade') && &Apache::response::submitted()) {
+        $Apache::lonhomework::results{"resource.$id.rawrndseed"}=$Apache::lonhomework::rawrndseed;
+    }
     my $in_order_show=&ordered_show_check();
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
     $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';