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

[albertel]

albertel		Wed Dec  5 15:06:36 2007 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - BUG#5539, when doin CSTR import of a metadata for a associated resource
    use the correct uri
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.928 loncom/lonnet/perl/lonnet.pm:1.929
--- loncom/lonnet/perl/lonnet.pm:1.928	Tue Nov 20 12:54:40 2007
+++ loncom/lonnet/perl/lonnet.pm	Wed Dec  5 15:06:34 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.928 2007/11/20 17:54:40 albertel Exp $
+# $Id: lonnet.pm,v 1.929 2007/12/05 20:06:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6853,8 +6853,9 @@
         unless ($filename=~/\.meta$/) { $filename.='.meta'; }
 	my $metastring;
 	if ($uri =~ /^~/ || $uri =~ m{home/$match_username/public_html/}) {
+	    my $which = &hreflocation('','/'.($liburi || $uri));
 	    $metastring = 
-		&Apache::lonnet::ssi_body(&hreflocation('','/'.$uri),
+		&Apache::lonnet::ssi_body($which,
 					  ('grade_target' => 'meta'));
 	    $cachetime = 1; # only want this cached in the child not long term
 	} elsif ($uri !~ m -^(editupload)/-) {