[LON-CAPA-cvs] cvs: loncom /cgi lonversions.pl

Mon Nov 7 13:18:21 EST 2011

raeburn		Mon Nov  7 18:18:21 2011 EDT

  Modified files:              
    /loncom/cgi	lonversions.pl 
  Log:
  - use lonDocRoot perlvar in place of static string: '/home/httpd/html'.
  - exclude *.lpmlsave files from versions listing.  
  
  
Index: loncom/cgi/lonversions.pl
diff -u loncom/cgi/lonversions.pl:1.6 loncom/cgi/lonversions.pl:1.7

--- loncom/cgi/lonversions.pl:1.6	Thu Dec 25 01:56:03 2008
+++ loncom/cgi/lonversions.pl	Mon Nov  7 18:18:21 2011
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 $|=1;
 # Prints ut the Id line from most files
-# $Id: lonversions.pl,v 1.6 2008/12/25 01:56:03 raeburn Exp $
+# $Id: lonversions.pl,v 1.7 2011/11/07 18:18:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,11 +34,23 @@
 use LONCAPA::loncgi;
 use LONCAPA::lonauthcgi;
 
-print("Content-type: text/html\n\n");
+my $perlvar=&LONCAPA::Configuration::read_conf();
+my ($londaemons,$lonlib,$londocroot,$lonincludes); 
+if (ref($perlvar) eq 'HASH') {
+    $londaemons = $perlvar->{'lonDaemons'};
+    $lonlib = $perlvar->{'lonLib'};
+    $londocroot = $perlvar->{'lonDocRoot'};
+    $lonincludes = $perlvar->{'lonIncludes'};
+}
+undef($perlvar);
 
-&main();
+print &LONCAPA::loncgi::cgi_header('text/html',1);
+if ($londaemons ne '' && $lonlib ne '' && $londocroot ne '' && $lonincludes ne '') {
+    &main($londaemons,$lonlib,$londocroot,$lonincludes);
+}
 
 sub main {
+    my ($londaemons,$lonlib,$londocroot,$lonincludes) = @_;
     if (!&LONCAPA::lonauthcgi::check_ipbased_access('codeversions')) {
         if (!&LONCAPA::loncgi::check_cookie_and_load_env()) {
             &Apache::lonlocal::get_language_handle();
@@ -54,16 +66,20 @@
     }
 
     &Apache::lonlocal::get_language_handle();
-    &print_versions();
+    &print_versions($londaemons,$lonlib,$londocroot,$lonincludes);
     return;
 }
 
 sub print_versions {
+    my ($londaemons,$lonlib,$londocroot,$lonincludes) = @_;
     print '<html><body bgcolor="#FFFFFF"><h1>'.&Apache::lonlocal::mt('Handler Versions').'</h1>'.
           "<pre>\n";
-    open (DFH, "grep '\$Id:' /home/httpd/perl/* /home/httpd/lib/perl/Apache/*.pm /home/httpd/html/res/adm/includes/* /home/httpd/html/res/adm/pages/*|");
-    while (my $line=<DFH>) { 
-        print "$line"; 
+    open (DFH, "grep '\$Id: lonversions.pl,v 1.7 2011/11/07 18:18:21 raeburn Exp $londaemons/* $lonlib/perl/Apache/*.pm $lonlib/perl/LONCAPA/*.pm $lonincludes/* $londocroot/res/adm/pages/*|");
+    while (my $line=<DFH>) {
+        chomp($line); 
+        unless ($line =~ /\Q.lpmlsave:# \E\$Id/) { 
+            print "$line\n";
+        }
     }
     close(DFH);
     print '</pre></body></html>';


