[LON-CAPA-cvs] cvs: loncom /interface lonparmset.pm rat lonuserstate.pm

[albertel]

albertel		Mon Dec  6 16:41:02 2004 EDT

  Modified files:              
    /rat	lonuserstate.pm 
    /loncom/interface	lonparmset.pm 
  Log:
   - eradicating some of the last few places that don't use getitle and thus don;t get : right, and don;t default back to file name (BUG#3587)
  
  
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.82 rat/lonuserstate.pm:1.83
--- rat/lonuserstate.pm:1.82	Wed Nov 10 16:30:48 2004
+++ rat/lonuserstate.pm	Mon Dec  6 16:41:01 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
-# $Id: lonuserstate.pm,v 1.82 2004/11/10 21:30:48 albertel Exp $
+# $Id: lonuserstate.pm,v 1.83 2004/12/06 21:41:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -150,10 +150,11 @@
 			    $hash{'version_'.$turi}=$1;
 			}
 		    }
+		    my $title=$token->[2]->{'title'};
+		    $title=~s/\&colon\;/\:/gs;
 		    &Apache::lonnet::do_cache(\%Apache::lonnet::titlecache,
 		       &Apache::lonnet::encode_symb($uri,$token->[2]->{'id'},
-						    $turi),
-					      $token->[2]->{'title'},'title');
+						    $turi),$title,'title');
                     unless ($ispage) {
                         $turi=~/\.(\w+)$/;
                         my $embstyle=&Apache::loncommon::fileembstyle($1);
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.179 loncom/interface/lonparmset.pm:1.180
--- loncom/interface/lonparmset.pm:1.179	Sat Nov 27 12:23:09 2004
+++ loncom/interface/lonparmset.pm	Mon Dec  6 16:41:01 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.179 2004/11/27 17:23:09 raeburn Exp $
+# $Id: lonparmset.pm,v 1.180 2004/12/06 21:41:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -628,8 +628,7 @@
 		if ($mapid eq '1') {
 		    $$maptitles{$mapid}='Main Course Documents';
 		} else {
-		    $$maptitles{$mapid}=
-			$$bighash{'title_'.$$bighash{'ids_'.&Apache::lonnet::clutter($$mapp{$id})}};
+		    $$maptitles{$mapid}=&Apache::lonnet::gettitle(&Apache::lonnet::clutter($$mapp{$id}));
 		}
 		$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
 		$$symbp{$id}=$$mapp{$id}.
@@ -1219,8 +1218,7 @@
                     my $totalparms=scalar keys %name;
                     if ($totalparms>0) {
                         my $firstrow=1;
-			my $title=$bighash{'title_'.$rid};
-			$title=~s/\:/:/g;
+			my $title=&Apache::lonnet::gettitle($uri);
                         $r->print('<tr><td bgcolor='.$defbgone.
                              ' rowspan='.$totalparms.
                              '><tt><font size=-1>'.