[LON-CAPA-cvs] cvs: loncom /publisher lonpubdir.pm doc/loncapafiles loncapafiles.lpml

[www]

www		Sat Oct 22 12:34:01 2011 EDT

  Modified files:              
    /doc/loncapafiles	loncapafiles.lpml 
    /loncom/publisher	lonpubdir.pm 
  Log:
  Work on Bug #1320:
  * lonconstruct.pm wrapper no longer needed
  * no "Parent Directory" for construction space root
  
  
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.760 doc/loncapafiles/loncapafiles.lpml:1.761
--- doc/loncapafiles/loncapafiles.lpml:1.760	Fri Oct 21 20:23:40 2011
+++ doc/loncapafiles/loncapafiles.lpml	Sat Oct 22 12:33:57 2011
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.760 2011/10/21 20:23:40 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.761 2011/10/22 12:33:57 www Exp $ -->
 
 <!--
 
@@ -5034,15 +5034,6 @@
 </dependencies>
 </file>
 <file>
-<source>loncom/publisher/lonconstruct.pm</source>
-<target dist='default'>home/httpd/lib/perl/Apache/lonconstruct.pm</target>
-<categoryname>handler</categoryname>
-<description>
-Page wrapper for handling construction space.
-</description>
-<status>works/unverified</status>
-</file>
-<file>
 <source>loncom/publisher/lonpublisher.pm</source>
 <target dist='default'>home/httpd/lib/perl/Apache/lonpublisher.pm</target>
 <categoryname>handler</categoryname>
Index: loncom/publisher/lonpubdir.pm
diff -u loncom/publisher/lonpubdir.pm:1.129 loncom/publisher/lonpubdir.pm:1.130
--- loncom/publisher/lonpubdir.pm:1.129	Fri Oct 21 22:33:14 2011
+++ loncom/publisher/lonpubdir.pm	Sat Oct 22 12:34:01 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.129 2011/10/21 22:33:14 www Exp $
+# $Id: lonpubdir.pm,v 1.130 2011/10/22 12:34:01 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -447,16 +447,14 @@
 sub putdirectory {
     my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs, $numdir) = @_;
 
-#&Apache::lonnet::logthis("reqfile $reqfile here $here dirname $dirname resdir $resdir");
-
-
 # construct the display filename: the directory name unless ..:
     
     my $disfilename = $dirname;
     if ($dirname eq '..') {
 	$disfilename = '<i>'.&mt('Parent Directory').'</i>';
     }
-    unless ( (($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) {
+# Don't display directory itself, and there is no way up from root directory
+    unless ( (($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) {
 	my $kaputt=0;
 	foreach (keys %{$bombs}) {
 	    if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; }