[BACK]Return to lonchart.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/Attic/lonchart.pm between versions 1.40 and 1.41

version 1.40, 2002/05/30 13:08:34 version 1.41, 2002/06/03 19:28:17
Line 242  sub usection { Line 242  sub usection {
     if($checkForError =~ /^(con_lost|error|no_such_host)/i) {      if($checkForError =~ /^(con_lost|error|no_such_host)/i) {
  return -1;   return -1;
     }      }
       my $cursection='-1';
       my $oldsection='-1';
       my $status='Expired';
     foreach my $key (keys (%result)) {      foreach my $key (keys (%result)) {
  my $value = $result{$key};   my $value = $result{$key};
         if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) {          if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) {
             my $section=$1;              my $section=$1;
             if ($key eq $courseid.'_st') { $section=''; }              if ($key eq $courseid.'_st') { $section=''; }
     my ($dummy,$end,$start)=split(/\_/,$value);      my ($dummy,$end,$start)=split(/\_/,$value);
     if ( $ActiveFlag ne 'Any' ) {      my $now=time;
  my $now=time;      my $notactive=0;
  my $notactive=0;      if ($start) { if ($now<$start) { $notactive=1; } }
  if ($start) {      if ($end) { if ($now>$end) { $notactive=1; } }
     if ($now<$start) { $notactive=1; }      if ($notactive == 0) { $status='Active';$cursection=$section;}
  }      if ($notactive == 1) { $oldsection=$section;}
  if ($end) {  
     if ($now>$end) { $notactive=1; }  
  }  
  if ((($ActiveFlag eq 'Expired') && $notactive == 1) ||   
                     (($ActiveFlag eq 'Active') && $notactive == 0 ) ) {  
     return $section;  
  }  
  else { return '-1'; }   
     }  
     return $section;  
         }          }
     }      }
       if ($status eq $ActiveFlag) {
         if ($cursection eq '-1') { return $oldsection; }
         return $cursection;
       }
       if ($ActiveFlag eq 'Any') { 
         if ($cursection eq '-1') { return $oldsection; }
         return $cursection;
       }
     return '-1';      return '-1';
 }  }
   
Line 287  sub BuildChart { Line 287  sub BuildChart {
     $r->print('<h1>Could not access course data</h1>');      $r->print('<h1>Could not access course data</h1>');
  } else {   } else {
     my $now=time;      my $now=time;
     foreach my $name (keys (%classlist)) {      foreach my $name (sort(keys(%classlist))) {
  my $value=$classlist{$name};   my $value=$classlist{$name};
  my ($end,$start)=split(/\:/,$value);   my ($end,$start)=split(/\:/,$value);
  my $active=1;   my $active=1;
Line 308  sub BuildChart { Line 308  sub BuildChart {
     'Data not available: '.$name;      'Data not available: '.$name;
     } else {      } else {
  my %reply=&Apache::lonnet::idrget($sdom,$sname);   my %reply=&Apache::lonnet::idrget($sdom,$sname);
  my $reply=&Apache::lonnet::get('environment',   my %name=&Apache::lonnet::get('environment',
        ['lastname','generation'         ['lastname','generation'
        ,'firstname'         ,'firstname'
        ,'middlename'],         ,'middlename'],
        $sdom,$sname);         $sdom,$sname);
    my $name=$name{lastname};
    if ($name{generation}) {$name.=" $name{generation}";}
    $name.=',';
    if ($name{firstname}) {$name.=" $name{firstname}";}
    if ($name{middlename}) {$name.=" $name{middlename}";}
    if ($name eq ',') {$name='';}
  #$ssec=(int($ssec)) ? int($ssec) : $ssec;   #$ssec=(int($ssec)) ? int($ssec) : $ssec;
  my $sec=sprintf('%3s',$ssec);   my $sec=sprintf('%3s',$ssec);
  $rowlabels[$thisindex]=$sec.' '.$reply{$sname}.' ';   $rowlabels[$thisindex]=$sec.' '.$reply{$sname}.' ';
  $PreCol[$thisindex] .= $reply.':'.$sec;   $PreCol[$thisindex] .= $name.':'.$sec;
  my $i=0;   $rowlabels[$thisindex].=$name.' ';
  foreach (split(/\&/,$reply)) {  
     $i++;  
     if ( $_ ne '') {  
  $rowlabels[$thisindex].=&Apache::lonnet::unescape($_).' ';  
     }  
     if ($i == 2) {  
  chop($rowlabels[$thisindex]);  
  $rowlabels[$thisindex].=', ';  
     }  
  }  
     }      }
  }   }
     }      }
Removed from v.1.40  
changed lines
  Added in v.1.41

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