+ if (($lctag eq 'label' && defined($parms{'description'}))
+ ||
+ ($lctag eq 'image')) {
my $next_token=$parser[-1]->get_token();
if ($next_token->[0] eq 'T') {
$next_token->[1]=&set_allow(\%allow,$logfile,
@@ -695,8 +724,9 @@ sub fix_ids_and_indices {
}
if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
$outstring.='<'.$tag.$newparmstring.$endtag.'>';
- if ($lctag eq 'm') {
- $outstring.=&get_all_text_unbalanced('/m',\@parser);
+ if ($lctag eq 'm' || $lctag eq 'script'
+ || $lctag eq 'display' || $lctag eq 'tex') {
+ $outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
}
} elsif ($token->[0] eq 'E') {
if ($token->[2]) {
@@ -812,7 +842,7 @@ sub publish {
return ('No write permission to user directory, FAIL ',1);
}
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')) {
# ------------------------------------------------------- This needs processing
@@ -867,6 +897,7 @@ sub publish {
}
$outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s;
+### FIXME: is this really what we want?
#Encode any High ASCII characters
$outstring=&HTML::Entities::encode($outstring,"\200-\377");
# ------------------------------------------------------------- Write modified.
@@ -875,8 +906,9 @@ sub publish {
my $org;
unless ($org=Apache::File->new('>'.$source)) {
print $logfile "No write permit to $source\n";
- return ('No write permission to '.$source.
- ', FAIL ',1);
+ return (''.&mt('No write permission to').
+ ' '.$source.
+ ', '.&mt('FAIL').' ',1);
}
print($org $outstring);
}
@@ -893,7 +925,7 @@ sub publish {
my %oldparmstores=();
unless ($batch) {
- $scrout.='Metadata Information ' .
+ $scrout.=''.&mt('Metadata Information').' ' .
Apache::loncommon::help_open_topic("Metadata_Description")
. ' ';
}
@@ -907,6 +939,9 @@ sub publish {
$metadatafields{'author'}=~s/\s+/ /g;
$metadatafields{'author'}=~s/\s+$//;
$metadatafields{'owner'}=$cuname.'@'.$cudom;
+ $metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
+ $ENV{'user.domain'};
+ $metadatafields{'authorspace'}=$cuname.'@'.$cudom;
# ------------------------------------------------ Check out directory hierachy
@@ -947,11 +982,12 @@ sub publish {
# -------------------------------------------------- Parse content for metadata
if (($style eq 'ssi') || ($style eq 'prv')) {
- my $oldenv=$ENV{'request.uri'};
-
- $ENV{'request.uri'}=$target;
- $allmeta=Apache::lonxml::xmlparse(undef,'meta',$content);
- $ENV{'request.uri'}=$oldenv;
+ my $dir=$source;
+ $dir=~s-/[^/]*$--;
+ my $file=$source;
+ $file=(split('/',$file))[-1];
+ $source=&Apache::lonnet::hreflocation($dir,$file);
+ $allmeta=&Apache::lonnet::ssi_body($source,('grade_target' => 'meta'));
&metaeval($allmeta);
}
@@ -969,7 +1005,8 @@ sub publish {
}
}
if ($chparms) {
- $scrout.=' New parameters or stored values: '.$chparms.'
';
+ $scrout.=''.&mt('New parameters or stored values').
+ ': '.$chparms.'
';
}
$chparms='';
@@ -983,7 +1020,7 @@ sub publish {
}
}
if ($chparms) {
- $scrout.='Obsolete parameters or stored values: '.
+ $scrout.='
'.&mt('Obsolete parameters or stored values').': '.
$chparms.'
';
}
@@ -1042,7 +1079,8 @@ function uncheckAll(field) {
field[i].checked = false ;
}
-Keywords: $keywords_help
+
KEYWORDS:
+ $keywords_help
@@ -1077,15 +1115,22 @@ END
$scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
$scrout.=
- 'Abstract:
';
$source=~/\.(\w+)$/;
$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',
- $metadatafields{'language'},
+ $defaultlanguage,
\&Apache::loncommon::languagedescription,
(&Apache::loncommon::languageids),
);
@@ -1128,10 +1173,22 @@ END
$scrout.=&textfield('Custom Distribution File','customdistributionfile',
$metadatafields{'customdistributionfile'}).
$copyright_help;
+ my $uctitle=uc(&mt('Obsolete'));
+ $scrout.=
+ "\n$uctitle:".
+ '
'.
+ &textfield('Suggested Replacement for Obsolete File',
+ 'obsoletereplacement',
+ $metadatafields{'obsoletereplacement'});
} else {
$scrout.=&hiddenfield('copyright','private');
}
- return ($scrout.'
',0);
+ return ($scrout.'
',0);
# =============================================================================
# BATCH MODE
#
@@ -1209,18 +1266,20 @@ sub phasetwo {
if ($target=~/\_\_\_/) {
$r->print(
- 'Unsupported character combination "___ " in filename, FAIL ');
+ ''.&mt('Unsupported character combination').
+ ' "___ " '.&mt('in filename, FAIL').' ');
return 0;
}
$distarget=~s/\/+/\//g;
my $logfile;
unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
$r->print(
- 'No write permission to user directory, FAIL ');
+ ''.
+ &mt('No write permission to user directory, FAIL').' ');
return 0;
}
print $logfile
- "\n================= Publish ".localtime()." Phase Two ================\n";
+ "\n================= Publish ".localtime()." Phase Two ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
%metadatafields=();
%metadatakeys=();
@@ -1259,7 +1318,8 @@ sub phasetwo {
my $mfh;
unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
return
- 'Could not write metadata, FAIL ';
+ ''.&mt('Could not write metadata, FAIL').
+ ' ';
}
foreach (sort keys %metadatafields) {
unless ($_=~/\./) {
@@ -1278,7 +1338,7 @@ sub phasetwo {
.''.$tag.'>';
}
}
- $r->print('Wrote Metadata
');
+ $r->print(''.&mt('Wrote Metadata').'
');
print $logfile "\nWrote metadata";
}
@@ -1296,7 +1356,8 @@ sub phasetwo {
print $logfile "\n".$error;
}
} else {
- $r->print('Private Publication - did not synchronize database
');
+ $r->print(''.
+ &mt('Private Publication - did not synchronize database').'
');
print $logfile "\nPrivate: Did not synchronize data into ".
"SQL metadata database";
}
@@ -1327,16 +1388,17 @@ sub phasetwo {
closedir(DIR);
$maxversion++;
$r->print('Creating old version '.$maxversion.'
');
- print $logfile "\nCreating old version ".$maxversion;
+ print $logfile "\nCreating old version ".$maxversion."\n";
my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;
if (copy($target,$copyfile)) {
print $logfile "Copied old target to ".$copyfile."\n";
- $r->print('Copied old target file
');
+ $r->print(''.&mt('Copied old target file').'
');
} else {
print $logfile "Unable to write ".$copyfile.':'.$!."\n";
- return "Failed to copy old target, $!, FAIL ";
+ return "".&mt('Failed to copy old target').
+ ", $!, ".&mt('FAIL')." ";
}
# --------------------------------------------------------------- Copy Metadata
@@ -1345,12 +1407,13 @@ sub phasetwo {
if (copy($target.'.meta',$copyfile)) {
print $logfile "Copied old target metadata to ".$copyfile."\n";
- $r->print('Copied old metadata
')
+ $r->print(''.&mt('Copied old metadata').'
')
} else {
print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
if (-e $target.'.meta') {
return
- "Failed to write old metadata copy, $!, FAIL ";
+ "".
+&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')." ";
}
}
@@ -1371,17 +1434,18 @@ sub phasetwo {
$path.="/$parts[$count]";
if ((-e $path)!=1) {
print $logfile "\nCreating directory ".$path;
- $r->print('Created directory '.$parts[$count].'
');
+ $r->print(''.&mt('Created directory').' '.$parts[$count].'
');
mkdir($path,0777);
}
}
if (copy($source,$copyfile)) {
print $logfile "\nCopied original source to ".$copyfile."\n";
- $r->print('Copied source file
');
+ $r->print(''.&mt('Copied source file').'
');
} else {
print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
- return "Failed to copy source, $!, FAIL ";
+ return "".
+ &mt('Failed to copy source').", $!, ".&mt('FAIL')." ";
}
# --------------------------------------------------------------- Copy Metadata
@@ -1390,18 +1454,18 @@ sub phasetwo {
if (copy($source.'.meta',$copyfile)) {
print $logfile "\nCopied original metadata to ".$copyfile."\n";
- $r->print('Copied metadata
');
+ $r->print(''.&mt('Copied metadata').'
');
} else {
print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
return
- "Failed to write metadata copy, $!, FAIL ";
+ "".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')." ";
}
$r->rflush;
# --------------------------------------------------- Send update notifications
my @subscribed=&get_subscribed_hosts($target);
foreach my $subhost (@subscribed) {
- $r->print('Notifying host '.$subhost.':');$r->rflush;
+ $r->print('
'.&mt('Notifying host').' '.$subhost.':');$r->rflush;
print $logfile "\nNotifying host ".$subhost.':';
my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
$r->print($reply.'
');$r->rflush;
@@ -1412,7 +1476,8 @@ sub phasetwo {
my @subscribedmeta=&get_subscribed_hosts("$target.meta");
foreach my $subhost (@subscribedmeta) {
- $r->print('Notifying host for metadata only '.$subhost.':');$r->rflush;
+ $r->print('
'.
+&mt('Notifying host for metadata only').' '.$subhost.':');$r->rflush;
print $logfile "\nNotifying host for metadata only ".$subhost.':';
my $reply=&Apache::lonnet::critical('update:'.$target.'.meta',
$subhost);
@@ -1424,7 +1489,7 @@ sub phasetwo {
my %courses=&coursedependencies($target);
my $now=time;
foreach (keys %courses) {
- $r->print('
Notifying course '.$_.':');$r->rflush;
+ $r->print('
'.&mt('Notifying course').' '.$_.':');$r->rflush;
print $logfile "\nNotifying host ".$_.':';
my ($cdom,$cname)=split(/\_/,$_);
my $reply=&Apache::lonnet::cput
@@ -1457,6 +1522,8 @@ sub phasetwo {
sub batchpublish {
my ($r,$srcfile,$targetfile)=@_;
+ #publication pollutes %ENV with form.* values
+ my %oldENV=%ENV;
$srcfile=~s/\/+/\//g;
$targetfile=~s/\/+/\//g;
my $thisdisfn=$srcfile;
@@ -1492,6 +1559,7 @@ sub batchpublish {
&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);
$r->print('
');
}
+ %ENV=%oldENV;
return '';
}
@@ -1532,7 +1600,7 @@ sub publishdirectory {
$ruid,$rgid,$rrdev,$rsize,
$ratime,$rmtime,$rctime,
$rblksize,$rblocks)=stat($resdir.'/'.$filename);
- if ($rmtime<$cmtime) {
+ if (($rmtime<$cmtime) || ($ENV{'form.forcerepub'})) {
# previously published, modified now
$publishthis=1;
}
@@ -1594,7 +1662,7 @@ sub handler {
my $r=shift;
if ($r->header_only) {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK;
}
@@ -1687,7 +1755,7 @@ unless ($ENV{'form.phase'} eq 'two') {
# ---------------------------------------------------------- Start page output.
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
$r->print('LON-CAPA Publishing ');
@@ -1710,27 +1778,37 @@ unless ($ENV{'form.phase'} eq 'two') {
if ($fn=~/\/$/) {
# -------------------------------------------------------- This is a directory
&publishdirectory($r,$fn,$thisdisfn);
+ $r->print(''.&mt('Done').' '.&mt('Return to Directory').' ');
+
} else {
# ---------------------- Evaluate individual file, and then output information.
$thisfn=~/\.(\w+)$/;
my $thistype=$1;
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
+ $r->print(''.&mt('Publishing').' '.
+ &Apache::loncommon::filedescription($thistype).' ');
- $r->print('Publishing '.
- &Apache::loncommon::filedescription($thistype).' '.
- ''.$thisdisfn.
- ' Target: '.$thisdistarget.' ');
+ $r->print(<
+$thisdisfn
+ENDCAPTION
+ $r->print(
+ ' '.&mt('Target').': '.$thisdistarget.' ');
if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) {
- $r->print('Co-Author: '.$cuname.' at '.$cudom.
+ $r->print(''.&mt('Co-Author').': '.$cuname.&mt(' at ').$cudom.
' ');
}
if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {
- $r->print('Diffs with Current Version ');
+ $r->print(<
+
+ENDDIFF
+ $r->print(&mt('Diffs with Current Version').' ');
}
# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.
@@ -1755,5 +1833,7 @@ __END__
=back
+=back
+
=cut