version 1.239, 2008/06/30 18:10:24
|
version 1.257, 2009/05/06 16:19:50
|
Line 118 use Apache::File;
|
Line 118 use Apache::File;
|
use File::Copy; |
use File::Copy; |
use Apache::Constants qw(:common :http :methods); |
use Apache::Constants qw(:common :http :methods); |
use HTML::LCParser; |
use HTML::LCParser; |
|
use HTML::Entities; |
|
use Encode::Encoder; |
use Apache::lonxml; |
use Apache::lonxml; |
use Apache::loncacc; |
use Apache::loncacc; |
use DBI; |
use DBI; |
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::loncommon(); |
use Apache::loncommon(); |
|
use Apache::lonhtmlcommon; |
use Apache::lonmysql; |
use Apache::lonmysql; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::loncfile; |
use Apache::loncfile; |
Line 263 sub metaread {
|
Line 266 sub metaread {
|
my ($logfile,$fn,$prefix)=@_; |
my ($logfile,$fn,$prefix)=@_; |
unless (-e $fn) { |
unless (-e $fn) { |
print($logfile 'No file '.$fn."\n"); |
print($logfile 'No file '.$fn."\n"); |
return '<br /><b>'.&mt('No file').':</b> <tt>'. |
return '<div><b>' |
&Apache::loncfile::display($fn).'</tt>'; |
.&mt('No file: [_1]' |
|
,'</b> <tt>'.&Apache::loncfile::display($fn).'</tt></div>'); |
} |
} |
print($logfile 'Processing '.$fn."\n"); |
print($logfile 'Processing '.$fn."\n"); |
my $metastring; |
my $metastring; |
Line 273 sub metaread {
|
Line 277 sub metaread {
|
$metastring=join('',<$metafh>); |
$metastring=join('',<$metafh>); |
} |
} |
&metaeval($metastring,$prefix); |
&metaeval($metastring,$prefix); |
return '<br /><b>'.&mt('Processed file').':</b> <tt>'. |
return '<div><b>' |
&Apache::loncfile::display($fn).'</tt><br />'; |
.&mt('Processed file: [_1]' |
|
,'</b> <tt>'.&Apache::loncfile::display($fn).'</tt></div>'); |
} |
} |
|
|
######################################### |
######################################### |
Line 325 string which presents the form field (fo
|
Line 330 string which presents the form field (fo
|
######################################### |
######################################### |
######################################### |
######################################### |
sub textfield { |
sub textfield { |
my ($title,$name,$value)=@_; |
my ($title,$name,$value,$noline)=@_; |
$value=~s/^\s+//gs; |
$value=~s/^\s+//gs; |
$value=~s/\s+$//gs; |
$value=~s/\s+$//gs; |
$value=~s/\s+/ /gs; |
$value=~s/\s+/ /gs; |
Line 333 sub textfield {
|
Line 338 sub textfield {
|
$env{'form.'.$name}=$value; |
$env{'form.'.$name}=$value; |
return "\n".&Apache::lonhtmlcommon::row_title($title) |
return "\n".&Apache::lonhtmlcommon::row_title($title) |
.'<input type="text" name="'.$name.'" size="80" value="'.$value.'" />' |
.'<input type="text" name="'.$name.'" size="80" value="'.$value.'" />' |
.&Apache::lonhtmlcommon::row_closure(); |
.&Apache::lonhtmlcommon::row_closure($noline); |
} |
} |
|
|
sub text_with_browse_field { |
sub text_with_browse_field { |
my ($title,$name,$value,$restriction)=@_; |
my ($title,$name,$value,$restriction,$noline)=@_; |
$value=~s/^\s+//gs; |
$value=~s/^\s+//gs; |
$value=~s/\s+$//gs; |
$value=~s/\s+$//gs; |
$value=~s/\s+/ /gs; |
$value=~s/\s+/ /gs; |
Line 352 sub text_with_browse_field {
|
Line 357 sub text_with_browse_field {
|
.'<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">' |
.'<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">' |
.&mt('Search') |
.&mt('Search') |
.'</a>' |
.'</a>' |
.&Apache::lonhtmlcommon::row_closure(); |
.&Apache::lonhtmlcommon::row_closure($noline); |
} |
} |
|
|
sub hiddenfield { |
sub hiddenfield { |
Line 379 sub selectbox {
|
Line 384 sub selectbox {
|
my $selout="\n".&Apache::lonhtmlcommon::row_title($title) |
my $selout="\n".&Apache::lonhtmlcommon::row_title($title) |
.'<select name="'.$name.'">'; |
.'<select name="'.$name.'">'; |
foreach (@idlist) { |
foreach (@idlist) { |
$selout.='<option value=\''.$_.'\''; |
$selout.='<option value="'.$_.'"'; |
if ($_ eq $value) { |
if ($_ eq $value) { |
$selout.=' selected>'.&{$functionref}($_).'</option>'; |
$selout.=' selected="selected"'; |
} |
} |
else {$selout.='>'.&{$functionref}($_).'</option>';} |
$selout.='>'.&{$functionref}($_).'</option>'; |
} |
} |
$selout.='</select>'.&Apache::lonhtmlcommon::row_closure(); |
$selout.='</select>'.&Apache::lonhtmlcommon::row_closure(); |
return $selout; |
return $selout; |
Line 690 sub fix_ids_and_indices {
|
Line 695 sub fix_ids_and_indices {
|
$responsecounter=0; |
$responsecounter=0; |
} |
} |
if ($lctag=~/response$/) { $responsecounter++; } |
if ($lctag=~/response$/) { $responsecounter++; } |
|
if ($lctag eq 'import') { $responsecounter++; } |
my %parms=%{$token->[2]}; |
my %parms=%{$token->[2]}; |
$counter=$addid{$tag}; |
$counter=$addid{$tag}; |
if (!$counter) { $counter=$addid{$lctag}; } |
if (!$counter) { $counter=$addid{$lctag}; } |
Line 842 sub store_metadata {
|
Line 848 sub store_metadata {
|
# Determine if the table exists |
# Determine if the table exists |
my $status = &Apache::lonmysql::check_table('metadata'); |
my $status = &Apache::lonmysql::check_table('metadata'); |
if (! defined($status)) { |
if (! defined($status)) { |
$error='<span class="LC_error">WARNING: Cannot connect to '. |
$error='<span class="LC_error">' |
'database!</span>'; |
.&mt('WARNING: Cannot connect to database!') |
|
.'</span>'; |
&Apache::lonnet::logthis($error); |
&Apache::lonnet::logthis($error); |
return ($error,undef); |
return ($error,undef); |
} |
} |
if ($status == 0) { |
if ($status == 0) { |
# It would be nice to actually create the table.... |
# It would be nice to actually create the table.... |
$error ='<span class="LC_error">WARNING: The metadata table does not '. |
$error ='<span class="LC_error">' |
'exist in the LON-CAPA database.</span>'; |
.&mt('WARNING: The metadata table does not exist in the LON-CAPA database!') |
|
.'</span>'; |
&Apache::lonnet::logthis($error); |
&Apache::lonnet::logthis($error); |
return ($error,undef); |
return ($error,undef); |
} |
} |
Line 865 sub store_metadata {
|
Line 873 sub store_metadata {
|
\%metadata); |
\%metadata); |
} |
} |
if (defined($status) && $status ne '') { |
if (defined($status) && $status ne '') { |
$error='<span class="LC_error">Error occured saving new values in '. |
$error='<span class="LC_error">' |
'metadata table in LON-CAPA database</span>'; |
.&mt('Error occurred saving new values in metadata table in LON-CAPA database!') |
|
.'</span>'; |
&Apache::lonnet::logthis($error); |
&Apache::lonnet::logthis($error); |
&Apache::lonnet::logthis($status); |
&Apache::lonnet::logthis($status); |
return ($error,undef); |
return ($error,undef); |
Line 886 sub checkonthis {
|
Line 895 sub checkonthis {
|
'return_only_error_and_warning_counts' => 1)); |
'return_only_error_and_warning_counts' => 1)); |
my ($errorcount,$warningcount)=split(':',$result); |
my ($errorcount,$warningcount)=split(':',$result); |
if (($errorcount) || ($warningcount)) { |
if (($errorcount) || ($warningcount)) { |
$r->print('<br /><tt>'.$uri.'</tt>: '); |
$r->print('<h3>'.&mt('Warnings and Errors').'</h3>'); |
if ($errorcount) { |
$r->print('<tt>'.$uri.'</tt>:'); |
$r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error"><b>'. |
$r->print('<ul>'); |
$errorcount.' '. |
if ($warningcount) { |
&mt('error(s)').'</b></span> '); |
$r->print('<li><div class="LC_warning">' |
} |
.&mt('[quant,_1,warning]',$warningcount) |
if ($warningcount) { |
.'</div></li>'); |
$r->print('<font color="blue">'. |
} |
$warningcount.' '. |
if ($errorcount) { |
&mt('warning(s)').'</font>'); |
$r->print('<li><div class="LC_error">' |
} |
.&mt('[quant,_1,error]',$errorcount) |
|
.' <img src="/adm/lonMisc/bomb.gif" />' |
|
.'</div></li>'); |
|
} |
|
$r->print('</ul>'); |
} else { |
} else { |
#$r->print('<font color="green">'.&mt('ok').'</font>'); |
#$r->print('<font color="green">'.&mt('ok').'</font>'); |
} |
} |
Line 935 backup copies, performs any automatic pr
|
Line 948 backup copies, performs any automatic pr
|
especially for rat and ssi files), |
especially for rat and ssi files), |
|
|
Returns a 2 element array, the first is the string to be shown to the |
Returns a 2 element array, the first is the string to be shown to the |
user, the second is an error code, either 1 (an error occured) or 0 |
user, the second is an error code, either 1 (an error occurred) or 0 |
(no error occurred) |
(no error occurred) |
|
|
I<Additional documentation needed.> |
I<Additional documentation needed.> |
Line 978 sub publish {
|
Line 991 sub publish {
|
if ($error) { return ($outstring,$error); } |
if ($error) { return ($outstring,$error); } |
# ------------------------------------------------------------ Construct Allows |
# ------------------------------------------------------------ Construct Allows |
|
|
$scrout.='<h3>'.&mt('Dependencies').'</h3>'; |
my $outdep=''; # Collect dependencies output data |
my $allowstr=''; |
my $allowstr=''; |
foreach my $thisdep (sort(keys(%allow))) { |
foreach my $thisdep (sort(keys(%allow))) { |
if ($thisdep !~ /[^\s]/) { next; } |
if ($thisdep !~ /[^\s]/) { next; } |
if ($thisdep =~/\$/) { |
if ($thisdep =~/\$/) { |
$scrout.='<br /><span class="LC_warning">' |
$outdep.='<div class="LC_warning">' |
.&mt('The resource depends on another resource with variable filename, i.e., [_1].','<tt>'.$thisdep.'</tt>').'<br />' |
.&mt('The resource depends on another resource with variable filename, i.e., [_1].','<tt>'.$thisdep.'</tt>').'<br />' |
.&mt('You likely need to explicitly allow access to all possible dependencies using the [_1]-tag.','<tt><allow></tt>') |
.&mt('You likely need to explicitly allow access to all possible dependencies using the [_1]-tag.','<tt><allow></tt>') |
.'</span><br />'; |
."</div>\n"; |
} |
} |
unless ($style eq 'rat') { |
unless ($style eq 'rat') { |
$allowstr.="\n".'<allow src="'.$thisdep.'" />'; |
$allowstr.="\n".'<allow src="'.$thisdep.'" />'; |
} |
} |
$scrout.='<br />'; |
$outdep.='<div>'; |
if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) { |
if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) { |
$scrout.='<a href="'.$thisdep.'">'; |
$outdep.='<a href="'.$thisdep.'">'; |
} |
} |
$scrout.='<tt>'.$thisdep.'</tt>'; |
$outdep.='<tt>'.$thisdep.'</tt>'; |
if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) { |
if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) { |
$scrout.='</a>'; |
$outdep.='</a>'; |
if ( |
if ( |
&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'. |
&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'. |
$thisdep.'.meta') eq '-1') { |
$thisdep.'.meta') eq '-1') { |
$scrout.= ' - <span class="LC_error">'.&mt('Currently not available'). |
$outdep.= ' - <span class="LC_error">'.&mt('Currently not available'). |
'</span>'; |
'</span>'; |
} else { |
} else { |
my %temphash=(&Apache::lonnet::declutter($target).'___'. |
my %temphash=(&Apache::lonnet::declutter($target).'___'. |
Line 1014 sub publish {
|
Line 1027 sub publish {
|
} |
} |
} |
} |
} |
} |
|
$outdep.='</div><br />'; |
|
} |
|
|
|
if ($outdep) { |
|
$scrout.='<h3>'.&mt('Dependencies').'</h3>' |
|
.$outdep |
} |
} |
$outstring=~s/\n*(\<\/[^\>]+\>[^<]*)$/$allowstr\n$1\n/s; |
$outstring=~s/\n*(\<\/[^\>]+\>[^<]*)$/$allowstr\n$1\n/s; |
|
|
Line 1043 sub publish {
|
Line 1062 sub publish {
|
my %oldparmstores=(); |
my %oldparmstores=(); |
|
|
unless ($batch) { |
unless ($batch) { |
$scrout.='<h3>'.&mt('Metadata Information').' ' . |
$scrout.='<h3>'.&mt('Metadata').' ' . |
&Apache::loncommon::help_open_topic("Metadata_Description") |
&Apache::loncommon::help_open_topic("Metadata_Description") |
. '</h3>'; |
. '</h3>'; |
} |
} |
Line 1167 sub publish {
|
Line 1186 sub publish {
|
$textonly=~s/\<script[^\<]+\<\/script\>//g; |
$textonly=~s/\<script[^\<]+\<\/script\>//g; |
$textonly=~s/\<m\>[^\<]+\<\/m\>//g; |
$textonly=~s/\<m\>[^\<]+\<\/m\>//g; |
$textonly=~s/\<[^\>]*\>//g; |
$textonly=~s/\<[^\>]*\>//g; |
$textonly=~tr/A-Z/a-z/; |
|
$textonly=~s/[\$\&][a-z]\w*//g; |
|
$textonly=~s/[^a-z\s]//g; |
|
|
|
foreach ($textonly=~m/(\w+)/g) { |
|
unless ($nokey{$_}) { |
|
$keywords{$_}=1; |
|
} |
|
} |
|
} |
|
|
|
|
#this is a work simplification for german authors for present |
|
$textonly=HTML::Entities::decode($textonly); #decode HTML-character |
|
$textonly=Encode::Encoder::encode('utf8', $textonly); #encode to perl internal unicode |
|
$textonly=~tr/A-ZÜÄÖ/a-züäö/; #add lowercase rule for german "Umlaute" |
|
$textonly=~s/[\$\&][a-z]\w*//g; |
|
$textonly=~s/[^a-z^ü^ä^ö^ß\s]//g; #dont delete german "Umlaute" |
|
|
|
foreach ($textonly=~m/[^\s]+/g) { #match all but whitespaces |
|
unless ($nokey{$_}) { |
|
$keywords{$_}=1; |
|
} |
|
} |
|
|
|
|
|
} |
|
|
foreach my $addkey (split(/[\"\'\,\;]/,$metadatafields{'keywords'})) { |
foreach my $addkey (split(/[\"\'\,\;]/,$metadatafields{'keywords'})) { |
$addkey=~s/\s+/ /g; |
$addkey=~s/\s+/ /g; |
Line 1198 sub publish {
|
Line 1222 sub publish {
|
my $intr_scrout.='<br />' |
my $intr_scrout.='<br />' |
.'<form name="pubform" action="/adm/publish" method="post">'; |
.'<form name="pubform" action="/adm/publish" method="post">'; |
unless ($env{'form.makeobsolete'}) { |
unless ($env{'form.makeobsolete'}) { |
$intr_scrout.='<p>' |
$intr_scrout.='<p class="LC_warning">' |
.&mt('Searching for your resource will be based on the following metadata. Please provide as much data as possible.') |
.&mt('Searching for your resource will be based on the following metadata. Please provide as much data as possible.') |
.'</p>' |
.'</p>' |
.'<p><input type="submit" value="' |
.'<p><input type="submit" value="' |
Line 1237 END
|
Line 1261 END
|
.'<input type="button" value="'.&mt('check all').'" onclick="javascript:checkAll(document.pubform.keywords)" />' |
.'<input type="button" value="'.&mt('check all').'" onclick="javascript:checkAll(document.pubform.keywords)" />' |
.'<input type="button" value="'.&mt('uncheck all').'" onclick="javascript:uncheckAll(document.pubform.keywords)" />' |
.'<input type="button" value="'.&mt('uncheck all').'" onclick="javascript:uncheckAll(document.pubform.keywords)" />' |
.'</p><br />' |
.'</p><br />' |
.'<table border="2"><tr>'; |
.&Apache::loncommon::start_data_table(); |
|
my $cols_per_row = 10; |
my $colcount=0; |
my $colcount=0; |
|
my $wordcount=0; |
|
my $numkeywords = scalar(keys(%keywords)); |
|
|
foreach (sort keys %keywords) { |
foreach my $word (sort(keys(%keywords))) { |
$keywordout.='<td><label><input type="checkbox" name="keywords" value="'.$_.'"'; |
if ($colcount == 0) { |
if ($metadatafields{'keywords'}) { |
$keywordout .= &Apache::loncommon::start_data_table_row(); |
if ($metadatafields{'keywords'}=~/\Q$_\E/) { |
} |
$keywordout.=' checked="on"'; |
$colcount++; |
$env{'form.keywords'}.=$_.','; |
$wordcount++; |
} |
if (($wordcount == $numkeywords) && ($colcount < $cols_per_row)) { |
} elsif (&Apache::loncommon::keyword($_)) { |
my $colspan = 1+$cols_per_row-$colcount; |
$keywordout.=' checked="on"'; |
$keywordout .= '<td colspan="'.$colspan.'">'; |
$env{'form.keywords'}.=$_.','; |
} else { |
} |
$keywordout .= '<td>'; |
$keywordout.=' />'.$_.'</label></td>'; |
} |
if ($colcount>10) { |
$keywordout.='<label><input type="checkbox" name="keywords" value="'.$word.'"'; |
$keywordout.="</tr><tr>\n"; |
if ($metadatafields{'keywords'}) { |
$colcount=0; |
if ($metadatafields{'keywords'}=~/\Q$word\E/) { |
} |
$keywordout.=' checked="checked"'; |
$colcount++; |
$env{'form.keywords'}.=$word.','; |
|
} |
|
} elsif (&Apache::loncommon::keyword($word)) { |
|
$keywordout.=' checked="checked"'; |
|
$env{'form.keywords'}.=$word.','; |
|
} |
|
$keywordout.=' />'.$word.'</label></td>'; |
|
if ($colcount == $cols_per_row) { |
|
$keywordout.=&Apache::loncommon::end_data_table_row(); |
|
$colcount=0; |
|
} |
|
} |
|
if ($colcount > 0) { |
|
$keywordout .= &Apache::loncommon::end_data_table_row(); |
} |
} |
|
|
$env{'form.keywords'}=~s/\,$//; |
$env{'form.keywords'}=~s/\,$//; |
|
|
$keywordout.='</tr></table>' |
$keywordout.=&Apache::loncommon::end_data_table_row() |
|
.&Apache::loncommon::end_data_table() |
.&Apache::lonhtmlcommon::row_closure(); |
.&Apache::lonhtmlcommon::row_closure(); |
|
|
$intr_scrout.=$keywordout; |
$intr_scrout.=$keywordout; |
Line 1309 END
|
Line 1351 END
|
|
|
$intr_scrout.=&hiddenfield('lastrevisiondate',time); |
$intr_scrout.=&hiddenfield('lastrevisiondate',time); |
|
|
|
my $pubowner_last; |
|
if ($style eq 'prv') { |
|
$pubowner_last = 1; |
|
} |
$intr_scrout.=&textfield('Publisher/Owner','owner', |
$intr_scrout.=&textfield('Publisher/Owner','owner', |
$metadatafields{'owner'}); |
$metadatafields{'owner'},$pubowner_last); |
|
|
# ---------------------------------------------- Retrofix for unused copyright |
# ---------------------------------------------- Retrofix for unused copyright |
if ($metadatafields{'copyright'} eq 'free') { |
if ($metadatafields{'copyright'} eq 'free') { |
Line 1356 END
|
Line 1401 END
|
(&Apache::loncommon::source_copyrightids)); |
(&Apache::loncommon::source_copyrightids)); |
# $intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights'); |
# $intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights'); |
my $uctitle=&mt('Obsolete'); |
my $uctitle=&mt('Obsolete'); |
my $obsolete_checked=($metadatafields{'obsolete'})?' checked="1" ':''; |
my $obsolete_checked=($metadatafields{'obsolete'})?' checked="checked"':''; |
$intr_scrout.="\n".&Apache::lonhtmlcommon::row_title($uctitle) |
$intr_scrout.="\n".&Apache::lonhtmlcommon::row_title($uctitle) |
.'<input type="checkbox" name="obsolete" '.$obsolete_checked.'/ >' |
.'<input type="checkbox" name="obsolete"'.$obsolete_checked.' />' |
.&Apache::lonhtmlcommon::row_closure(1); |
.&Apache::lonhtmlcommon::row_closure(1); |
$intr_scrout.=&text_with_browse_field('Suggested Replacement for Obsolete File', |
$intr_scrout.=&text_with_browse_field('Suggested Replacement for Obsolete File', |
'obsoletereplacement', |
'obsoletereplacement', |
$metadatafields{'obsoletereplacement'}); |
$metadatafields{'obsoletereplacement'},'',1); |
} else { |
} else { |
$intr_scrout.=&hiddenfield('copyright','private'); |
$intr_scrout.=&hiddenfield('copyright','private'); |
} |
} |
Line 1388 END
|
Line 1433 END
|
&hiddenfield('obsolete',1). |
&hiddenfield('obsolete',1). |
&text_with_browse_field('Suggested Replacement for Obsolete File', |
&text_with_browse_field('Suggested Replacement for Obsolete File', |
'obsoletereplacement', |
'obsoletereplacement', |
$metadatafields{'obsoletereplacement'}); |
$metadatafields{'obsoletereplacement'},'',1); |
} |
} |
if (!$batch) { |
if (!$batch) { |
$scrout.=$intr_scrout |
$scrout.=$intr_scrout |
Line 1459 sub phasetwo {
|
Line 1504 sub phasetwo {
|
return 0; |
return 0; |
} |
} |
if ($target=~/\.(\d+)\.(\w+)$/) { |
if ($target=~/\.(\d+)\.(\w+)$/) { |
$r->print('<span class="LC_error">'.&mt('Cannot publish versioned resource, FAIL').'</span>'); |
$r->print('<span class="LC_error">'.&mt('Filename of resource contains internal version number. Cannot publish such resources, FAIL').'</span>'); |
return 0; |
return 0; |
} |
} |
} |
} |
Line 1607 sub phasetwo {
|
Line 1652 sub phasetwo {
|
unlink($srcd.'/'.$filename); |
unlink($srcd.'/'.$filename); |
unlink($srcd.'/'.$filename.'.meta'); |
unlink($srcd.'/'.$filename.'.meta'); |
} else { |
} else { |
if ($filename=~/\Q$srcf\E\.(\d+)\.\Q$srct\E$/) { |
if ($filename=~/^\Q$srcf\E\.(\d+)\.\Q$srct\E$/) { |
$maxversion=($1>$maxversion)?$1:$maxversion; |
$maxversion=($1>$maxversion)?$1:$maxversion; |
} |
} |
} |
} |
} |
} |
closedir(DIR); |
closedir(DIR); |
$maxversion++; |
$maxversion++; |
$r->print('<p>Creating old version '.$maxversion.'</p>'); |
$r->print('<p>'.&mt('Creating old version [_1]',$maxversion).'</p>'); |
print $logfile "\nCreating old version ".$maxversion."\n"; |
print $logfile "\nCreating old version ".$maxversion."\n"; |
|
|
my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct; |
my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct; |
Line 1663 sub phasetwo {
|
Line 1708 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>'.&mt('Created directory').' '.$parts[$count].'</p>'); |
|
mkdir($path,0777); |
mkdir($path,0777); |
|
$r->print('<p>' |
|
.&mt('Created directory [_1]' |
|
,'<span class="LC_filename">'.$parts[$count].'</span>') |
|
.'</p>' |
|
); |
} |
} |
} |
} |
|
|
Line 1707 sub phasetwo {
|
Line 1756 sub phasetwo {
|
&Apache::lonnet::devalidate_cache_new('meta', |
&Apache::lonnet::devalidate_cache_new('meta', |
&Apache::lonnet::declutter($thisdistarget)); |
&Apache::lonnet::declutter($thisdistarget)); |
|
|
|
# ------------------------------------------------------------- Everything done |
|
$logfile->close(); |
|
$r->print('<p class="LC_success">'.&mt('Done').'</p>'); |
|
|
# ------------------------------------------------ Provide link to new resource |
# ------------------------------------------------ Provide link to new resource |
unless ($batch) { |
unless ($batch) { |
|
|
my $thissrc=$source; |
my $thissrc=$source; |
$thissrc=~s{^/home/($match_username)/public_html}{/priv/$1}; |
$thissrc=~s{^/home/($match_username)/public_html}{/priv/$1}; |
|
|
Line 1726 sub phasetwo {
|
Line 1778 sub phasetwo {
|
'"><font size="+2">'. |
'"><font size="+2">'. |
&mt('Back to Source Directory').'</font></a></p>'); |
&mt('Back to Source Directory').'</font></a></p>'); |
} |
} |
$logfile->close(); |
|
$r->print('<p><font color="green">'.&mt('Done').'</font></p>'); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 1794 sub batchpublish {
|
Line 1844 sub batchpublish {
|
|
|
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
|
|
$r->print('<h2>'.&mt('Publishing').' <tt>'.$thisdisfn.'</tt></h2>'); |
$r->print('<h2>' |
|
.&mt('Publishing [_1]' |
|
,'<span class="LC_filename">'.$thisdisfn.'</span>') |
|
.'</h2>' |
|
); |
|
|
# phase one takes |
# phase one takes |
# my ($source,$target,$style,$batch)=@_; |
# my ($source,$target,$style,$batch)=@_; |
Line 1833 sub publishdirectory {
|
Line 1887 sub publishdirectory {
|
&checkbox('pubrec','include subdirectories'). |
&checkbox('pubrec','include subdirectories'). |
&checkbox('forcerepub','force republication of previously published files'). |
&checkbox('forcerepub','force republication of previously published files'). |
&checkbox('obsolete','make file(s) obsolete'). |
&checkbox('obsolete','make file(s) obsolete'). |
&checkbox('forceoverride','force directory level catalog information over existing'). |
&checkbox('forceoverride','force directory level metadata over existing'). |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
$lock=0; |
$lock=0; |
} else { |
} else { |
Line 1904 sub defaultmetapublish {
|
Line 1958 sub defaultmetapublish {
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
|
|
$r->print(&Apache::loncommon::start_page('Catalog Information Publication')); |
$r->print(&Apache::loncommon::start_page('Metadata Publication')); |
|
|
# ---------------------------------------------------------------- Write Source |
# ---------------------------------------------------------------- Write Source |
my $copyfile=$target; |
my $copyfile=$target; |
Line 1916 sub defaultmetapublish {
|
Line 1970 sub defaultmetapublish {
|
for ($count=5;$count<$#parts;$count++) { |
for ($count=5;$count<$#parts;$count++) { |
$path.="/$parts[$count]"; |
$path.="/$parts[$count]"; |
if ((-e $path)!=1) { |
if ((-e $path)!=1) { |
$r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>'); |
|
mkdir($path,0777); |
mkdir($path,0777); |
|
$r->print('<p>' |
|
.&mt('Created directory [_1]' |
|
,'<span class="LC_filename">'.$parts[$count].'</span>') |
|
.'</p>' |
|
); |
} |
} |
} |
} |
|
|
Line 1939 sub defaultmetapublish {
|
Line 1997 sub defaultmetapublish {
|
# ------------------------------------------------------------------- Link back |
# ------------------------------------------------------------------- Link back |
my $link=$fn; |
my $link=$fn; |
$link=~s/^\/home\/$cuname\/public_html\//\/priv\/$cuname\//; |
$link=~s/^\/home\/$cuname\/public_html\//\/priv\/$cuname\//; |
$r->print("<a href='$link'>".&mt('Back to Catalog Information').'</a>'); |
$r->print("<a href='$link'>".&mt('Back to Metadata').'</a>'); |
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
return OK; |
return OK; |
} |
} |
Line 2124 sub handler {
|
Line 2182 sub handler {
|
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
if ($thistype eq 'page') { $thisembstyle = 'rat'; } |
if ($thistype eq 'page') { $thisembstyle = 'rat'; } |
|
|
$r->print('<h2>'.&mt('Publishing [_1]','<tt>'.$thisdisfn.'</tt>').'</h2>'); |
$r->print('<h2>' |
|
.&mt('Publishing [_1]' |
|
,'<span class="LC_filename">'.$thisdisfn.'</span>') |
|
.'</h2>' |
|
); |
|
|
$r->print('<h3>'.&mt('Resource Details').'</h3>'); |
$r->print('<h3>'.&mt('Resource Details').'</h3>'); |
|
|
Line 2148 ENDCAPTION
|
Line 2210 ENDCAPTION
|
|
|
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Target')) |
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Target')) |
.'<tt>'.$thisdistarget.'</tt>' |
.'<tt>'.$thisdistarget.'</tt>' |
.&Apache::lonhtmlcommon::row_closure() |
|
); |
); |
|
|
# SB - ToDo: |
|
if (($cuname ne $env{'user.name'})||($cudom ne $env{'user.domain'})) { |
if (($cuname ne $env{'user.name'})||($cudom ne $env{'user.domain'})) { |
# $r->print(&Apache::lonhtmlcommon::row_title('<span class="LC_warning">'.&mt('Co-Author').'</span>') |
$r->print(&Apache::lonhtmlcommon::row_closure() |
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Co-Author')) |
.&Apache::lonhtmlcommon::row_title(&mt('Co-Author')) |
.'<span class="LC_warning">' |
.'<span class="LC_warning">' |
.&mt('[_1] at [_2]',$cuname,$cudom) |
.&mt('[_1] at [_2]',$cuname,$cudom) |
.'</span>' |
.'</span>' |
.&Apache::lonhtmlcommon::row_closure() |
|
); |
); |
} |
} |
|
|
if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') { |
if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') { |
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Diffs'))); |
$r->print(&Apache::lonhtmlcommon::row_closure() |
|
.&Apache::lonhtmlcommon::row_title(&mt('Diffs'))); |
$r->print(<<ENDDIFF); |
$r->print(<<ENDDIFF); |
<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"))'> |
<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 |
ENDDIFF |
$r->print(&mt('Diffs with Current Version').'</a>' |
$r->print(&mt('Diffs with Current Version').'</a>'); |
.&Apache::lonhtmlcommon::row_closure() |
|
); |
|
|
|
} |
} |
|
|
$r->print(&Apache::lonhtmlcommon::end_pick_box()); |
$r->print(&Apache::lonhtmlcommon::row_closure(1) |
|
.&Apache::lonhtmlcommon::end_pick_box() |
|
); |
|
|
# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle. |
# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle. |
|
|
Line 2186 ENDDIFF
|
Line 2244 ENDDIFF
|
unless ($errorcount) { |
unless ($errorcount) { |
my ($outstring,$error)= |
my ($outstring,$error)= |
&publish($thisfn,$thistarget,$thisembstyle); |
&publish($thisfn,$thistarget,$thisembstyle); |
$r->print('<hr />'.$outstring); |
$r->print($outstring); |
} else { |
} else { |
$r->print('<h3 class="LC_error">'. |
$r->print('<h3 class="LC_error">'. |
&mt('The document contains errors and cannot be published.'). |
&mt('The document contains errors and cannot be published.'). |