Diff for /loncom/interface/spreadsheet/assesscalc.pm between versions 1.10 and 1.13

version 1.10, 2003/05/27 20:20:25 version 1.13, 2003/06/12 21:17:11
Line 123  sub clear_package { Line 123  sub clear_package {
     undef(%courseopt);      undef(%courseopt);
 }  }
   
   sub initialize {
       &clear_package();
   }
   
 ########################################################  ########################################################
 ########################################################  ########################################################
   
Line 136  sub clear_package { Line 140  sub clear_package {
 ########################################################  ########################################################
 sub initialize_package {  sub initialize_package {
     my ($sname,$sdomain) = @_;      my ($sname,$sdomain) = @_;
     $current_course = $ENV{'request.course.id'};  
     $current_name   = $sname;      $current_name   = $sname;
     $current_domain = $sdomain;      $current_domain = $sdomain;
     undef(%courseopt);      if ($current_course ne $ENV{'request.course.id'}) {
           $current_course = $ENV{'request.course.id'};
           undef(%courseopt);
       }
     &load_cached_export_rows();      &load_cached_export_rows();
     &load_parameter_caches();      &load_parameter_caches();
 }  }
Line 505  sub excel_rows { Line 511  sub excel_rows {
   
 sub compute {  sub compute {
     my $self = shift;      my $self = shift;
     $self->logthis('computing');  #    $self->logthis('computing');
     $self->initialize_safe_space();      $self->initialize_safe_space();
       #########################################
       #########################################
       ###                                   ###
       ###  Retrieve the problem parameters  ###
       ###                                   ###
       #########################################
       #########################################
       my @Mandatory_parameters = ("stores_0_solved",
                                   "stores_0_awarddetail",
                                   "stores_0_awarded",
                                   "timestamp",
                                   "stores_0_tries",
                                   "stores_0_award");
     #      #
     # Definitions      # Definitions
     undef(%nice_parameter_name);      undef(%nice_parameter_name);
Line 515  sub compute { Line 534  sub compute {
     # Get the metadata fields and determine their proper names      # Get the metadata fields and determine their proper names
     my ($symap,$syid,$srcf)=split(/___/,$self->{'symb'});      my ($symap,$syid,$srcf)=split(/___/,$self->{'symb'});
     my @Metadata = split(/\,/,&Apache::lonnet::metadata($srcf,'keys'));      my @Metadata = split(/\,/,&Apache::lonnet::metadata($srcf,'keys'));
     foreach my $parm (@Metadata) {      foreach my $parm (@Mandatory_parameters,@Metadata) {
         next if ($parm !~ /^(resource\.|stores|parameter)_/);          next if ($parm !~ /^(resource\.|stores|parameter)_/);
         my $cleaned_name = $parm;          my $cleaned_name = $parm;
         $cleaned_name =~ s/^resource\./stores_/;          $cleaned_name =~ s/^resource\./stores_/;
Line 595  sub compute { Line 614  sub compute {
     #      #
     # Save the export data      # Save the export data
     $self->save_export_data();      $self->save_export_data();
       $self->save() if ($self->need_to_save());
     return;      return;
 }  }
   

Removed from v.1.10  
changed lines
  Added in v.1.13


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