[LON-CAPA-cvs] cvs: loncom /publisher lonconstruct.pm lonpubdir.pm

taceyjo1 lon-capa-cvs@mail.lon-capa.org
Tue, 18 Nov 2003 04:08:15 -0000


taceyjo1		Mon Nov 17 23:08:15 2003 EDT

  Modified files:              
    /loncom/publisher	lonconstruct.pm lonpubdir.pm 
  Log:
  New backend to make decompress go, shouldn't break anything.......
  
  
Index: loncom/publisher/lonconstruct.pm
diff -u loncom/publisher/lonconstruct.pm:1.18 loncom/publisher/lonconstruct.pm:1.19
--- loncom/publisher/lonconstruct.pm:1.18	Sun Oct 19 12:46:16 2003
+++ loncom/publisher/lonconstruct.pm	Mon Nov 17 23:08:15 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Page Wrapper for Construction
 #
-# $Id: lonconstruct.pm,v 1.18 2003/10/19 16:46:16 taceyjo1 Exp $
+# $Id: lonconstruct.pm,v 1.19 2003/11/18 04:08:15 taceyjo1 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -99,7 +99,6 @@
    return OK if $r->header_only;
 
    my $lowerframe=$r->path_info;
-
    &Debug($r, "Initial URL for lower frame: ".$lowerframe);
    $lowerframe=~s/^\//\/\~/;
    &Debug($r, "Lower frame URL afer ~ subst: ".$lowerframe);
@@ -123,7 +122,9 @@
    &Apache::loncommon::get_unprocessed_cgi
 	($ENV{'QUERY_STRING'},['decompress']);
    if ($ENV{'form.decompress'}) {
-       $lowerframe="http://$ENV{'SERVER_NAME'}/cgi-bin/decompress.pl?decompress";
+	&Apache::lonnet::appenv('cgi.path' => $r->path_info);
+	$lowerframe="http://$ENV{SERVER_NAME}/cgi-bin/decompress.pl";
+	
    }
    $r->print(<<ENDPAGE);
 <html>
Index: loncom/publisher/lonpubdir.pm
diff -u loncom/publisher/lonpubdir.pm:1.44 loncom/publisher/lonpubdir.pm:1.45
--- loncom/publisher/lonpubdir.pm:1.44	Sat Nov  8 05:33:28 2003
+++ loncom/publisher/lonpubdir.pm	Mon Nov 17 23:08:15 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.44 2003/11/08 10:33:28 albertel Exp $
+# $Id: lonpubdir.pm,v 1.45 2003/11/18 04:08:15 taceyjo1 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -337,6 +337,7 @@
 	$editlink2=' (<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_top">'.&mt('Edit').'</a>)';
     }
     if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
+	&Apache::lonnet::appenv('cgi.file' => $filename);
 	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?decompress=1" target="_top">'.&mt('Decompress').'</a>)';
     }
     $r->print('<tr bgcolor="'.$bgcolor.'">'.