[LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm

[albertel]

albertel		Sat Feb  5 01:44:57 2005 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - More of BUG#1444 lonnt EXT now properly cascades  resource defaults before course wide folder/general defaults
  
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.592 loncom/lonnet/perl/lonnet.pm:1.593
--- loncom/lonnet/perl/lonnet.pm:1.592	Mon Jan 31 06:27:14 2005
+++ loncom/lonnet/perl/lonnet.pm	Sat Feb  5 01:44:57 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.592 2005/01/31 11:27:14 www Exp $
+# $Id: lonnet.pm,v 1.593 2005/02/05 06:44:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4313,6 +4313,7 @@
 	if (defined($courseid) && $courseid eq $ENV{'request.course.id'}) {
 	    if (!$symbparm) { $symbparm=&symbread(); }
 	}
+	my ($courselevelm,$courselevel);
 	if ($symbparm && defined($courseid) && 
 	    $courseid eq $ENV{'request.course.id'}) {
 
@@ -4340,9 +4341,9 @@
 	    my $seclevelr=$courseid.'.['.$section.'].'.$symbparm;
 	    my $seclevelm=$courseid.'.['.$section.'].'.$mapparm;
 
-	    my $courselevel=$courseid.'.'.$spacequalifierrest;
+	    $courselevel=$courseid.'.'.$spacequalifierrest;
 	    my $courselevelr=$courseid.'.'.$symbparm;
-	    my $courselevelm=$courseid.'.'.$mapparm;
+	    $courselevelm=$courseid.'.'.$mapparm;
 
 # ----------------------------------------------------------- first, check user
 	    #most student don\'t have any data set, check if there is some data
@@ -4383,8 +4384,7 @@
 	    my $coursereply=&courseresdata($ENV{'course.'.$courseid.'.num'},
 					   $ENV{'course.'.$courseid.'.domain'},
 					   ($seclevelr,$seclevelm,$seclevel,
-					    $courselevelr,$courselevelm,
-					    $courselevel));
+					    $courselevelr));
 	    if (defined($coursereply)) { return $coursereply; }
 
 # ------------------------------------------------------ third, check map parms
@@ -4413,6 +4413,13 @@
 	$metadata=&metadata($filename,'parameter_'.$spacequalifierrest);
 	if (defined($metadata)) { return $metadata; }
 
+	if ($symbparm && defined($courseid) && 
+	    $courseid eq $ENV{'request.course.id'}) {
+	    my $coursereply=&courseresdata($ENV{'course.'.$courseid.'.num'},
+					   $ENV{'course.'.$courseid.'.domain'},
+					   ($courselevelm,$courselevel));
+	    if (defined($coursereply)) { return $coursereply; }
+	}
 # ------------------------------------------------------------------ Cascade up
 	unless ($space eq '0') {
 	    my @parts=split(/_/,$space);