- | $lt{'acti'} |
- $lt{'updc'} |
- $lt{'crea'} |
+ $lt{'acti'} |
+ $lt{'updc'} |
+ $lt{'crea'} |
- |
+ |
|
-
+ |
|
-
+ |
|
@@ -513,15 +537,15 @@ sub putdirectory {
%Apache::lonpublisher::metadatafields=();
%Apache::lonpublisher::metadatakeys=();
my $construct=$here;
- $construct=~s:^/priv/(\w+)$:/home/$1/public_html:;
+ $construct=~s{^/priv/($LONCAPA::username_re)$}{/home/$1/public_html};
my $dirpath = $here;
- $dirpath=~s:^/priv/:/~:;
+ $dirpath=~s{^/priv/}{/~};
&Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
$construct.'/'.$dirname.'/default.meta'
));
my $actionitem = '';
if ($dirname eq '..') {
- $actionitem = 'Go to ...';
+ $actionitem = &mt('Go to ...');
} else {
$actionitem =
'';
$$numdir ++;
}
- $r->print(''.
+ $r->print('
'.
' | '.
''.$actionitem.' | '.
- ''.
- $disfilename.' | '.
- ''.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' '.
- $Apache::lonpublisher::metadatafields{'subject'}.' '.
- $Apache::lonpublisher::metadatafields{'keywords'}.' | '.
+ ''.
+ $disfilename.' | '.
+ ''.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
+ if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {
+ $r->print(' '.
+ $Apache::lonpublisher::metadatafields{'subject'}.
+ ' ');
+ }
+ $r->print($Apache::lonpublisher::metadatafields{'keywords'}.' | '.
''.&Apache::lonlocal::locallocaltime($modtime).' | '.
"
\n");
}
@@ -564,9 +592,10 @@ sub putresource {
&Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
my $pubstatus = 'unpublished';
my $status=&mt('Unpublished');
- my $bgcolor='#FFAA99';
+ my $css_class='LC_browser_file';
my $title=' ';
my $publish_button=&mt('Publish');
+ my $cstr_dir = '/home/'.$uname.'/public_html/'.$thisdisfn.'/';
# my $action_buttons=
# '
'.
@@ -581,47 +610,66 @@ sub putresource {
$same=1;
} else {
if (&Apache::londiff::are_different_files($resdir.'/'.$filename,
- '/home/'.$uname.'/public_html/'.$thisdisfn.'/'.$filename)) {
+ $cstr_dir.'/'.$filename)) {
$same=0;
} else {
$same=1;
}
}
+ my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9];
+ my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
+ my $meta_same = 1;
+ if ($meta_rmtime < $meta_cmtime
+ && &Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta',
+ $cstr_dir.'/'.$filename.'.meta')) {
+ $meta_same = 0;
+ }
$publish_button=&mt('Re-publish');
+ my $rights_status =
+ &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
+ &mt(&getSourceRightString($targetdir.'/'.$filename));
+ $title = ''.
+ &getTitleString($targetdir.'/'.$filename).'';
if ($same) {
- $pubstatus = 'published';
- $status=&mt('Published').'
'.
- &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
- &mt(&getSourceRightString($targetdir.'/'.$filename));
- $bgcolor='#CCFF88';
if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
$pubstatus = 'obsolete';
$status=&mt('Obsolete');
- $bgcolor='#AAAAAA';
- }
+ } else {
+ if (!$meta_same) {
+ $pubstatus = 'metamodified';
+ } else {
+ $pubstatus = 'published';
+ }
+ $status=&mt('Published').
+ '
'. $rights_status;
+ }
# } else {
# $action_buttons='';
# }
- $title=''.
- &getTitleString($targetdir.'/'.$filename).'';
} else {
$pubstatus = 'modified';
- $status=&mt('Modified').'
'.
- &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
- &mt(&getSourceRightString($targetdir.'/'.$filename));
- $bgcolor='#FFFF77';
+ $status=&mt('Modified').
+ '
'. $rights_status;
# $action_buttons='';
- $title=''.
- &getTitleString($targetdir.'/'.$filename).'';
if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
$status.='
'.&mt('Diffs').'';
}
- }
+ }
+
$title.="\n".'
'.
- ($$bombs{$targetdir.'/'.$filename}?'
':'Edit Metadata').'';
+ ($$bombs{$targetdir.'/'.$filename}?'':&mt('Edit Metadata')).'';
+
+ if (!$meta_same) {
+ $title = &mt('Metadata Modified').'
'.$title.
+ '
'.&mt('Metadata Diffs').'';
+ $title.="\n".'
'.&mt('Retrieve Metadata').'';
+ }
$status.="\n".'
'.&mt('Retrieve').'';
}
@@ -644,18 +692,20 @@ sub putresource {
}
my $pub_select = '';
&create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
- $r->print(''.
+ $r->print(&Apache::loncommon::start_data_table_row().
''.($filename=~/[\#\~]$/?' ':
'.') ').' | '.
''.$pub_select.' | '.
- ''.
+ ' | '.
''.
- $filename.''.$editlink2.$editlink.
+ $filename.''.$editlink2.$editlink.
' | '.
''.$title.' | '.
- ''.$status.' | '.
+ ' | '. # Display publication status
+ ''.$status.' | '.
''.&Apache::lonlocal::locallocaltime($cmtime).' | '.
- "
\n");
+ &Apache::loncommon::end_data_table_row()
+ );
return OK;
}
@@ -687,7 +737,9 @@ sub create_pubselect {
''.
'
';
+ &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" />
+ ';
$$numres ++;
}
@@ -739,6 +791,7 @@ sub CategorizeFiles {
1;
__END__
+
=head1 NAME
Apache::lonpubdir - Construction space directory lister
@@ -794,4 +847,64 @@ run through list of files and attempt to
=back
+=head1 SUBROUTINES:
+
+=over
+
+=item startpage($r, $uame, $udom, $thisdisfn)
+
+Output the header of the page. This includes:
+ - The HTML header
+ - The H1/H3 stuff which includes the directory.
+
+ startpage($r, $uame, $udom, $thisdisfn);
+ $r - The apache request object.
+ $uname - User name.
+ $udom - Domain name the user is logged in under.
+ $thisdisfn - Displayable version of the filename.
+
+=item getTitleString($fullname)
+
+ Get the title string or "[untitled]" if the file has no title metadata:
+ Without the latter substitution, it's impossible to examine metadata for
+ untitled resources. Resources may be legitimately untitled, to prevent
+ searches from locating them.
+
+ $str = getTitleString($fullname);
+ $fullname - Fully qualified filename to check.
+
+=item putdirectory(r, base, here, dirname, modtime)
+
+ Put out a directory table row:
+
+ putdirectory($r, $base, $here, $dirname, $modtime)
+ $r - Apache request object.
+ $reqfile - File in request.
+ $here - Where we are in directory tree.
+ $dirname - Name of directory special file.
+ $modtime - Encoded modification time.
+
+=item CategorizeFiles($location, $files)
+
+ Categorize files in the directory.
+ For each file in a list of files in a file directory,
+ the file categorized as one of:
+ - directory
+ - sequence
+ - problem
+ - Other resource.
+
+ For each file the modification date is determined as well.
+ Returned is a list of sublists:
+ (directories, sequences, problems, other)
+ each of the sublists contains entries of the following form (sorted by filename):
+ (filename, typecode, lastmodtime)
+
+ $list = CategorizeFiles($location, $files)
+ $location - Directory in which the files live (relative to our execution)
+ $files - list of files.
+
+=back
+
=cut
+