--- loncom/publisher/lonpublisher.pm 2002/09/10 14:52:35 1.94
+++ loncom/publisher/lonpublisher.pm 2002/09/16 13:05:50 1.95
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.94 2002/09/10 14:52:35 harris41 Exp $
+# $Id: lonpublisher.pm,v 1.95 2002/09/16 13:05:50 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1388,8 +1388,46 @@ if (-e $target) {
}
+#########################################
+
+sub batchpublish {
+ my ($r,$srcfile)=@_;
+ my $thisdisfn=$srcfile;
+ $thisdisfn=~s/\/home\/korte\/public_html\///;
+ $srcfile=~s/\/+/\//g;
+ $r->print('
Publishing '.$thisdisfn.'
');
+}
#########################################
+
+sub publishdirectory {
+ my ($r,$fn,$thisdisfn)=@_;
+ $r->print('Directory '.$thisdisfn.'/
');
+
+ my $dirptr=16384; # Mask indicating a directory in stat.cmode.
+
+ opendir(DIR,$fn);
+ my @files=sort(readdir(DIR));
+ foreach my $filename (@files) {
+ my ($cdev,$cino,$cmode,$cnlink,
+ $cuid,$cgid,$crdev,$csize,
+ $catime,$cmtime,$cctime,
+ $cblksize,$cblocks)=stat($fn.'/'.$filename);
+
+ my $extension='';
+ if ($filename=~/\.(\w+)$/) { $extension=$1; }
+ if ($cmode&$dirptr) {
+ if (($filename!~/^\./) && ($ENV{'form.pubrec'})) {
+ &publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename);
+ }
+ } elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&
+ ($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {
+ &batchpublish($r,$fn.'/'.$filename);
+ $r->rflush();
+ }
+ }
+ closedir(DIR);
+}
#########################################
=pod
@@ -1531,31 +1569,34 @@ unless ($ENV{'form.phase'} eq 'two') {
$r->send_http_header;
$r->print('LON-CAPA Publishing');
- $r->print(
- '');
+ $r->print(&Apache::loncommon::bodytag('Resource Publication'));
my $thisfn=$fn;
-
-# ---------------------- Evaluate individual file, and then output information.
- {
- $thisfn=~/\.(\w+)$/;
- my $thistype=$1;
- my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
- my $thistarget=$thisfn;
+ my $thistarget=$thisfn;
- $thistarget=~s/^\/home/$targetdir/;
- $thistarget=~s/\/public\_html//;
+ $thistarget=~s/^\/home/$targetdir/;
+ $thistarget=~s/\/public\_html//;
+
+ my $thisdistarget=$thistarget;
+ $thisdistarget=~s/^$docroot//;
+
+ my $thisdisfn=$thisfn;
+ $thisdisfn=~s/^\/home\/$cuname\/public_html\///;
- my $thisdistarget=$thistarget;
- $thisdistarget=~s/^$docroot//;
+ if ($fn=~/\/$/) {
+# -------------------------------------------------------- This is a directory
+ &publishdirectory($r,$fn,$thisdisfn);
- my $thisdisfn=$thisfn;
- $thisdisfn=~s/^\/home\/$cuname\/public_html\///;
+ } else {
+# ---------------------- Evaluate individual file, and then output information.
+ $thisfn=~/\.(\w+)$/;
+ my $thistype=$1;
+ my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
$r->print('Publishing '.
&Apache::loncommon::filedescription($thistype).' '.
- $thisdisfn.'
Target: '.$thisdistarget.'');
+ ''.$thisdisfn.
+ 'Target: '.$thisdistarget.'
');
if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) {
$r->print('
Co-Author: '.$cuname.' at '.$cudom.