--- loncom/lonnet/perl/lonnet.pm 2001/10/16 08:53:19 1.164 +++ loncom/lonnet/perl/lonnet.pm 2001/10/30 19:19:09 1.167 @@ -131,7 +131,6 @@ # 8/4,8/7,8/8,8/9,8/11,8/16,8/17,8/18,8/20,8/23,9/20,9/21,9/26, # 10/2 Gerd Kortemeyer # 10/5,10/10 Scott Harrison -# 10/15 Gerd Kortemeyer package Apache::lonnet; @@ -855,6 +854,37 @@ sub devalidate { } } +# -------------------------------------------------------------------Temp Store + +sub tmpstore { + my ($storehash,$symb,$namespace,$domain,$stuname) = @_; + my $home=''; + + if ($stuname) { + $home=&homeserver($stuname,$domain); + + } + + if (!$symb) { + $symb=&symbread(); + if (!$symb) { + $symb= $ENV{'request.url'}; + } + } + + $symb=escape($symb); + if (!$namespace) { unless ($namespace=$ENV{'request.course.id'}) { return ''; } } + if (!$domain) { $domain=$ENV{'user.domain'}; } + if (!$stuname) { $stuname=$ENV{'user.name'}; } + if (!$home) { $home=$ENV{'user.home'}; } + my $namevalue=''; + map { + $namevalue.=escape($_).'='.escape($$storehash{$_}).'&'; + } keys %$storehash; + $namevalue=~s/\&$//; + +} + # ----------------------------------------------------------------------- Store sub store { @@ -1242,7 +1272,7 @@ sub allowed { # If this is generating or modifying users, exit with special codes - if (':csu:cdc:ccc:cin:cta:cep:ccr:cst:cad:cli:cau:cdg:'=~/\:$priv\:/) { + if (':csu:cdc:ccc:cin:cta:cep:ccr:cst:cad:cli:cau:cdg:cca:'=~/\:$priv\:/) { return $thisallowed; } # @@ -1911,6 +1941,10 @@ sub EXT { $spacequalifierrest}; } elsif ($realm eq 'resource') { if ($ENV{'request.course.id'}) { + +# print '
'.$space.' - '.$qualifier.' - '.$spacequalifierrest; + + # ----------------------------------------------------- Cascading lookup scheme my $symbp; if ($symbparm) { @@ -2008,7 +2042,7 @@ sub EXT { # ------------------------------------------------------------------ Cascade up unless ($space eq '0') { - my ($part,$id)=split(/(\.|\_)/,$space); + my ($part,$id)=split(/\_/,$space); if ($id) { my $partgeneral=&EXT('resource.'.$part.'.'.$qualifierrest, $symbparm); @@ -2057,7 +2091,7 @@ sub metadata { $keyroot.='_'.$token->[2]->{'part'}; } if (defined($token->[2]->{'id'})) { - $keyroot.='.'.$token->[2]->{'id'}; + $keyroot.='_'.$token->[2]->{'id'}; } if ($metacache{$uri.':packages'}) { $metacache{$uri.':packages'}.=','.$package.$keyroot; @@ -2070,7 +2104,6 @@ sub metadata { my $value=$packagetab{$_}; my $part=$keyroot; $part=~s/^\_//; - $part=~s/\./\_/g; if ($subp eq 'display') { $value.=' [Part: '.$part.']'; } @@ -2090,7 +2123,7 @@ sub metadata { $unikey.='_'.$token->[2]->{'part'}; } if (defined($token->[2]->{'id'})) { - $unikey.='.'.$token->[2]->{'id'}; + $unikey.='_'.$token->[2]->{'id'}; } if (defined($token->[2]->{'name'})) { $unikey.='_'.$token->[2]->{'name'};