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

[raeburn]

raeburn		Fri Apr  4 12:56:12 2008 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - for consistency, when called from ssi_body(), &externalssi() can return:
            $response->content and $response object, in wantarray case.
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.953 loncom/lonnet/perl/lonnet.pm:1.954
--- loncom/lonnet/perl/lonnet.pm:1.953	Fri Mar 28 10:52:57 2008
+++ loncom/lonnet/perl/lonnet.pm	Fri Apr  4 12:56:11 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.953 2008/03/28 14:52:57 www Exp $
+# $Id: lonnet.pm,v 1.954 2008/04/04 16:56:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1696,7 +1696,7 @@
     my $output='';
     my $response;
     if ($filelink=~/^http\:/) {
-       $output=&externalssi($filelink);
+       ($output,$response)=&externalssi($filelink);
     } else {
        ($output,$response)=&ssi($filelink,%form);
     }
@@ -1761,7 +1761,11 @@
     my $ua=new LWP::UserAgent;
     my $request=new HTTP::Request('GET',$url);
     my $response=$ua->request($request);
-    return $response->content;
+    if (wantarray) {
+        return ($response->content, $response);
+    } else {
+        return $response->content;
+    }
 }
 
 # -------------------------------- Allow a /uploaded/ URI to be vouched for