[LON-CAPA-cvs] cvs: loncom(version_2_1_X) /interface/spreadsheet assesscalc.pm

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 15 May 2006 23:44:47 -0000


albertel		Mon May 15 19:44:47 2006 EDT

  Modified files:              (Branch: version_2_1_X)
    /loncom/interface/spreadsheet	assesscalc.pm 
  Log:
  - backport 1.55
  
  
Index: loncom/interface/spreadsheet/assesscalc.pm
diff -u loncom/interface/spreadsheet/assesscalc.pm:1.51 loncom/interface/spreadsheet/assesscalc.pm:1.51.2.1
--- loncom/interface/spreadsheet/assesscalc.pm:1.51	Wed Oct 12 17:29:49 2005
+++ loncom/interface/spreadsheet/assesscalc.pm	Mon May 15 19:44:46 2006
@@ -1,5 +1,5 @@
 #
-# $Id: assesscalc.pm,v 1.51 2005/10/12 21:29:49 albertel Exp $
+# $Id: assesscalc.pm,v 1.51.2.1 2006/05/15 23:44:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -312,6 +312,7 @@
     # This should be a 
     if (!defined($mapname) || !defined($id) || !defined($fn)) {
 	($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
+	$mapname = &Apache::lonnet::deversion($mapname);
     }
     # Cascading lookup scheme
     my $rwhat=$what;
@@ -631,6 +632,7 @@
     if (tie(%parmhash,'GDBM_File',
             $self->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) {
 	my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($self->{'symb'});
+	$mapname = &Apache::lonnet::deversion($mapname);
         foreach my $parmname (@Parameters) {
             my $value = $self->parmval($parmname,$self->{'symb'},
 				       $self->{'name'},$self->{'domain'},