loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

-version 1.1380, 2018/08/07 17:12:25
+version 1.1381, 2018/08/09 14:04:35
  Line 10041  sub is_course {
      my ($cdom, $cnum) = scalar(@_) == 1 ?
           ($_[0] =~ /^($match_domain)_($match_courseid)$/)  :  @_;
-     return unless $cdom and $cnum;
+     return unless (($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/));
+     my $uhome=&homeserver($cnum,$cdom);
-     my %courses = &courseiddump($cdom, '.', 1, '.', '.', $cnum, undef, undef,
+     my $iscourse;
-         '.');
+     if (grep { $_ eq $uhome } current_machine_ids()) {
+         $iscourse = &Lond::is_course($cdom,$cnum);
-     return unless(exists($courses{$cdom.'_'.$cnum}));
+     } else {
+         my $hashid = $cdom.':'.$cnum;
+         ($iscourse,my $cached) = &is_cached_new('iscourse',$hashid);
+         unless (defined($cached)) {
+             my %courses = &courseiddump($cdom, '.', 1, '.', '.',
+                                         $cnum,undef,undef,'.');
+             $iscourse = 0;
+             if (exists($courses{$cdom.'_'.$cnum})) {
+                 $iscourse = 1;
+             }
+             &do_cache_new('iscourse',$hashid,$iscourse,3600);
+         }
+     }
+     return unless ($iscourse);
      return wantarray ? ($cdom, $cnum) : $cdom.'_'.$cnum;
  }