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

Diff for /loncom/interface/spreadsheet/assesscalc.pm between versions 1.33 and 1.37

version 1.33, 2004/02/24 20:47:14 version 1.37, 2005/03/03 17:52:36
Line 104  my %nice_parameter_name; Line 104  my %nice_parameter_name;
 my %useropt;  my %useropt;
 my %userdata;  my %userdata;
 my %courseopt;  my %courseopt;
   my $navmap;
   
 ########################################################  ########################################################
 ########################################################  ########################################################
Line 136  sub clear_package { Line 137  sub clear_package {
     undef(%useropt);      undef(%useropt);
     undef(%userdata);      undef(%userdata);
     undef(%courseopt);      undef(%courseopt);
       undef($navmap);
 }  }
   
 sub save_cached_export_rows {  sub save_cached_export_rows {
     my ($sname,$sdomain) = @_;      my ($sname,$sdomain) = @_;
     my $start = Time::HiRes::time;  
     my $result = &Apache::lonnet::put      my $result = &Apache::lonnet::put
         ('nohist_calculatedsheets_'.$ENV{'request.course.id'},          ('nohist_calculatedsheets_'.$ENV{'request.course.id'},
          $newExportrows{$sname.':'.$sdomain},           $newExportrows{$sname.':'.$sdomain},
Line 149  sub save_cached_export_rows { Line 150  sub save_cached_export_rows {
 }  }
   
 sub initialize {  sub initialize {
       my ($in_navmap) = @_;
     &clear_package();      &clear_package();
       $navmap = $in_navmap;
       if (! defined($navmap)) {
           $navmap = Apache::lonnavmaps::navmap->new();
       }
       if (!defined($navmap)) {
           &Apache::lonnet::logthis('assesscalc:Can not open Coursemap');
       }
     &Apache::loncoursedata::clear_internal_caches();      &Apache::loncoursedata::clear_internal_caches();
 }  }
   
Line 165  sub initialize { Line 174  sub initialize {
 ########################################################  ########################################################
 ########################################################  ########################################################
 sub initialize_package {  sub initialize_package {
     my ($sname,$sdomain) = @_;      my ($sname,$sdomain,$in_navmap) = @_;
     $current_name   = $sname;      $current_name   = $sname;
     $current_domain = $sdomain;      $current_domain = $sdomain;
       $navmap = $in_navmap;
     undef(%useropt);      undef(%useropt);
     undef(%userdata);      undef(%userdata);
     if ($current_course ne $ENV{'request.course.id'}) {      if ($current_course ne $ENV{'request.course.id'}) {
Line 337  sub parmval { Line 347  sub parmval {
     #      #
     # check course      # check course
     return $courseopt{$courselevelr} if (defined($courseopt{$courselevelr}));      return $courseopt{$courselevelr} if (defined($courseopt{$courselevelr}));
     return $courseopt{$courselevelm} if (defined($courseopt{$courselevelm}));  
     return $courseopt{$courselevel}  if (defined($courseopt{$courselevel}));  
     # check map parms      # check map parms
     my $thisparm = $parmhash{$symbparm};      my $thisparm = $parmhash{$symbparm};
     return $thisparm if (defined($thisparm));      return $thisparm if (defined($thisparm));
     # check default      # check default
     $thisparm = &Apache::lonnet::metadata($fn,$rwhat.'.default');      $thisparm = &Apache::lonnet::metadata($fn,$rwhat.'.default');
     return $thisparm if (defined($thisparm));      return $thisparm if (defined($thisparm));
     #      # check more course
       return $courseopt{$courselevelm} if (defined($courseopt{$courselevelm}));
       return $courseopt{$courselevel}  if (defined($courseopt{$courselevel}));
   
     # Cascade Up      # Cascade Up
     my $space=$what;      my $space=$what;
     $space=~s/\.\w+$//;      $space=~s/\.[^._]+$//;
     if ($space ne '0') {      if ($space ne '0') {
  my @parts=split(/_/,$space);   my @parts=split(/_/,$space);
  my $id=pop(@parts);   my $id=pop(@parts);
Line 397  sub get_full_title { Line 408  sub get_full_title {
     my @title = ($self->get_title());      my @title = ($self->get_title());
     # Look up the users identifying information      # Look up the users identifying information
     # Get the users information      # Get the users information
     my %userenv = &Apache::loncoursedata::GetUserName($self->{'name'},      my $name = &Apache::loncommon::plainname($self->{'name'},
                                                       $self->{'domain'});       $self->{'domain'});
     my $name =   
         join(' ',@userenv{'firstname','middlename','lastname','generation'});  
     $name =~ s/\s+$//;  
     push (@title,$name);      push (@title,$name);
     push (@title,&Apache::lonlocal::locallocaltime(time));      push (@title,&Apache::lonlocal::locallocaltime(time));
     return @title;      return @title;
Removed from v.1.33  
changed lines
  Added in v.1.37

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