version 1.246, 2008/08/19 10:43:59
|
version 1.259, 2009/05/26 16:08:00
|
Line 384 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 695 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 873 sub store_metadata {
|
Line 874 sub store_metadata {
|
} |
} |
if (defined($status) && $status ne '') { |
if (defined($status) && $status ne '') { |
$error='<span class="LC_error">' |
$error='<span class="LC_error">' |
.&mt('Error occured saving new values in metadata table in LON-CAPA database!') |
.&mt('Error occurred saving new values in metadata table in LON-CAPA database!') |
.'</span>'; |
.'</span>'; |
&Apache::lonnet::logthis($error); |
&Apache::lonnet::logthis($error); |
&Apache::lonnet::logthis($status); |
&Apache::lonnet::logthis($status); |
Line 947 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 1061 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 1165 sub publish {
|
Line 1166 sub publish {
|
} |
} |
} |
} |
if ($chparms) { |
if ($chparms) { |
$scrout.='<p><b>'.&mt('Obsolete parameters or saved values').':</b> '. |
$scrout.='<p><b>'.&mt('Obsolete parameters or saved values').':</b> ' |
$chparms.'</p><h1><span class="LC_warning">'.&mt('Warning!'). |
.$chparms.'</p>' |
'</span></h1><p><span class="LC_warning">'. |
.'<p class="LC_warning"><b>'.&mt('Warning!').'</b><br />' |
&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.') |
|
.'</p><hr />'; |
} |
} |
if ($metadatafields{'copyright'} eq 'priv') { |
if ($metadatafields{'copyright'} eq 'priv') { |
$scrout.='</p><h1><span class="LC_warning">'.&mt('Warning!'). |
$scrout.='<p class="LC_warning"><b>'.&mt('Warning!').'</b><br />' |
'</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.') |
&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 />'; |
.'</p><hr />'; |
} |
} |
|
|
# ------------------------------------------------------- Now have all metadata |
# ------------------------------------------------------- Now have all metadata |
Line 1260 END
|
Line 1262 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 />' |
.&Apache::loncommon::start_data_table() |
.&Apache::loncommon::start_data_table(); |
.&Apache::loncommon::start_data_table_row(); |
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))) { |
$colcount++; |
if ($colcount == 0) { |
$keywordout.='<td><label><input type="checkbox" name="keywords" value="'.$_.'"'; |
$keywordout .= &Apache::loncommon::start_data_table_row(); |
if ($metadatafields{'keywords'}) { |
} |
if ($metadatafields{'keywords'}=~/\Q$_\E/) { |
$colcount++; |
$keywordout.=' checked="on"'; |
$wordcount++; |
$env{'form.keywords'}.=$_.','; |
if (($wordcount == $numkeywords) && ($colcount < $cols_per_row)) { |
} |
my $colspan = 1+$cols_per_row-$colcount; |
} elsif (&Apache::loncommon::keyword($_)) { |
$keywordout .= '<td colspan="'.$colspan.'">'; |
$keywordout.=' checked="on"'; |
} else { |
$env{'form.keywords'}.=$_.','; |
$keywordout .= '<td>'; |
} |
} |
$keywordout.=' />'.$_.'</label></td>'; |
$keywordout.='<label><input type="checkbox" name="keywords" value="'.$word.'"'; |
if ($colcount>=10) { |
if ($metadatafields{'keywords'}) { |
$keywordout.=&Apache::loncommon::end_data_table_row() |
if ($metadatafields{'keywords'}=~/\Q$word\E/) { |
.&Apache::loncommon::start_data_table_row(); |
$keywordout.=' checked="checked"'; |
$colcount=0; |
$env{'form.keywords'}.=$word.','; |
} |
} |
} |
} elsif (&Apache::loncommon::keyword($word)) { |
# Proper end of started table row: |
$keywordout.=' checked="checked"'; |
if ($colcount != 0) { # has still to be improved: if amount of keywords mod 10 == 0, then do not start another table row |
$env{'form.keywords'}.=$word.','; |
while ($colcount<10) { |
} |
$keywordout.='<td> </td>'; |
$keywordout.=' />'.$word.'</label></td>'; |
$colcount++; |
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/\,$//; |
|
|
Line 1394 END
|
Line 1402 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', |
Line 1497 sub phasetwo {
|
Line 1505 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 1645 sub phasetwo {
|
Line 1653 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 1701 sub phasetwo {
|
Line 1709 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 1745 sub phasetwo {
|
Line 1757 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 1764 sub phasetwo {
|
Line 1779 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 1832 sub batchpublish {
|
Line 1845 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 1859 sub publishdirectory {
|
Line 1876 sub publishdirectory {
|
my $resdir= |
my $resdir= |
$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'. |
$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'. |
$thisdisfn; |
$thisdisfn; |
$r->print('<h1>'.&mt('Directory').' <tt>'.$thisdisfn.'</tt></h1>'. |
$r->print(&Apache::lonhtmlcommon::start_pick_box() |
&mt('Target').': <tt>'.$resdir.'</tt><br />'); |
.&Apache::lonhtmlcommon::row_title(&mt('Directory')) |
|
.'<span class="LC_filename">'.$thisdisfn.'</span>' |
|
.&Apache::lonhtmlcommon::row_closure() |
|
.&Apache::lonhtmlcommon::row_title(&mt('Target')) |
|
.'<span class="LC_filename">'.$resdir.'</span>' |
|
); |
|
|
my $dirptr=16384; # Mask indicating a directory in stat.cmode. |
my $dirptr=16384; # Mask indicating a directory in stat.cmode. |
unless ($env{'form.phase'} eq 'two') { |
unless ($env{'form.phase'} eq 'two') { |
# ask user what they want |
# ask user what they want |
|
$r->print(&Apache::lonhtmlcommon::row_closure() |
|
.&Apache::lonhtmlcommon::row_title(&mt('Options')) |
|
); |
$r->print('<form name="pubdirpref" method="post">'. |
$r->print('<form name="pubdirpref" method="post">'. |
&hiddenfield('phase','two'). |
&hiddenfield('phase','two'). |
&hiddenfield('filename',$env{'form.filename'}). |
&hiddenfield('filename',$env{'form.filename'}). |
&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>'); |
|
$r->print(&Apache::lonhtmlcommon::row_closure(1) |
|
.&Apache::lonhtmlcommon::end_pick_box() |
|
); |
$lock=0; |
$lock=0; |
} else { |
} else { |
|
$r->print(&Apache::lonhtmlcommon::row_closure(1) |
|
.&Apache::lonhtmlcommon::end_pick_box() |
|
); |
unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); } |
unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); } |
# actually publish things |
# actually publish things |
opendir(DIR,$fn); |
opendir(DIR,$fn); |
Line 1942 sub defaultmetapublish {
|
Line 1973 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 1954 sub defaultmetapublish {
|
Line 1985 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 1977 sub defaultmetapublish {
|
Line 2012 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 2128 sub handler {
|
Line 2163 sub handler {
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
|
|
|
# Breadcrumbs |
|
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
|
&Apache::lonhtmlcommon::add_breadcrumb({ |
|
'text' => 'Construction Space', |
|
'href' => '', # FIXME Add link to /priv/[user] |
|
}); |
|
&Apache::lonhtmlcommon::add_breadcrumb({ |
|
'text' => 'Resource Publication', |
|
'href' => '', |
|
}); |
|
|
my $js='<script type="text/javascript">'. |
my $js='<script type="text/javascript">'. |
&Apache::loncommon::browser_and_searcher_javascript(). |
&Apache::loncommon::browser_and_searcher_javascript(). |
'</script>'; |
'</script>'; |
$r->print(&Apache::loncommon::start_page('Resource Publication',$js)); |
$r->print(&Apache::loncommon::start_page('Resource Publication',$js) |
|
.&Apache::lonhtmlcommon::breadcrumbs() |
|
.&Apache::loncommon::head_subbox( |
|
&Apache::loncommon::CSTR_pageheader()) # FIXME crumbs broken? |
|
); |
|
|
|
|
my $thisfn=$fn; |
my $thisfn=$fn; |
Line 2162 sub handler {
|
Line 2212 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 2191 ENDCAPTION
|
Line 2245 ENDCAPTION
|
$r->print(&Apache::lonhtmlcommon::row_closure() |
$r->print(&Apache::lonhtmlcommon::row_closure() |
.&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) |
.&Apache::loncommon::plainname($cuname,$cudom) .' ('.$cuname.':'.$cudom.')' |
.'</span>' |
.'</span>' |
); |
); |
} |
} |