\n";
$colcount=0;
@@ -329,11 +375,234 @@ sub publish {
}
-# DEGUG
-
$scrout.=$keywordout;
+
+ $scrout.=&textfield('Additional Keywords','addkey','');
+
+ $scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
+
+ $scrout.=
+ 'Abstract:
';
+
+ $source=~/\.(\w+)$/;
+
+ $scrout.=&hiddenfield('mime',$1);
+
+ $scrout.=&selectbox('Language','language',
+ $metadatafields{'language'},%language);
+
+ unless ($metadatafields{'creationdate'}) {
+ $metadatafields{'creationdate'}=time;
+ }
+ $scrout.=&hiddenfield('creationdate',$metadatafields{'creationdate'});
+
+ $scrout.=&hiddenfield('lastrevisiondate',time);
+
+
+ $scrout.=&textfield('Publisher/Owner','owner',
+ $metadatafields{'owner'});
+
+ $scrout.=&selectbox('Copyright/Distribution','copyright',
+ $metadatafields{'copyright'},%cprtag);
+
}
- return $scrout;
+ return $scrout.
+ '
';
+}
+
+# -------------------------------------------------------- Publication Step Two
+
+sub phasetwo {
+
+ my ($source,$target,$style)=@_;
+ my $logfile;
+ my $scrout='';
+
+ unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
+ return
+ 'No write permission to user directory, FAIL';
+ }
+ print $logfile
+"\n================= Publish ".localtime()." Phase Two ================\n";
+
+ %metadatafields=();
+ %metadatakeys=();
+
+ &metaeval(&Apache::lonnet::unescape($ENV{'form.allmeta'}));
+
+ $metadatafields{'title'}=$ENV{'form.title'};
+ $metadatafields{'author'}=$ENV{'form.author'};
+ $metadatafields{'subject'}=$ENV{'form.subject'};
+ $metadatafields{'notes'}=$ENV{'form.notes'};
+ $metadatafields{'abstract'}=$ENV{'form.abstract'};
+ $metadatafields{'mime'}=$ENV{'form.mime'};
+ $metadatafields{'language'}=$ENV{'form.language'};
+ $metadatafields{'creationdate'}=$ENV{'form.creationdate'};
+ $metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
+ $metadatafields{'owner'}=$ENV{'form.owner'};
+ $metadatafields{'copyright'}=$ENV{'form.copyright'};
+
+ my $allkeywords=$ENV{'form.addkey'};
+ map {
+ if ($_=~/^form\.key\.(\w+)/) {
+ $allkeywords.=','.$1;
+ }
+ } keys %ENV;
+ $allkeywords=~s/\W+/\,/;
+ $allkeywords=~s/^\,//;
+ $metadatafields{'keywords'}=$allkeywords;
+
+ {
+ print $logfile "\nWrite metadata file for ".$source;
+ my $mfh;
+ unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
+ return
+ 'Could not write metadata, FAIL';
+ }
+ map {
+ unless ($_=~/\./) {
+ my $unikey=$_;
+ $unikey=~/^([A-Za-z]+)/;
+ my $tag=$1;
+ $tag=~tr/A-Z/a-z/;
+ print $mfh "\n\<$tag";
+ map {
+ my $value=$metadatafields{$unikey.'.'.$_};
+ $value=~s/\"/\'\'/g;
+ print $mfh ' '.$_.'="'.$value.'"';
+ } split(/\,/,$metadatakeys{$unikey});
+ print $mfh '>'.$metadatafields{$unikey}.'';
+ }
+ } sort keys %metadatafields;
+ $scrout.='
Wrote Metadata';
+ print $logfile "\nWrote metadata";
+ }
+
+# ----------------------------------------------------------- Copy old versions
+
+if (-e $target) {
+ my $filename;
+ my $maxversion=0;
+ $target=~/(.*)\/([^\/]+)\.(\w+)$/;
+ my $srcf=$2;
+ my $srct=$3;
+ my $srcd=$1;
+ unless ($srcd=~/^\/home\/httpd\/html\/res/) {
+ print $logfile "\nPANIC: Target dir is ".$srcd;
+ return "Invalid target directory, FAIL";
+ }
+ opendir(DIR,$srcd);
+ while ($filename=readdir(DIR)) {
+ if ($filename=~/$srcf\.(\d+)\.$srct$/) {
+ $maxversion=($1>$maxversion)?$1:$maxversion;
+ }
+ }
+ closedir(DIR);
+ $maxversion++;
+ $scrout.='
Creating old version '.$maxversion;
+ print $logfile "\nCreating old version ".$maxversion;
+
+ my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;
+
+ if (copy($target,$copyfile)) {
+ print $logfile "Copied old target to ".$copyfile."\n";
+ $scrout.='
Copied old target file';
+ } else {
+ print $logfile "Unable to write ".$copyfile.':'.$!."\n";
+ return "Failed to copy old target, $!, FAIL";
+ }
+
+# --------------------------------------------------------------- Copy Metadata
+
+ $copyfile=$copyfile.'.meta';
+
+ if (copy($target.'.meta',$copyfile)) {
+ print $logfile "Copied old target metadata to ".$copyfile."\n";
+ $scrout.='
Copied old metadata';
+ } else {
+ print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
+ if (-e $target.'.meta') {
+ return
+ "Failed to write old metadata copy, $!, FAIL";
+ }
+ }
+
+
+} else {
+ $scrout.='
Initial version';
+ print $logfile "\nInitial version";
+}
+
+# ---------------------------------------------------------------- Write Source
+ my $copyfile=$target;
+
+ my @parts=split(/\//,$copyfile);
+ my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]";
+
+ my $count;
+ for ($count=5;$count<$#parts;$count++) {
+ $path.="/$parts[$count]";
+ if ((-e $path)!=1) {
+ print $logfile "\nCreating directory ".$path;
+ $scrout.='
Created directory '.$parts[$count];
+ mkdir($path,0777);
+ }
+ }
+
+ if (copy($source,$copyfile)) {
+ print $logfile "Copied original source to ".$copyfile."\n";
+ $scrout.='
Copied source file';
+ } else {
+ print $logfile "Unable to write ".$copyfile.':'.$!."\n";
+ return "Failed to copy source, $!, FAIL";
+ }
+
+# --------------------------------------------------------------- Copy Metadata
+
+ $copyfile=$copyfile.'.meta';
+
+ if (copy($source.'.meta',$copyfile)) {
+ print $logfile "Copied original metadata to ".$copyfile."\n";
+ $scrout.='
Copied metadata';
+ } else {
+ print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
+ return
+ "Failed to write metadata copy, $!, FAIL";
+ }
+
+# --------------------------------------------------- Send update notifications
+
+{
+
+ my $filename;
+
+ $target=~/(.*)\/([^\/]+)$/;
+ my $srcf=$2;
+ opendir(DIR,$1);
+ while ($filename=readdir(DIR)) {
+ if ($filename=~/$srcf\.(\w+)$/) {
+ my $subhost=$1;
+ if ($subhost ne 'meta') {
+ $scrout.='
Notifying host '.$subhost.':';
+ print $logfile "\nNotifying host '.$subhost.':'";
+ my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
+ $scrout.=$reply;
+ print $logfile $reply;
+ }
+ }
+ }
+ closedir(DIR);
+
+}
+
+# ------------------------------------------------ Provide link to new resource
+
+ my $thisdistarget=$target;
+ $thisdistarget=~s/^$docroot//;
+
+ return $scrout.
+ '
View Target';
}
# ================================================================ Main Handler
@@ -347,6 +616,7 @@ sub handler {
return OK;
}
+unless ($ENV{'form.pubdir'}) {
# -------------------------------------------------------------- Check filename
my $fn=$ENV{'form.filename'};
@@ -368,7 +638,7 @@ sub handler {
$fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
my $targetdir='';
- my $docroot=$r->dir_config('lonDocRoot');
+ $docroot=$r->dir_config('lonDocRoot');
if ($1 ne $ENV{'user.name'}) {
$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
' trying to publish unowned file '.$ENV{'form.filename'}.
@@ -388,6 +658,8 @@ sub handler {
return HTTP_NOT_FOUND;
}
+unless ($ENV{'form.phase'} eq 'two') {
+
# --------------------------------- File is there and owned, init lookup tables
%addid=();
@@ -409,13 +681,37 @@ sub handler {
$nokey{$word}=1;
} <$fh>;
}
+
+ %language=();
+
+ {
+ my $fh=Apache::File->new($r->dir_config('lonTabDir').'/language.tab');
+ map {
+ $_=~/(\w+)\s+([\w\s\-]+)/;
+ $language{$1}=$2;
+ } <$fh>;
+ }
+
+ %cprtag=();
+
+ {
+ my $fh=Apache::File->new($r->dir_config('lonIncludes').'/copyright.tab');
+ map {
+ $_=~/(\w+)\s+([\w\s\-]+)/;
+ $cprtag{$1}=$2;
+ } <$fh>;
+ }
+
+}
+
# ----------------------------------------------------------- Start page output
$r->content_type('text/html');
$r->send_http_header;
$r->print('
LON-CAPA Publishing');
- $r->print('');
+ $r->print(
+ '
');
my $thisfn=$fn;
# ------------------------------------------------------------- Individual file
@@ -438,15 +734,66 @@ sub handler {
$r->print('Publishing '.
&Apache::lonnet::filedescription($thistype).' '.
$thisdisfn.'
Target: '.$thisdistarget.'');
-
+
# ------------ We are publishing from $thisfn to $thistarget with $thisembstyle
- $r->print('
'.&publish($thisfn,$thistarget,$thisembstyle));
-
- }
+ unless ($ENV{'form.phase'} eq 'two') {
+ $r->print('
'.&publish($thisfn,$thistarget,$thisembstyle));
+ } else {
+ $r->print('
'.&phasetwo($thisfn,$thistarget,$thisembstyle));
+ }
+ }
$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;
}