--- loncom/publisher/lonpubdir.pm 2001/12/04 15:34:57 1.16
+++ loncom/publisher/lonpubdir.pm 2002/02/05 22:25:00 1.22
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: lonpubdir.pm,v 1.16 2001/12/04 15:34:57 albertel Exp $
+# $Id: lonpubdir.pm,v 1.22 2002/02/05 22:25:00 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -28,13 +28,18 @@
#
# (TeX Content Handler
#
+# YEAR=2000
# 05/29/00,05/30,10/11 Gerd Kortemeyer)
#
# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
+# YEAR=2001
# 03/23 Guy Albertelli
# 03/24,03/29 Gerd Kortemeyer)
-#
# 03/31,04/03,05/09,06/23,08/18,08/20 Gerd Kortemeyer
+# 12/15 Scott Harrison
+# 12/28 Gerd Kortemeyer
+#
+###
package Apache::lonpubdir;
@@ -43,8 +48,7 @@ use Apache::File;
use File::Copy;
use Apache::Constants qw(:common :http :methods);
use Apache::loncacc;
-use Apache::lonnet;
-
+use Apache::loncommon();
sub handler {
@@ -99,18 +103,20 @@ sub handler {
$r->print('
Construction Space Directory '.$thisdisfn.'/
');
if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
- $r->print('Co-Author: '.$uname.' at '.$udom.
- '
');
+ $r->print('Co-Author: '.$uname.' at '.$udom.
+ '
');
}
my $docroot=$r->dir_config('lonDocRoot');
my $resdir=$docroot.'/res/'.$udom.'/'.$uname.$thisdisfn;
+ my $targetdir=$udom.'/'.$uname.$thisdisfn;
my $linkdir='/~'.$uname.$thisdisfn;
$r->print(''.
- 'Filename | Modified | Status | |
');
+ 'Actions | Name | Title | '.
+ 'Status | Last Modified |
');
my $filename;
my $dirptr=16384;
@@ -126,47 +132,10 @@ sub handler {
my $extension='';
if ($filename=~/\.(\w+)$/) { $extension=$1; }
if ($cmode&$dirptr) {
- my $disfilename=$filename;
- if ($filename eq '..') {
- $disfilename='Parent Directory';
- }
- unless ((($filename eq '..') && ($thisdisfn eq '')) ||
- ($filename eq '.')) {
- $r->print(''.$disfilename.
- ' | '.localtime($cmtime).' | | |
'
- );
- }
- } elsif (&Apache::lonnet::fileembstyle($extension) ne 'hdn') {
- my $status='Unpublished';
- my $bgcol='#FFBBBB';
- if (-e $resdir.'/'.$filename) {
- my ($rdev,$rino,$rmode,$rnlink,
- $ruid,$rgid,$rrdev,$rsize,
- $ratime,$rmtime,$rctime,
- $rblksize,$rblocks)=stat($resdir.'/'.$filename);
- if ($rmtime>=$cmtime) {
- $status='Published';
- $bgcol='#BBFFBB';
- } else {
- $status='Modified';
- $bgcol='#FFFFBB';
- if
- (&Apache::lonnet::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
- $status.='
Diffs';
- }
- }
- $status.='
Retrieve';
- }
- $r->print(''.$filename.
- ' | '.localtime($cmtime).' | '.$status.' | '.
- ''.
- 'Publish |
');
+ putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime);
+ } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') {
+ putresource($r, $uname, $filename, $thisdisfn, $resdir,
+ $targetdir, $linkdir, $cmtime);
} else {
# "hidden" extension and not a directory, so hide it away.
}
@@ -176,6 +145,139 @@ sub handler {
$r->print('