Diff for /loncom/interface/loncommon.pm between versions 1.363 and 1.367

version 1.363, 2006/05/08 18:54:00 version 1.367, 2006/05/09 20:25:05
Line 3165  table#LC_top_nav td a, div#LC_top_nav a Line 3165  table#LC_top_nav td a, div#LC_top_nav a
   color: $font;    color: $font;
   font-family: $sans;    font-family: $sans;
 }  }
   table#LC_top_nav td.LC_top_nav_logo {
     background: $tabbg;
     text-align: right;
   }
 table#LC_breadcrumbs td {  table#LC_breadcrumbs td {
   background: $tabbg;    background: $tabbg;
   color: $font;    color: $font;
Line 3642  sub simple_error_page { Line 3646  sub simple_error_page {
     sub end_data_table_row {      sub end_data_table_row {
  return '</tr>';   return '</tr>';
     }      }
   
       sub start_data_table_header_row {
    return  '<tr class="LC_header_row">';
       }
   
       sub end_data_table_header_row {
    return '</tr>';
       }
 }  }
   
 ###############################################  ###############################################
Line 3747  Returns number of sections. Line 3759  Returns number of sections.
   
 ###############################################  ###############################################
 sub get_sections {  sub get_sections {
     my ($cdom,$cnum,$sectioncount,$possible_roles) = @_;      my ($cdom,$cnum,$possible_roles) = @_;
     if (!($cdom && $cnum)) { return 0; }      if (!defined($cdom) || !defined($cnum)) {
     my $numsections = 0;          my $cid =  $env{'request.course.id'};
   
     if (!defined($possible_roles) || (grep/^st$/,@$possible_roles)) {   return if (!defined($cid));
   
           $cdom = $env{'course.'.$cid.'.domain'};
           $cnum = $env{'course.'.$cid.'.num'};
       }
   
       my %sectioncount;
   
       if (!defined($possible_roles) || (grep(/^st$/,@$possible_roles))) {
  my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);   my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);
  my $sec_index = &Apache::loncoursedata::CL_SECTION();   my $sec_index = &Apache::loncoursedata::CL_SECTION();
  my $status_index = &Apache::loncoursedata::CL_STATUS();   my $status_index = &Apache::loncoursedata::CL_STATUS();
  while (my ($student,$data) = each %$classlist) {   while (my ($student,$data) = each(%$classlist)) {
     my ($section,$status) = ($data->[$sec_index],      my ($section,$status) = ($data->[$sec_index],
      $data->[$status_index]);       $data->[$status_index]);
     unless ($section eq '-1' || $section =~ /^\s*$/) {      unless ($section eq '-1' || $section =~ /^\s*$/) {
  if (!defined($$sectioncount{$section})) { $numsections++; }   $sectioncount{$section}++;
  $$sectioncount{$section}++;  
     }      }
  }   }
     }      }
Line 3776  sub get_sections { Line 3795  sub get_sections {
  }   }
  if ($user =~ /^$role:[^:]*:[^:]*:(\w+)/) { $section=$1; }   if ($user =~ /^$role:[^:]*:[^:]*:(\w+)/) { $section=$1; }
  if (!defined($section) || $section eq '-1') { next; }   if (!defined($section) || $section eq '-1') { next; }
  if (!defined($$sectioncount{$section})) { $numsections++; }    $sectioncount{$section}++;
  $$sectioncount{$section}++;  
     }      }
     return $numsections;      return %sectioncount;
 }  }
   
 ###############################################  ###############################################
Line 3816  can be sent to &get_group_settings() to Line 3834  can be sent to &get_group_settings() to
 ###############################################  ###############################################
   
 sub coursegroups {  sub coursegroups {
     my ($curr_groups,$cdom,$cnum,$group) = @_;      my ($cdom,$cnum,$group) = @_;
     my $numgroups;  
     if (!defined($cdom) || !defined($cnum)) {      if (!defined($cdom) || !defined($cnum)) {
         my $cid =  $env{'request.course.id'};          my $cid =  $env{'request.course.id'};
   
    return if (!defined($cid));
   
         $cdom = $env{'course.'.$cid.'.domain'};          $cdom = $env{'course.'.$cid.'.domain'};
         $cnum = $env{'course.'.$cid.'.num'};          $cnum = $env{'course.'.$cid.'.num'};
     }      }
     %{$curr_groups} = &Apache::lonnet::get_coursegroups($cdom,$cnum,$group);      my %curr_groups = &Apache::lonnet::get_coursegroups($cdom,$cnum,$group);
     my ($tmp) = keys(%{$curr_groups});      my ($tmp) = keys(%curr_groups);
     if ($tmp=~/^error:/) {      if ($tmp=~/^(con_lost|no_such_host|error: [^2] )/) {
         unless ($tmp eq 'error: 2 tie(GDBM) Failed while attempting dump') {   undef(%curr_groups);
             &logthis('Error retrieving groups: '.$tmp.' in '.$cnum.':'.   &logthis('Error retrieving groups: '.$tmp.' in '.$cnum.':'.$cdom);
                                                                    $cdom);      } elsif ($tmp=~/^error: 2 /) {
         }   undef(%curr_groups);
         $numgroups = 0;  
     } else {  
         $numgroups = keys(%{$curr_groups});  
     }      }
     return $numgroups;      return %curr_groups;
 }  }
   
 ###############################################  ###############################################

Removed from v.1.363  
changed lines
  Added in v.1.367


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