[LON-CAPA-cvs] cvs: loncom / lonmap.pm

[raeburn]

raeburn		Thu May 30 04:02:03 2013 EDT

  Modified files:              
    /loncom	lonmap.pm 
  Log:
  - initialize $map_number each time load_map() is called for top-level map.
  - correct hash name when &merge_hash() is called for randompickseed.
  - remove trailing white space for one line.
  
  
Index: loncom/lonmap.pm
diff -u loncom/lonmap.pm:1.9 loncom/lonmap.pm:1.10
--- loncom/lonmap.pm:1.9	Thu Jan  3 20:32:40 2013
+++ loncom/lonmap.pm	Thu May 30 04:02:02 2013
@@ -2,7 +2,7 @@
 #
 #  Read maps into a 'big hash'.
 #
-# $Id: lonmap.pm,v 1.9 2013/01/03 20:32:40 raeburn Exp $
+# $Id: lonmap.pm,v 1.10 2013/05/30 04:02:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1425,8 +1425,8 @@
     $userdomain     = '';
     %mapalias_cache = ();
     %cenv           = ();
+    $map_number     =  0;
 
-    
     # 
 
     $username   = $uname;
@@ -1445,7 +1445,7 @@
  						     {'freshen_cache' => 1,
  						      'user'          => $uname}); 
  
- 	unless ($cenv{'url'}) { 
+ 	unless ($cenv{'url'}) {
  	    &Apache::lonnet::logthis("lonmap::loadmap failed: $cnum/$cdom - did not get url");
  	    return; 
  	}
@@ -1531,7 +1531,7 @@
 
 
 	&merge_hash($target_hash, 'randompick', \%randompick);
-	&merge_hash($target_hash, 'randompickseed', \%randompick);
+	&merge_hash($target_hash, 'randompickseed', \%randompickseed);
 	&merge_hash($target_hash, 'randomorder', \%randomorder);
 	&merge_hash($target_hash, 'encurl', \%encurl);
 	&merge_hash($target_hash, 'hiddenurl', \%hiddenurl);