--- loncom/lonnet/perl/lonnet.pm 2005/04/15 22:03:23 1.624 +++ loncom/lonnet/perl/lonnet.pm 2005/04/18 21:19:53 1.626 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.624 2005/04/15 22:03:23 albertel Exp $ +# $Id: lonnet.pm,v 1.626 2005/04/18 21:19:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2639,6 +2639,21 @@ sub cput { return &critical("put:$udomain:$uname:$namespace:$items",$uhome); } +# ------------------------------------------------------ critical inc interface + +sub cinc { + my ($namespace,$storehash,$udomain,$uname)=@_; + if (!$udomain) { $udomain=$env{'user.domain'}; } + if (!$uname) { $uname=$env{'user.name'}; } + my $uhome=&homeserver($uname,$udomain); + my $items=''; + foreach (keys %$storehash) { + $items.=escape($_).'='.&freeze_escape($$storehash{$_}).'&'; + } + $items=~s/\&$//; + return &critical("inc:$udomain:$uname:$namespace:$items",$uhome); +} + # -------------------------------------------------------------- eget interface sub eget { @@ -4937,7 +4952,8 @@ sub symbread { 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; @@ -4947,8 +4963,8 @@ sub symbread { 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); } } } @@ -4962,7 +4978,6 @@ sub symbread { } if ($syval) { return $env{$cache_str}=$syval; - #return $env{$cache_str}=&symbclean($syval.'___'.$thisfn); } } &appenv('request.ambiguous' => $thisfn);