[LON-CAPA-cvs] cvs: loncom /interface lonnavmaps.pm lonparmset.pm /interface/spreadsheet assesscalc.pm /lonnet/perl lonnet.pm

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


albertel		Mon May 15 19:40:55 2006 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
    /loncom/interface/spreadsheet	assesscalc.pm 
    /loncom/interface	lonparmset.pm lonnavmaps.pm 
  Log:
  - the map url in the parameter definition is without a version
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.734 loncom/lonnet/perl/lonnet.pm:1.735
--- loncom/lonnet/perl/lonnet.pm:1.734	Mon May  1 12:00:44 2006
+++ loncom/lonnet/perl/lonnet.pm	Mon May 15 19:40:36 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.734 2006/05/01 16:00:44 albertel Exp $
+# $Id: lonnet.pm,v 1.735 2006/05/15 23:40:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5171,7 +5171,7 @@
 
 # ----------------------------------------------------- Cascading lookup scheme
 	    my $symbp=$symbparm;
-	    my $mapp=(&decode_symb($symbp))[0];
+	    my $mapp=&deversion((&decode_symb($symbp))[0]);
 
 	    my $symbparm=$symbp.'.'.$spacequalifierrest;
 	    my $mapparm=$mapp.'___(all).'.$spacequalifierrest;
Index: loncom/interface/spreadsheet/assesscalc.pm
diff -u loncom/interface/spreadsheet/assesscalc.pm:1.54 loncom/interface/spreadsheet/assesscalc.pm:1.55
--- loncom/interface/spreadsheet/assesscalc.pm:1.54	Mon May  1 13:30:20 2006
+++ loncom/interface/spreadsheet/assesscalc.pm	Mon May 15 19:40:47 2006
@@ -1,5 +1,5 @@
 #
-# $Id: assesscalc.pm,v 1.54 2006/05/01 17:30:20 raeburn Exp $
+# $Id: assesscalc.pm,v 1.55 2006/05/15 23:40:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -314,6 +314,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;
@@ -644,6 +645,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'},
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.304 loncom/interface/lonparmset.pm:1.305
--- loncom/interface/lonparmset.pm:1.304	Thu May 11 15:04:31 2006
+++ loncom/interface/lonparmset.pm	Mon May 15 19:40:54 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.304 2006/05/11 19:04:31 www Exp $
+# $Id: lonparmset.pm,v 1.305 2006/05/15 23:40:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -126,6 +126,7 @@
     my @outpar=();
 # ----------------------------------------------------- Cascading lookup scheme
     my $map=(&Apache::lonnet::decode_symb($symb))[0];    
+    $map = &Apache::lonnet::deversion($map);
 
     my $symbparm=$symb.'.'.$what;
     my $mapparm=$map.'___(all).'.$what;
@@ -404,6 +405,8 @@
 # ---------------------------------------------------------- Construct prefixes
     $spnam=~s/\_([^\_]+)$/\.$1/;
     my $map=(&Apache::lonnet::decode_symb($symb))[0];    
+    $map = &Apache::lonnet::deversion($map);
+
     my $symbparm=$symb.'.'.$spnam;
     my $mapparm=$map.'___(all).'.$spnam;
 
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.382 loncom/interface/lonnavmaps.pm:1.383
--- loncom/interface/lonnavmaps.pm:1.382	Mon May 15 15:29:03 2006
+++ loncom/interface/lonnavmaps.pm	Mon May 15 19:40:54 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.382 2006/05/15 19:29:03 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.383 2006/05/15 23:40:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2574,7 +2574,7 @@
     my $result='';
 
     my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
-
+    $mapname = &Apache::lonnet::deversion($mapname);
 # ----------------------------------------------------- Cascading lookup scheme
     my $rwhat=$what;
     $what=~s/^parameter\_//;