[LON-CAPA-cvs] cvs: loncom /enrollment Autoupdate.pl /metadata_database searchcat.pl /misc refresh_courseids_db.pl

[raeburn]

raeburn		Wed Jan 27 22:23:18 2016 EDT

  Modified files:              
    /loncom/metadata_database	searchcat.pl 
    /loncom/misc	refresh_courseids_db.pl 
    /loncom/enrollment	Autoupdate.pl 
  Log:
  - Accommodate sub-directory structure of user directories containing dot(s) 
    within the first three characters of the username.
  
  
Index: loncom/metadata_database/searchcat.pl
diff -u loncom/metadata_database/searchcat.pl:1.82 loncom/metadata_database/searchcat.pl:1.83
--- loncom/metadata_database/searchcat.pl:1.82	Thu Jan 16 13:31:31 2014
+++ loncom/metadata_database/searchcat.pl	Wed Jan 27 22:22:59 2016
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # searchcat.pl "Search Catalog" batch script
 #
-# $Id: searchcat.pl,v 1.82 2014/01/16 13:31:31 raeburn Exp $
+# $Id: searchcat.pl,v 1.83 2016/01/27 22:22:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -460,7 +460,7 @@
         closedir(DIR);
         $depth ++;
         foreach my $item (@contents) {
-            if ($depth < 4) {
+            if (($depth < 4) && (length($item) == 1)) {
                 &descend_tree($dom,$dir.'/'.$item,$depth,$allportusers,$alldomusers);
             } else {
                 if (-e $dir.'/'.$item.'/file_permissions.db') {
Index: loncom/misc/refresh_courseids_db.pl
diff -u loncom/misc/refresh_courseids_db.pl:1.19 loncom/misc/refresh_courseids_db.pl:1.20
--- loncom/misc/refresh_courseids_db.pl:1.19	Sat Jun  7 19:13:51 2014
+++ loncom/misc/refresh_courseids_db.pl	Wed Jan 27 22:23:09 2016
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # The LearningOnline Network
 #
-# $Id: refresh_courseids_db.pl,v 1.19 2014/06/07 19:13:51 raeburn Exp $
+# $Id: refresh_courseids_db.pl,v 1.20 2016/01/27 22:23:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -122,7 +122,7 @@
         closedir(DIR);
         $depth ++;
         foreach my $item (@contents) {
-            if ($depth < 4) {
+            if (($depth < 4) && (length($item) == 1)) {
                 &recurse_courses($cdom,$dir.'/'.$item,$depth,$courseshash,
                                  $currhash,$lastaccess,$autoassign,$fh);
             } elsif ($item =~ /^$match_courseid$/) {
Index: loncom/enrollment/Autoupdate.pl
diff -u loncom/enrollment/Autoupdate.pl:1.22 loncom/enrollment/Autoupdate.pl:1.23
--- loncom/enrollment/Autoupdate.pl:1.22	Sun Dec 18 01:23:21 2011
+++ loncom/enrollment/Autoupdate.pl	Wed Jan 27 22:23:18 2016
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # Automated Userinfo update script
-# $Id: Autoupdate.pl,v 1.22 2011/12/18 01:23:21 raeburn Exp $
+# $Id: Autoupdate.pl,v 1.23 2016/01/27 22:23:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -198,7 +198,7 @@
         closedir(DIR);
         $depth ++;
         foreach my $item (@contents) {
-            if ($depth < 4) {
+            if (($depth < 4) && (length($item) == 1)) {
                 &descend_tree($dom,$dir.'/'.$item,$depth,$alldomusers,$coursesref);
             } elsif (-e $dir.'/'.$item.'/passwd') {
                 if (ref($coursesref) eq 'HASH') {