[LON-CAPA-cvs] cvs: loncom(version_0_5_1) /lonnet/perl lonnet.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Mon, 16 Sep 2002 20:30:26 -0000
albertel Mon Sep 16 16:30:26 2002 EDT
Modified files: (Branch: version_0_5_1)
/loncom/lonnet/perl lonnet.pm
Log:
- backport of 1.282 fix
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.267.4.5 loncom/lonnet/perl/lonnet.pm:1.267.4.6
--- loncom/lonnet/perl/lonnet.pm:1.267.4.5 Mon Sep 2 21:29:35 2002
+++ loncom/lonnet/perl/lonnet.pm Mon Sep 16 16:30:26 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.267.4.5 2002/09/03 01:29:35 albertel Exp $
+# $Id: lonnet.pm,v 1.267.4.6 2002/09/16 20:30:26 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2537,7 +2537,7 @@
# --------------------------------------------------------- Value of a Variable
sub EXT {
- my ($varname,$symbparm,$udom,$uname)=@_;
+ my ($varname,$symbparm,$udom,$uname,)=@_;
unless ($varname) { return ''; }
@@ -2694,10 +2694,16 @@
# --------------------------------------------- last, look in resource metadata
$spacequalifierrest=~s/\./\_/;
- my $metadata=&metadata($ENV{'request.filename'},$spacequalifierrest);
+ my $filename;
+ if (!$symbparm) { $symbparm=&symbread(); }
+ if ($symbparm) {
+ $filename=(split(/\_\_\_/,$symbparm))[2];
+ } else {
+ $filename=$ENV{'request.filename'};
+ }
+ my $metadata=&metadata($filename,$spacequalifierrest);
if ($metadata) { return $metadata; }
- $metadata=&metadata($ENV{'request.filename'},
- 'parameter_'.$spacequalifierrest);
+ $metadata=&metadata($filename,'parameter_'.$spacequalifierrest);
if ($metadata) { return $metadata; }
# ------------------------------------------------------------------ Cascade up