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

albertel lon-capa-cvs@mail.lon-capa.org
Wed, 08 Mar 2006 21:47:18 -0000


albertel		Wed Mar  8 16:47:18 2006 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - transfer_profile_to_env can accept either argument as undfined. (actually I'm not sure arg1 was ever a good idea ...)
  
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.719 loncom/lonnet/perl/lonnet.pm:1.720
--- loncom/lonnet/perl/lonnet.pm:1.719	Mon Mar  6 21:46:03 2006
+++ loncom/lonnet/perl/lonnet.pm	Wed Mar  8 16:47:15 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.719 2006/03/07 02:46:03 banghart Exp $
+# $Id: lonnet.pm,v 1.720 2006/03/08 21:47:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -260,6 +260,13 @@
 
 sub transfer_profile_to_env {
     my ($lonidsdir,$handle)=@_;
+    if (!defined($lonidsdir)) {
+	$lonidsdir = $perlvar{'lonIDsDir'};
+    }
+    if (!defined($handle)) {
+        ($handle) = ($env{'user.environment'} =~m|/([^/]+)\.id$| );
+    }
+
     my @profile;
     {
 	open(my $idf,"$lonidsdir/$handle.id");
@@ -5236,10 +5243,7 @@
 
 sub sort_course_groups { # Sort groups based on defined rankings. Default is sort().
     my ($grouplist,$courseid) = @_;
-    my @groups = split/:/,$grouplist;
-    if (@groups > 1) {
-        @groups = sort(@groups);
-    }
+    my @groups = sort(split(/:/,$grouplist));
     return @groups;
 }