version 1.228, 2007/08/07 01:52:44
|
version 1.236, 2008/05/19 18:43:16
|
Line 143 my $cudom;
|
Line 143 my $cudom;
|
my $registered_cleanup; |
my $registered_cleanup; |
my $modified_urls; |
my $modified_urls; |
|
|
|
my $lock; |
|
|
=pod |
=pod |
|
|
=item B<metaeval> |
=item B<metaeval> |
Line 344 sub text_with_browse_field {
|
Line 346 sub text_with_browse_field {
|
return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:". |
return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:". |
"</b></font></p><br />". |
"</b></font></p><br />". |
'<input type="text" name="'.$name.'" size=80 value="'.$value.'" />'. |
'<input type="text" name="'.$name.'" size=80 value="'.$value.'" />'. |
'<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">Select</a> '. |
'<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">'.&mt('Select').'</a> '. |
'<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">Search</a>'; |
'<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">'.&mt('Search').'</a>'; |
|
|
} |
} |
|
|
Line 663 sub fix_ids_and_indices {
|
Line 665 sub fix_ids_and_indices {
|
"Max Index: $maxindex (min 10)\n"; |
"Max Index: $maxindex (min 10)\n"; |
} |
} |
my $outstring=''; |
my $outstring=''; |
|
my $responsecounter=1; |
my @parser; |
my @parser; |
$parser[0]=HTML::LCParser->new(\$content); |
$parser[0]=HTML::LCParser->new(\$content); |
$parser[-1]->xml_mode(1); |
$parser[-1]->xml_mode(1); |
Line 678 sub fix_ids_and_indices {
|
Line 681 sub fix_ids_and_indices {
|
next; |
next; |
} |
} |
if ($lctag eq 'base') { next; } |
if ($lctag eq 'base') { next; } |
|
if (($lctag eq 'part') || ($lctag eq 'problem')) { |
|
$responsecounter=0; |
|
} |
|
if ($lctag=~/response$/) { $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 773 sub fix_ids_and_indices {
|
Line 780 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' || $lctag eq 'script' |
if ($lctag eq 'm' || $lctag eq 'script' || $lctag eq 'answer' |
|| $lctag eq 'display' || $lctag eq 'tex') { |
|| $lctag eq 'display' || $lctag eq 'tex') { |
$outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser); |
$outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser); |
} |
} |
Line 782 sub fix_ids_and_indices {
|
Line 789 sub fix_ids_and_indices {
|
unless ($token->[1] eq 'allow') { |
unless ($token->[1] eq 'allow') { |
$outstring.='</'.$token->[1].'>'; |
$outstring.='</'.$token->[1].'>'; |
} |
} |
} |
} |
|
if ((($token->[1] eq 'part') || ($token->[1] eq 'problem')) |
|
&& (!$responsecounter)) { |
|
my $outstring='<span class="LC_error">'.&mt('Found [_1] without responses',$token->[1]).'</span>'; |
|
return ($outstring,1); |
|
} |
} else { |
} else { |
$outstring.=$token->[1]; |
$outstring.=$token->[1]; |
} |
} |
Line 964 sub publish {
|
Line 976 sub publish {
|
|
|
$scrout.='<h3>'.&mt('Dependencies').'</h3>'; |
$scrout.='<h3>'.&mt('Dependencies').'</h3>'; |
my $allowstr=''; |
my $allowstr=''; |
foreach (sort(keys(%allow))) { |
foreach my $thisdep (sort(keys(%allow))) { |
my $thisdep=$_; |
|
if ($thisdep !~ /[^\s]/) { next; } |
if ($thisdep !~ /[^\s]/) { next; } |
|
if ($thisdep =~/\$/) { |
|
$scrout.='<br /><span class="LC_warning">' |
|
.&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>') |
|
.'</span><br />'; |
|
} |
unless ($style eq 'rat') { |
unless ($style eq 'rat') { |
$allowstr.="\n".'<allow src="'.$thisdep.'" />'; |
$allowstr.="\n".'<allow src="'.$thisdep.'" />'; |
} |
} |
$scrout.='<br />'; |
$scrout.='<br />'; |
if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) { |
if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) { |
$scrout.='<a href="'.$thisdep.'">'; |
$scrout.='<a href="'.$thisdep.'">'; |
} |
} |
$scrout.='<tt>'.$thisdep.'</tt>'; |
$scrout.='<tt>'.$thisdep.'</tt>'; |
if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) { |
if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) { |
$scrout.='</a>'; |
$scrout.='</a>'; |
if ( |
if ( |
&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'. |
&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'. |
Line 1131 sub publish {
|
Line 1148 sub publish {
|
'</span></h1><p><span class="LC_warning">'. |
'</span></h1><p><span class="LC_warning">'. |
&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</span></p><hr />'; |
&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</span></p><hr />'; |
} |
} |
|
if ($metadatafields{'copyright'} eq 'priv') { |
|
$scrout.='</p><h1><span class="LC_warning">'.&mt('Warning!'). |
|
'</span></h1><p><span class="LC_warning">'. |
|
&mt('Copyright/distribution option "Private" is no longer supported. Select another option from below. Consider "Custom Rights" for maximum control over the usage of your resource.').'</span></p><hr />'; |
|
} |
|
|
# ------------------------------------------------------- Now have all metadata |
# ------------------------------------------------------- Now have all metadata |
|
|
Line 1290 END
|
Line 1312 END
|
$metadatafields{'copyright'}='default'; |
$metadatafields{'copyright'}='default'; |
$metadatafields{'sourceavail'}='open'; |
$metadatafields{'sourceavail'}='open'; |
} |
} |
|
if ($metadatafields{'copyright'} eq 'priv') { |
|
$metadatafields{'copyright'}='domain'; |
|
} |
# ------------------------------------------------ Dial in reasonable defaults |
# ------------------------------------------------ Dial in reasonable defaults |
my $defaultoption=$metadatafields{'copyright'}; |
my $defaultoption=$metadatafields{'copyright'}; |
unless ($defaultoption) { $defaultoption='default'; } |
unless ($defaultoption) { $defaultoption='default'; } |
Line 1306 END
|
Line 1331 END
|
$intr_scrout.=&selectbox('Copyright/Distribution','copyright', |
$intr_scrout.=&selectbox('Copyright/Distribution','copyright', |
$defaultoption, |
$defaultoption, |
\&Apache::loncommon::copyrightdescription, |
\&Apache::loncommon::copyrightdescription, |
(grep !/^public$/,(&Apache::loncommon::copyrightids))); |
(grep !/^(public|priv)$/,(&Apache::loncommon::copyrightids))); |
} else { |
} else { |
$intr_scrout.=&selectbox('Copyright/Distribution','copyright', |
$intr_scrout.=&selectbox('Copyright/Distribution','copyright', |
$defaultoption, |
$defaultoption, |
\&Apache::loncommon::copyrightdescription, |
\&Apache::loncommon::copyrightdescription, |
(&Apache::loncommon::copyrightids)); |
(grep !/^priv$/,(&Apache::loncommon::copyrightids))); |
} |
} |
my $copyright_help = |
my $copyright_help = |
Apache::loncommon::help_open_topic('Publishing_Copyright'); |
Apache::loncommon::help_open_topic('Publishing_Copyright'); |
Line 1731 sub notify {
|
Line 1756 sub notify {
|
print $logfile "\n============ Done ============\n"; |
print $logfile "\n============ Done ============\n"; |
$logfile->close(); |
$logfile->close(); |
} |
} |
|
if ($lock) { &Apache::lonnet::remove_lock($lock); } |
return OK; |
return OK; |
} |
} |
|
|
Line 1800 sub publishdirectory {
|
Line 1826 sub publishdirectory {
|
&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 catalog information over existing'). |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
|
$lock=0; |
} else { |
} else { |
|
unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); } |
# actually publish things |
# actually publish things |
opendir(DIR,$fn); |
opendir(DIR,$fn); |
my @files=sort(readdir(DIR)); |
my @files=sort(readdir(DIR)); |