--- loncom/publisher/lonpublisher.pm 2000/12/04 15:39:28 1.13 +++ loncom/publisher/lonpublisher.pm 2001/03/24 21:51:58 1.20 @@ -5,7 +5,9 @@ # # 05/29/00,05/30,10/11 Gerd Kortemeyer) # -# 11/28,11/29,11/30,12/01,12/02,12/04 Gerd Kortemeyer +# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer +# 03/23 Guy Albertelli +# 03/24 Gerd Kortemeyer package Apache::lonpublisher; @@ -15,9 +17,7 @@ use File::Copy; use Apache::Constants qw(:common :http :methods); use HTML::TokeParser; use Apache::lonxml; -use Apache::structuretags; -use Apache::inputtags; -use Apache::response; +use Apache::lonhomework; my %addid; my %nokey; @@ -520,12 +520,14 @@ if (-e $target) { $copyfile=$copyfile.'.meta'; if (copy($target.'.meta',$copyfile)) { - print $logfile "Copied old target metadata to ".$copyfile."\n"; + print $logfile "Copied old target metadata to ".$copyfile."\n"; $scrout.='

Copied old metadata'; } else { print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n"; - return + if (-e $target.'.meta') { + return "Failed to write old metadata copy, $!, FAIL"; + } } @@ -596,6 +598,34 @@ if (-e $target) { } +# ---------------------------------------- Send update notifications, meta only + +{ + + my $filename; + + $target=~/(.*)\/([^\/]+)$/; + my $srcf=$2.'.meta'; + opendir(DIR,$1); + while ($filename=readdir(DIR)) { + if ($filename=~/$srcf\.(\w+)$/) { + my $subhost=$1; + if ($subhost ne 'meta') { + $scrout.= + '

Notifying host for metadata only '.$subhost.':'; + print $logfile + "\nNotifying host for metadata only '.$subhost.':'"; + my $reply=&Apache::lonnet::critical( + 'update:'.$target.'.meta',$subhost); + $scrout.=$reply; + print $logfile $reply; + } + } + } + closedir(DIR); + +} + # ------------------------------------------------ Provide link to new resource my $thisdistarget=$target; @@ -616,6 +646,7 @@ sub handler { return OK; } +unless ($ENV{'form.pubdir'}) { # -------------------------------------------------------------- Check filename my $fn=$ENV{'form.filename'}; @@ -709,7 +740,8 @@ unless ($ENV{'form.phase'} eq 'two') { $r->send_http_header; $r->print('LON-CAPA Publishing'); - $r->print(''); + $r->print( + ''); my $thisfn=$fn; # ------------------------------------------------------------- Individual file @@ -743,7 +775,55 @@ unless ($ENV{'form.phase'} eq 'two') { } $r->print(''); +} else { + + my $fn=$ENV{'form.filename'}; + + $fn=~s/\/[^\/]+$//; + my $thisprefix=$fn; + $thisprefix=~s/\/\~/\/priv\//; + + $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/; + + unless ($fn) { + $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}. + ' trying to publish empty directory', $r->filename); + return HTTP_NOT_FOUND; + } +# ----------------------------------------------------------- Start page output + + $r->content_type('text/html'); + $r->send_http_header; + + $r->print('LON-CAPA Publishing Directory'); + $r->print( + ''); + + my $thisdisfn=$fn; + $thisdisfn=~s/^\/home\/$ENV{'user.name'}\/public_html\///; + + $r->print('

Publishing directory '.$thisdisfn.'

'); + my $i=0; + $r->print(''); + + $r->print(''); + +} return OK; }