loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

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

Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.297 and 1.300

-version 1.297, 2002/10/14 15:33:26
+version 1.300, 2002/11/12 22:23:37
  Line 77  use Apache::File;
  use LWP::UserAgent();
  use HTTP::Headers;
  use vars
- qw(%perlvar %hostname %homecache %badServerCache %hostip %spareid %hostdom
+ qw(%perlvar %hostname %homecache %badServerCache %hostip %iphost %spareid %hostdom
     %libserv %pr %prp %metacache %packagetab
     %courselogs %accesshash $processmarker $dumpcount
     %coursedombuf %coursehombuf %courseresdatacache %domaindescription);
  Line 593  sub idput {
  # ------------------------------------- Find the section of student in a course
+ sub getsection {
+     my ($udom,$unam,$courseid)=@_;
+     $courseid=~s/\_/\//g;
+     $courseid=~s/^(\w)/\/$1/;
+     my %Pending;
+     my %Expired;
+     #
+     # Each role can either have not started yet (pending), be active,
+     #    or have expired.
+     #
+     # If there is an active role, we are done.
+     #
+     # If there is more than one role which has not started yet,
+     #     choose the one which will start sooner
+     # If there is one role which has not started yet, return it.
+     #
+     # If there is more than one expired role, choose the one which ended last.
+     # If there is a role which has expired, return it.
+     #
+     foreach (split(/\&/,&reply('dump:'.$udom.':'.$unam.':roles',
+                         &homeserver($unam,$udom)))) {
+         my ($key,$value)=split(/\=/,$_);
+         $key=&unescape($key);
+         next if ($key !~/^$courseid(?:\/)*(\w+)*\_st$/);
+         my $section=$1;
+         if ($key eq $courseid.'_st') { $section=''; }
+         my ($dummy,$end,$start)=split(/\_/,&unescape($value));
+         my $now=time;
+         if (defined($end) && ($now > $end)) {
+             $Expired{$end}=$section;
+             next;
+         }
+         if (defined($start) && ($now < $start)) {
+             $Pending{$start}=$section;
+             next;
+         }
+         return $section;
+     }
+     #
+     # Presumedly there will be few matching roles from the above
+     # loop and the sorting time will be negligible.
+     if (scalar(keys(%Pending))) {
+         my ($time) = sort {$a <=> $b} keys(%Pending);
+         return $Pending{$time};
+     }
+     if (scalar(keys(%Expired))) {
+         my @sorted = sort {$a <=> $b} keys(%Expired);
+         my $time = pop(@sorted);
+         return $Expired{$time};
+     }
+     return '-1';
+ }
  sub usection {
      my ($udom,$unam,$courseid)=@_;
      $courseid=~s/\_/\//g;
- Line 1050  sub devalidate {
+ Line 1103  sub devalidate {
      if ($cid) {
  	my $key=$ENV{'user.name'}.':'.$ENV{'user.domain'}.':';
          my $status=
- 	    &del('nohist_calculatedsheet',
+ 	    &del('nohist_calculatedsheets',
  		 [$key.'studentcalc'],
  		 $ENV{'course.'.$cid.'.domain'},
  		 $ENV{'course.'.$cid.'.num'})
- Line 3395  BEGIN {
+ Line 3448  BEGIN {
  	 $hostname{$id}=$name;
  	 $hostdom{$id}=$domain;
  	 $hostip{$id}=$ip;
+ 	 $iphost{$ip}=$id;
  	 if ($domdescr) { $domaindescription{$domain}=$domdescr; }
  	 if ($role eq 'library') { $libserv{$id}=$name; }
         } else {

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.297
changed lines
	Added in v.1.300