[LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 18 Apr 2005 21:19:54 -0000


albertel		Mon Apr 18 17:19:54 2005 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - _symb.db wants real symbs now not map___resid
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.625 loncom/lonnet/perl/lonnet.pm:1.626
--- loncom/lonnet/perl/lonnet.pm:1.625	Mon Apr 18 17:10:41 2005
+++ loncom/lonnet/perl/lonnet.pm	Mon Apr 18 17:19:53 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.625 2005/04/18 21:10:41 raeburn Exp $
+# $Id: lonnet.pm,v 1.626 2005/04/18 21:19:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4952,7 +4952,8 @@
                  if ($#possibilities==0) {
 # ----------------------------------------------- There is only one possibility
 		     my ($mapid,$resid)=split(/\./,$ids);
-                     $syval=declutter($bighash{'map_id_'.$mapid}).'___'.$resid;
+		     $syval=&encode_symb($bighash{'map_id_'.$mapid},
+						    $resid,$thisfn);
                  } elsif (!$donotrecurse) {
 # ------------------------------------------ There is more than one possibility
                      my $realpossible=0;
@@ -4962,8 +4963,8 @@
          		    my ($mapid,$resid)=split(/\./,$_);
                             if ($bighash{'map_type_'.$mapid} ne 'page') {
 				$realpossible++;
-                                $syval=declutter($bighash{'map_id_'.$mapid}).
-                                       '___'.$resid;
+                                $syval=&encode_symb($bighash{'map_id_'.$mapid},
+						    $resid,$thisfn);
                             }
 			 }
                      }
@@ -4977,7 +4978,6 @@
         }
         if ($syval) {
 	    return $env{$cache_str}=$syval;
-	    #return $env{$cache_str}=&symbclean($syval.'___'.$thisfn);
         }
     }
     &appenv('request.ambiguous' => $thisfn);