[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm

[raeburn]

raeburn		Tue Apr 24 14:05:23 2018 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  - Exclude .rights file from list of "course author" files available for
    import via "Import from Course Resources" item in Course Editor.
  - Fix typo.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1314 loncom/interface/loncommon.pm:1.1315
--- loncom/interface/loncommon.pm:1.1314	Tue Apr 24 13:40:32 2018
+++ loncom/interface/loncommon.pm	Tue Apr 24 14:05:22 2018
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1314 2018/04/24 13:40:32 raeburn Exp $
+# $Id: loncommon.pm,v 1.1315 2018/04/24 14:05:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2234,6 +2234,7 @@
                 }
                 my @ordered = ();
                 foreach my $file (sort { lc($a) cmp lc($b) } (keys(%{$files{$key}}))) {
+                    next if ($file =~ /\.rights$/);
                     if ($only) {
                         my ($ext) = ($file =~ /\.([^.]+)$/);
                         unless ($possexts{lc($ext)}) {
@@ -2277,11 +2278,13 @@
                 unless ($possexts{lc($ext)}) {
                     next;
                 }
+            } else {
+                next if ($file =~ /\.rights$/);
             }
             push(@singledirfiles,$file);
         }
         if (@singledirfiles) {
-            $possdirs == 1;
+            $possdirs = 1;
         }
     }
     if (($possdirs == 1) && (@singledirfiles)) {