version 1.122, 2003/06/24 23:24:48
|
version 1.136, 2003/09/25 20:01:15
|
Line 82 invocation by F<loncapa_apache.conf>:
|
Line 82 invocation by F<loncapa_apache.conf>:
|
ErrorDocument 500 /adm/errorhandler |
ErrorDocument 500 /adm/errorhandler |
</Location> |
</Location> |
|
|
|
=head1 OVERVIEW |
|
|
|
Authors can only write-access the C</~authorname/> space. They can |
|
copy resources into the resource area through the publication step, |
|
and move them back through a recover step. Authors do not have direct |
|
write-access to their resource space. |
|
|
|
During the publication step, several events will be |
|
triggered. Metadata is gathered, where a wizard manages default |
|
entries on a hierarchical per-directory base: The wizard imports the |
|
metadata (including access privileges and royalty information) from |
|
the most recent published resource in the current directory, and if |
|
that is not available, from the next directory above, etc. The Network |
|
keeps all previous versions of a resource and makes them available by |
|
an explicit version number, which is inserted between the file name |
|
and extension, for example C<foo.2.html>, while the most recent |
|
version does not carry a version number (C<foo.html>). Servers |
|
subscribing to a changed resource are notified that a new version is |
|
available. |
|
|
=head1 DESCRIPTION |
=head1 DESCRIPTION |
|
|
B<lonpublisher> takes the proper steps to add resources to the LON-CAPA |
B<lonpublisher> takes the proper steps to add resources to the LON-CAPA |
Line 122 use DBI;
|
Line 142 use DBI;
|
use Apache::lonnet(); |
use Apache::lonnet(); |
use Apache::loncommon(); |
use Apache::loncommon(); |
use Apache::lonmysql; |
use Apache::lonmysql; |
|
use Apache::lonlocal; |
use vars qw(%metadatafields %metadatakeys); |
use vars qw(%metadatafields %metadatakeys); |
|
|
my %addid; |
my %addid; |
Line 304 string which presents the form field (fo
|
Line 325 string which presents the form field (fo
|
######################################### |
######################################### |
sub textfield { |
sub textfield { |
my ($title,$name,$value)=@_; |
my ($title,$name,$value)=@_; |
return "\n<p><b>$title:</b></p><br />". |
$title=&mt($title); |
|
my $uctitle=uc($title); |
|
return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:". |
|
"</b></font></p><br />". |
'<input type="text" name="'.$name.'" size=80 value="'.$value.'" />'; |
'<input type="text" name="'.$name.'" size=80 value="'.$value.'" />'; |
} |
} |
|
|
Line 315 sub hiddenfield {
|
Line 339 sub hiddenfield {
|
|
|
sub selectbox { |
sub selectbox { |
my ($title,$name,$value,$functionref,@idlist)=@_; |
my ($title,$name,$value,$functionref,@idlist)=@_; |
|
$title=&mt($title); |
my $uctitle=uc($title); |
my $uctitle=uc($title); |
|
$value=(split(/\s*,\s*/,$value))[-1]; |
my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:". |
my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:". |
"</b></font></p><br />".'<select name="'.$name.'">'; |
'</b></font></p><br /><select name="'.$name.'">'; |
foreach (@idlist) { |
foreach (@idlist) { |
$selout.='<option value=\''.$_.'\''; |
$selout.='<option value=\''.$_.'\''; |
if ($_ eq $value) { |
if ($_ eq $value) { |
Line 644 sub fix_ids_and_indices {
|
Line 670 sub fix_ids_and_indices {
|
} |
} |
} |
} |
# probably a <randomlabel> image type <label> |
# probably a <randomlabel> image type <label> |
if ($lctag eq 'label' && defined($parms{'description'})) { |
# or a <image> tag inside <imageresponse> |
|
if (($lctag eq 'label' && defined($parms{'description'})) |
|
|| |
|
($lctag eq 'image')) { |
my $next_token=$parser[-1]->get_token(); |
my $next_token=$parser[-1]->get_token(); |
if ($next_token->[0] eq 'T') { |
if ($next_token->[0] eq 'T') { |
$next_token->[1]=&set_allow(\%allow,$logfile, |
$next_token->[1]=&set_allow(\%allow,$logfile, |
Line 695 sub fix_ids_and_indices {
|
Line 724 sub fix_ids_and_indices {
|
} |
} |
if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; } |
if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; } |
$outstring.='<'.$tag.$newparmstring.$endtag.'>'; |
$outstring.='<'.$tag.$newparmstring.$endtag.'>'; |
if ($lctag eq 'm') { |
if ($lctag eq 'm' || $lctag eq 'script' |
$outstring.=&get_all_text_unbalanced('/m',\@parser); |
|| $lctag eq 'display' || $lctag eq 'tex') { |
|
$outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser); |
} |
} |
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
if ($token->[2]) { |
if ($token->[2]) { |
Line 812 sub publish {
|
Line 842 sub publish {
|
return ('<font color="red">No write permission to user directory, FAIL</font>',1); |
return ('<font color="red">No write permission to user directory, FAIL</font>',1); |
} |
} |
print $logfile |
print $logfile |
"\n\n================= Publish ".localtime()." Phase One ================\n"; |
"\n\n================= Publish ".localtime()." Phase One ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n"; |
|
|
if (($style eq 'ssi') || ($style eq 'rat') || ($style eq 'prv')) { |
if (($style eq 'ssi') || ($style eq 'rat') || ($style eq 'prv')) { |
# ------------------------------------------------------- This needs processing |
# ------------------------------------------------------- This needs processing |
Line 867 sub publish {
|
Line 897 sub publish {
|
} |
} |
$outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s; |
$outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s; |
|
|
|
### FIXME: is this really what we want? |
#Encode any High ASCII characters |
#Encode any High ASCII characters |
$outstring=&HTML::Entities::encode($outstring,"\200-\377"); |
$outstring=&HTML::Entities::encode($outstring,"\200-\377"); |
# ------------------------------------------------------------- Write modified. |
# ------------------------------------------------------------- Write modified. |
Line 875 sub publish {
|
Line 906 sub publish {
|
my $org; |
my $org; |
unless ($org=Apache::File->new('>'.$source)) { |
unless ($org=Apache::File->new('>'.$source)) { |
print $logfile "No write permit to $source\n"; |
print $logfile "No write permit to $source\n"; |
return ('<font color="red">No write permission to '.$source. |
return ('<font color="red">'.&mt('No write permission to'). |
', FAIL</font>',1); |
' '.$source. |
|
', '.&mt('FAIL').'</font>',1); |
} |
} |
print($org $outstring); |
print($org $outstring); |
} |
} |
Line 893 sub publish {
|
Line 925 sub publish {
|
my %oldparmstores=(); |
my %oldparmstores=(); |
|
|
unless ($batch) { |
unless ($batch) { |
$scrout.='<h3>Metadata Information ' . |
$scrout.='<h3>'.&mt('Metadata Information').' ' . |
Apache::loncommon::help_open_topic("Metadata_Description") |
Apache::loncommon::help_open_topic("Metadata_Description") |
. '</h3>'; |
. '</h3>'; |
} |
} |
Line 907 sub publish {
|
Line 939 sub publish {
|
$metadatafields{'author'}=~s/\s+/ /g; |
$metadatafields{'author'}=~s/\s+/ /g; |
$metadatafields{'author'}=~s/\s+$//; |
$metadatafields{'author'}=~s/\s+$//; |
$metadatafields{'owner'}=$cuname.'@'.$cudom; |
$metadatafields{'owner'}=$cuname.'@'.$cudom; |
|
$metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'. |
|
$ENV{'user.domain'}; |
|
$metadatafields{'authorspace'}=$cuname.'@'.$cudom; |
|
|
# ------------------------------------------------ Check out directory hierachy |
# ------------------------------------------------ Check out directory hierachy |
|
|
Line 947 sub publish {
|
Line 982 sub publish {
|
|
|
# -------------------------------------------------- Parse content for metadata |
# -------------------------------------------------- Parse content for metadata |
if (($style eq 'ssi') || ($style eq 'prv')) { |
if (($style eq 'ssi') || ($style eq 'prv')) { |
my $oldenv=$ENV{'request.uri'}; |
my $dir=$source; |
|
$dir=~s-/[^/]*$--; |
$ENV{'request.uri'}=$target; |
my $file=$source; |
$allmeta=Apache::lonxml::xmlparse(undef,'meta',$content); |
$file=(split('/',$file))[-1]; |
$ENV{'request.uri'}=$oldenv; |
$source=&Apache::lonnet::hreflocation($dir,$file); |
|
$allmeta=&Apache::lonnet::ssi_body($source,('grade_target' => 'meta')); |
|
|
&metaeval($allmeta); |
&metaeval($allmeta); |
} |
} |
Line 969 sub publish {
|
Line 1005 sub publish {
|
} |
} |
} |
} |
if ($chparms) { |
if ($chparms) { |
$scrout.='<p><b>New parameters or stored values:</b> '.$chparms.'</p>'; |
$scrout.='<p><b>'.&mt('New parameters or stored values'). |
|
':</b> '.$chparms.'</p>'; |
} |
} |
|
|
$chparms=''; |
$chparms=''; |
Line 983 sub publish {
|
Line 1020 sub publish {
|
} |
} |
} |
} |
if ($chparms) { |
if ($chparms) { |
$scrout.='<p><b>Obsolete parameters or stored values:</b> '. |
$scrout.='<p><b>'.&mt('Obsolete parameters or stored values').':</b> '. |
$chparms.'</p>'; |
$chparms.'</p>'; |
} |
} |
|
|
Line 1042 function uncheckAll(field) {
|
Line 1079 function uncheckAll(field) {
|
field[i].checked = false ; |
field[i].checked = false ; |
} |
} |
</script> |
</script> |
<p><b>Keywords: $keywords_help</b> |
<p><font color="#800000" face="helvetica"><b>KEYWORDS:</b></font> |
|
$keywords_help</b> |
<input type="button" value="check all" onclick="javascript:checkAll(document.pubform.keywords)" /> |
<input type="button" value="check all" onclick="javascript:checkAll(document.pubform.keywords)" /> |
<input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.pubform.keywords)" /> |
<input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.pubform.keywords)" /> |
</p> |
</p> |
Line 1077 END
|
Line 1115 END
|
$scrout.=&textfield('Notes','notes',$metadatafields{'notes'}); |
$scrout.=&textfield('Notes','notes',$metadatafields{'notes'}); |
|
|
$scrout.= |
$scrout.= |
'<p><b>Abstract:</b><br /><textarea cols="80" rows="5" name="abstract">'. |
"\n<p><font color=\"#800000\" face=\"helvetica\"><b>ABSTRACT:". |
|
"</b></font></p><br />". |
|
'<textarea cols="80" rows="5" name="abstract">'. |
$metadatafields{'abstract'}.'</textarea></p>'; |
$metadatafields{'abstract'}.'</textarea></p>'; |
|
|
$source=~/\.(\w+)$/; |
$source=~/\.(\w+)$/; |
|
|
$scrout.=&hiddenfield('mime',$1); |
$scrout.=&hiddenfield('mime',$1); |
|
|
|
my $defaultlanguage=$metadatafields{'language'}; |
|
$defaultlanguage =~ s/\s*notset\s*//g; |
|
$defaultlanguage =~ s/^,\s*//g; |
|
$defaultlanguage =~ s/,\s*$//g; |
|
|
$scrout.=&selectbox('Language','language', |
$scrout.=&selectbox('Language','language', |
$metadatafields{'language'}, |
$defaultlanguage, |
\&Apache::loncommon::languagedescription, |
\&Apache::loncommon::languagedescription, |
(&Apache::loncommon::languageids), |
(&Apache::loncommon::languageids), |
); |
); |
Line 1128 END
|
Line 1173 END
|
$scrout.=&textfield('Custom Distribution File','customdistributionfile', |
$scrout.=&textfield('Custom Distribution File','customdistributionfile', |
$metadatafields{'customdistributionfile'}). |
$metadatafields{'customdistributionfile'}). |
$copyright_help; |
$copyright_help; |
|
my $uctitle=uc(&mt('Obsolete')); |
|
$scrout.= |
|
"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:". |
|
'</b></font> <input type="checkbox" name="obsolete" '; |
|
if ($metadatafields{'obsolete'}) { |
|
$scrout.=' checked="1" '; |
|
} |
|
$scrout.='/ ></p>'. |
|
&textfield('Suggested Replacement for Obsolete File', |
|
'obsoletereplacement', |
|
$metadatafields{'obsoletereplacement'}); |
} else { |
} else { |
$scrout.=&hiddenfield('copyright','private'); |
$scrout.=&hiddenfield('copyright','private'); |
} |
} |
return ($scrout.'<p><input type="submit" value="Finalize Publication" /></p></form>',0); |
return ($scrout.'<p><input type="submit" value="'. |
|
&mt('Finalize Publication').'" /></p></form>',0); |
# ============================================================================= |
# ============================================================================= |
# BATCH MODE |
# BATCH MODE |
# |
# |
Line 1209 sub phasetwo {
|
Line 1266 sub phasetwo {
|
|
|
if ($target=~/\_\_\_/) { |
if ($target=~/\_\_\_/) { |
$r->print( |
$r->print( |
'<font color="red">Unsupported character combination "<tt>___</tt>" in filename, FAIL</font>'); |
'<font color="red">'.&mt('Unsupported character combination'). |
|
' "<tt>___</tt>" '.&mt('in filename, FAIL').'</font>'); |
return 0; |
return 0; |
} |
} |
$distarget=~s/\/+/\//g; |
$distarget=~s/\/+/\//g; |
my $logfile; |
my $logfile; |
unless ($logfile=Apache::File->new('>>'.$source.'.log')) { |
unless ($logfile=Apache::File->new('>>'.$source.'.log')) { |
$r->print( |
$r->print( |
'<font color="red">No write permission to user directory, FAIL</font>'); |
'<font color="red">'. |
|
&mt('No write permission to user directory, FAIL').'</font>'); |
return 0; |
return 0; |
} |
} |
print $logfile |
print $logfile |
"\n================= Publish ".localtime()." Phase Two ================\n"; |
"\n================= Publish ".localtime()." Phase Two ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n"; |
|
|
%metadatafields=(); |
%metadatafields=(); |
%metadatakeys=(); |
%metadatakeys=(); |
Line 1259 sub phasetwo {
|
Line 1318 sub phasetwo {
|
my $mfh; |
my $mfh; |
unless ($mfh=Apache::File->new('>'.$source.'.meta')) { |
unless ($mfh=Apache::File->new('>'.$source.'.meta')) { |
return |
return |
'<font color="red">Could not write metadata, FAIL</font>'; |
'<font color="red">'.&mt('Could not write metadata, FAIL'). |
|
'</font>'; |
} |
} |
foreach (sort keys %metadatafields) { |
foreach (sort keys %metadatafields) { |
unless ($_=~/\./) { |
unless ($_=~/\./) { |
Line 1278 sub phasetwo {
|
Line 1338 sub phasetwo {
|
.'</'.$tag.'>'; |
.'</'.$tag.'>'; |
} |
} |
} |
} |
$r->print('<p>Wrote Metadata</p>'); |
$r->print('<p>'.&mt('Wrote Metadata').'</p>'); |
print $logfile "\nWrote metadata"; |
print $logfile "\nWrote metadata"; |
} |
} |
|
|
Line 1296 sub phasetwo {
|
Line 1356 sub phasetwo {
|
print $logfile "\n".$error; |
print $logfile "\n".$error; |
} |
} |
} else { |
} else { |
$r->print('<p>Private Publication - did not synchronize database</p>'); |
$r->print('<p>'. |
|
&mt('Private Publication - did not synchronize database').'</p>'); |
print $logfile "\nPrivate: Did not synchronize data into ". |
print $logfile "\nPrivate: Did not synchronize data into ". |
"SQL metadata database"; |
"SQL metadata database"; |
} |
} |
Line 1327 sub phasetwo {
|
Line 1388 sub phasetwo {
|
closedir(DIR); |
closedir(DIR); |
$maxversion++; |
$maxversion++; |
$r->print('<p>Creating old version '.$maxversion.'</p>'); |
$r->print('<p>Creating old version '.$maxversion.'</p>'); |
print $logfile "\nCreating old version ".$maxversion; |
print $logfile "\nCreating old version ".$maxversion."\n"; |
|
|
my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct; |
my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct; |
|
|
if (copy($target,$copyfile)) { |
if (copy($target,$copyfile)) { |
print $logfile "Copied old target to ".$copyfile."\n"; |
print $logfile "Copied old target to ".$copyfile."\n"; |
$r->print('<p>Copied old target file</p>'); |
$r->print('<p>'.&mt('Copied old target file').'</p>'); |
} else { |
} else { |
print $logfile "Unable to write ".$copyfile.':'.$!."\n"; |
print $logfile "Unable to write ".$copyfile.':'.$!."\n"; |
return "<font color=\"red\">Failed to copy old target, $!, FAIL</font>"; |
return "<font color=\"red\">".&mt('Failed to copy old target'). |
|
", $!, ".&mt('FAIL')."</font>"; |
} |
} |
|
|
# --------------------------------------------------------------- Copy Metadata |
# --------------------------------------------------------------- Copy Metadata |
Line 1345 sub phasetwo {
|
Line 1407 sub phasetwo {
|
|
|
if (copy($target.'.meta',$copyfile)) { |
if (copy($target.'.meta',$copyfile)) { |
print $logfile "Copied old target metadata to ".$copyfile."\n"; |
print $logfile "Copied old target metadata to ".$copyfile."\n"; |
$r->print('<p>Copied old metadata</p>') |
$r->print('<p>'.&mt('Copied old metadata').'</p>') |
} else { |
} else { |
print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n"; |
print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n"; |
if (-e $target.'.meta') { |
if (-e $target.'.meta') { |
return |
return |
"<font color=\"red\">Failed to write old metadata copy, $!, FAIL</font>"; |
"<font color=\"red\">". |
|
&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>"; |
} |
} |
} |
} |
|
|
Line 1371 sub phasetwo {
|
Line 1434 sub phasetwo {
|
$path.="/$parts[$count]"; |
$path.="/$parts[$count]"; |
if ((-e $path)!=1) { |
if ((-e $path)!=1) { |
print $logfile "\nCreating directory ".$path; |
print $logfile "\nCreating directory ".$path; |
$r->print('<p>Created directory '.$parts[$count].'</p>'); |
$r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>'); |
mkdir($path,0777); |
mkdir($path,0777); |
} |
} |
} |
} |
|
|
if (copy($source,$copyfile)) { |
if (copy($source,$copyfile)) { |
print $logfile "\nCopied original source to ".$copyfile."\n"; |
print $logfile "\nCopied original source to ".$copyfile."\n"; |
$r->print('<p>Copied source file</p>'); |
$r->print('<p>'.&mt('Copied source file').'</p>'); |
} else { |
} else { |
print $logfile "\nUnable to write ".$copyfile.':'.$!."\n"; |
print $logfile "\nUnable to write ".$copyfile.':'.$!."\n"; |
return "<font color=\"red\">Failed to copy source, $!, FAIL</font>"; |
return "<font color=\"red\">". |
|
&mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>"; |
} |
} |
|
|
# --------------------------------------------------------------- Copy Metadata |
# --------------------------------------------------------------- Copy Metadata |
Line 1390 sub phasetwo {
|
Line 1454 sub phasetwo {
|
|
|
if (copy($source.'.meta',$copyfile)) { |
if (copy($source.'.meta',$copyfile)) { |
print $logfile "\nCopied original metadata to ".$copyfile."\n"; |
print $logfile "\nCopied original metadata to ".$copyfile."\n"; |
$r->print('<p>Copied metadata</p>'); |
$r->print('<p>'.&mt('Copied metadata').'</p>'); |
} else { |
} else { |
print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n"; |
print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n"; |
return |
return |
"<font color=\"red\">Failed to write metadata copy, $!, FAIL</font>"; |
"<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>"; |
} |
} |
$r->rflush; |
$r->rflush; |
# --------------------------------------------------- Send update notifications |
# --------------------------------------------------- Send update notifications |
|
|
my @subscribed=&get_subscribed_hosts($target); |
my @subscribed=&get_subscribed_hosts($target); |
foreach my $subhost (@subscribed) { |
foreach my $subhost (@subscribed) { |
$r->print('<p>Notifying host '.$subhost.':');$r->rflush; |
$r->print('<p>'.&mt('Notifying host').' '.$subhost.':');$r->rflush; |
print $logfile "\nNotifying host ".$subhost.':'; |
print $logfile "\nNotifying host ".$subhost.':'; |
my $reply=&Apache::lonnet::critical('update:'.$target,$subhost); |
my $reply=&Apache::lonnet::critical('update:'.$target,$subhost); |
$r->print($reply.'</p><br />');$r->rflush; |
$r->print($reply.'</p><br />');$r->rflush; |
Line 1412 sub phasetwo {
|
Line 1476 sub phasetwo {
|
|
|
my @subscribedmeta=&get_subscribed_hosts("$target.meta"); |
my @subscribedmeta=&get_subscribed_hosts("$target.meta"); |
foreach my $subhost (@subscribedmeta) { |
foreach my $subhost (@subscribedmeta) { |
$r->print('<p>Notifying host for metadata only '.$subhost.':');$r->rflush; |
$r->print('<p>'. |
|
&mt('Notifying host for metadata only').' '.$subhost.':');$r->rflush; |
print $logfile "\nNotifying host for metadata only ".$subhost.':'; |
print $logfile "\nNotifying host for metadata only ".$subhost.':'; |
my $reply=&Apache::lonnet::critical('update:'.$target.'.meta', |
my $reply=&Apache::lonnet::critical('update:'.$target.'.meta', |
$subhost); |
$subhost); |
Line 1424 sub phasetwo {
|
Line 1489 sub phasetwo {
|
my %courses=&coursedependencies($target); |
my %courses=&coursedependencies($target); |
my $now=time; |
my $now=time; |
foreach (keys %courses) { |
foreach (keys %courses) { |
$r->print('<p>Notifying course '.$_.':');$r->rflush; |
$r->print('<p>'.&mt('Notifying course').' '.$_.':');$r->rflush; |
print $logfile "\nNotifying host ".$_.':'; |
print $logfile "\nNotifying host ".$_.':'; |
my ($cdom,$cname)=split(/\_/,$_); |
my ($cdom,$cname)=split(/\_/,$_); |
my $reply=&Apache::lonnet::cput |
my $reply=&Apache::lonnet::cput |
Line 1457 sub phasetwo {
|
Line 1522 sub phasetwo {
|
|
|
sub batchpublish { |
sub batchpublish { |
my ($r,$srcfile,$targetfile)=@_; |
my ($r,$srcfile,$targetfile)=@_; |
|
#publication pollutes %ENV with form.* values |
|
my %oldENV=%ENV; |
$srcfile=~s/\/+/\//g; |
$srcfile=~s/\/+/\//g; |
$targetfile=~s/\/+/\//g; |
$targetfile=~s/\/+/\//g; |
my $thisdisfn=$srcfile; |
my $thisdisfn=$srcfile; |
Line 1492 sub batchpublish {
|
Line 1559 sub batchpublish {
|
&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1); |
&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1); |
$r->print('</p>'); |
$r->print('</p>'); |
} |
} |
|
%ENV=%oldENV; |
return ''; |
return ''; |
} |
} |
|
|
Line 1532 sub publishdirectory {
|
Line 1600 sub publishdirectory {
|
$ruid,$rgid,$rrdev,$rsize, |
$ruid,$rgid,$rrdev,$rsize, |
$ratime,$rmtime,$rctime, |
$ratime,$rmtime,$rctime, |
$rblksize,$rblocks)=stat($resdir.'/'.$filename); |
$rblksize,$rblocks)=stat($resdir.'/'.$filename); |
if ($rmtime<$cmtime) { |
if (($rmtime<$cmtime) || ($ENV{'form.forcerepub'})) { |
# previously published, modified now |
# previously published, modified now |
$publishthis=1; |
$publishthis=1; |
} |
} |
Line 1594 sub handler {
|
Line 1662 sub handler {
|
my $r=shift; |
my $r=shift; |
|
|
if ($r->header_only) { |
if ($r->header_only) { |
$r->content_type('text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
return OK; |
return OK; |
} |
} |
Line 1687 unless ($ENV{'form.phase'} eq 'two') {
|
Line 1755 unless ($ENV{'form.phase'} eq 'two') {
|
|
|
# ---------------------------------------------------------- Start page output. |
# ---------------------------------------------------------- Start page output. |
|
|
$r->content_type('text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
|
|
$r->print('<html><head><title>LON-CAPA Publishing</title></head>'); |
$r->print('<html><head><title>LON-CAPA Publishing</title></head>'); |
Line 1710 unless ($ENV{'form.phase'} eq 'two') {
|
Line 1778 unless ($ENV{'form.phase'} eq 'two') {
|
if ($fn=~/\/$/) { |
if ($fn=~/\/$/) { |
# -------------------------------------------------------- This is a directory |
# -------------------------------------------------------- This is a directory |
&publishdirectory($r,$fn,$thisdisfn); |
&publishdirectory($r,$fn,$thisdisfn); |
|
$r->print('<hr><font size="+2">'.&mt('Done').'</font><br><a href="/priv/' |
|
.$cuname.'/'.$thisdisfn |
|
.'">'.&mt('Return to Directory').'</a>'); |
|
|
|
|
} else { |
} else { |
# ---------------------- Evaluate individual file, and then output information. |
# ---------------------- Evaluate individual file, and then output information. |
$thisfn=~/\.(\w+)$/; |
$thisfn=~/\.(\w+)$/; |
my $thistype=$1; |
my $thistype=$1; |
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
|
$r->print('<h2>'.&mt('Publishing').' '. |
|
&Apache::loncommon::filedescription($thistype).' <tt>'); |
|
|
$r->print('<h2>Publishing '. |
$r->print(<<ENDCAPTION); |
&Apache::loncommon::filedescription($thistype).' <tt>'. |
<a href='javascript:void(window.open("/~$cuname/$thisdisfn","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'> |
'<a href="/~'.$cuname.'/'.$thisdisfn.'" target="cat">'.$thisdisfn. |
$thisdisfn</a> |
'</a></tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><br />'); |
ENDCAPTION |
|
$r->print( |
|
'</tt></h2><b>'.&mt('Target').':</b> <tt>'.$thisdistarget.'</tt><br />'); |
|
|
if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) { |
if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) { |
$r->print('<h3><font color="red">Co-Author: '.$cuname.' at '.$cudom. |
$r->print('<h3><font color="red">'.&mt('Co-Author').': '.$cuname.&mt(' at ').$cudom. |
'</font></h3>'); |
'</font></h3>'); |
} |
} |
|
|
if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') { |
if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') { |
$r->print('<br /><a href="/adm/diff?filename=/~'.$cuname.'/'. |
$r->print(<<ENDDIFF); |
$thisdisfn. |
<br /> |
'&versiontwo=priv" target="cat">Diffs with Current Version</a><br />'); |
<a href='javascript:void(window.open("/adm/diff?filename=/~$cuname/$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'> |
|
ENDDIFF |
|
$r->print(&mt('Diffs with Current Version').'</a><br />'); |
} |
} |
|
|
# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle. |
# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle. |
Line 1755 __END__
|
Line 1833 __END__
|
|
|
=back |
=back |
|
|
|
=back |
|
|
=cut |
=cut |
|
|