--- loncom/publisher/lonpubdir.pm 2008/11/10 13:43:51 1.111
+++ loncom/publisher/lonpubdir.pm 2010/02/11 21:49:19 1.114.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Construction Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.111 2008/11/10 13:43:51 jms Exp $
+# $Id: lonpubdir.pm,v 1.114.2.1 2010/02/11 21:49:19 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -27,118 +27,6 @@
#
###
-=head1 NAME
-
-Apache::lonpubdir - Construction space directory lister
-
-=head1 SYNOPSIS
-
-Invoked (for various locations) by /etc/httpd/conf/srm.conf:
-
-
- PerlAccessHandler Apache::loncacc
- SetHandler perl-script
- PerlHandler Apache::lonpubdir
- ErrorDocument 403 /adm/login
- ErrorDocument 404 /adm/notfound.html
- ErrorDocument 406 /adm/unauthorized.html
- ErrorDocument 500 /adm/errorhandler
-
-
-
- PerlAccessHandler Apache::lonacc
- SetHandler perl-script
- PerlHandler Apache::lonpubdir
- ErrorDocument 403 /adm/login
- ErrorDocument 404 /adm/notfound.html
- ErrorDocument 406 /adm/unauthorized.html
- ErrorDocument 500 /adm/errorhandler
-
-
-=head1 INTRODUCTION
-
-This module publishes a directory of files.
-
-This is part of the LearningOnline Network with CAPA project
-described at http://www.lon-capa.org.
-
-=head1 HANDLER SUBROUTINE
-
-This routine is called by Apache and mod_perl.
-
-=over 4
-
-=item *
-
-read in information
-
-=item *
-
-start page output
-
-=item *
-
-run through list of files and attempt to publish unhidden files
-
-=back
-
-=head2 subroutines:
-
-=head3 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.
-
-=head3 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.
-
-=head3 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.
-
-=head3 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.
-
-=cut
-
package Apache::lonpubdir;
use strict;
@@ -174,7 +62,7 @@ sub handler {
&Apache::loncacc::constructaccess(
$fn,$r->dir_config('lonDefDomain'));
unless (($uname) && ($udom)) {
- $r->log_reason($uname.' at '.$udom.
+ $r->log_reason($uname.':'.$udom.
' trying to list directory '.$env{'form.filename'}.
' ('.$fn.') - not authorized',
$r->filename);
@@ -186,7 +74,7 @@ sub handler {
$fn=~s/\/$//;
unless ($fn) {
- $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
+ $r->log_reason($env{'user.name'}.':'.$env{'user.domain'}.
' trying to list empty directory', $r->filename);
return HTTP_NOT_FOUND;
}
@@ -268,7 +156,8 @@ sub getEffectiveUrl {
# Replace the ~username of the URL with /home/username/public_html
# so that we don't have to worry about ~ expansion internally.
#
- $fn=~s/^http\:\/\/[^\/]+\///;
+ $fn=~s/^https?\:\/\/[^\/]+\///;
+
$fn=~s/^\///;
$fn=~s{~($LONCAPA::username_re)}{/home/$1/public_html};
@@ -345,7 +234,7 @@ parent.lastknownpriv='/~$uname$esc_thisd
document.publishdir.filename.value = theform.filename.value;
document.publishdir.submit();
}
- if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') {
+ if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editmeta') {
top.location=theform.filename.value+'default.meta'
}
if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'printdir' ) {
@@ -375,7 +264,7 @@ parent.lastknownpriv='/~$uname$esc_thisd
if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") {
theform.submit();
}
- if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") {
+ if (theform.diraction.options[theform.diraction.selectedIndex].value == "editmeta") {
top.location=theform.filename.value+'default.meta'
}
if (theform.diraction.options[theform.diraction.selectedIndex].value == "printdir") {
@@ -442,7 +331,7 @@ ENDPUBDIRSCRIPT
if ((($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) &&
$env{'environment.remote'} ne 'off') {
- $r->print('
'.&mt('Co-Author').': '.$uname.' at '.$udom.
+ $r->print('
'.&mt('Co-Author [_1]',$uname.':'.$udom).'
');
'
');
}
}
@@ -460,7 +349,7 @@ sub dircontrols {
list => 'List Directory',
uplo => 'Upload file',
dele => 'Delete',
- edit => 'Edit Catalog Information',
+ edit => 'Edit Metadata',
sela => 'Select Action',
nfil => 'New file',
nhtm => 'New HTML file',
@@ -497,7 +386,7 @@ sub dircontrols {
@@ -561,7 +450,7 @@ sub pubbuttons {
'
'.
'
');
+&mt('Edit Directory Metadata').'" />');
}
sub resourceactions {
@@ -662,7 +551,7 @@ sub putdirectory {
''.
''.
''.
- ''.
+ ''.
''.
''.
''.
@@ -733,9 +622,17 @@ sub putresource {
$meta_same = 0;
}
$publish_button=&mt('Re-publish');
- my $rights_status =
- &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
- &mt(&getSourceRightString($targetdir.'/'.$filename));
+
+ my $rights_status =
+ &mt(&getCopyRightString($targetdir.'/'.$filename)).', ';
+
+ my %lt_SourceRight = &Apache::lonlocal::texthash(
+ 'open' => 'Source: open',
+ 'closed' => 'Source: closed',
+ );
+ $rights_status .=
+ $lt_SourceRight{&getSourceRightString($targetdir.'/'.$filename)};
+
$title = ''.
&getTitleString($targetdir.'/'.$filename).'';
@@ -898,3 +795,119 @@ sub CategorizeFiles {
__END__
+=head1 NAME
+
+Apache::lonpubdir - Construction space directory lister
+
+=head1 SYNOPSIS
+
+Invoked (for various locations) by /etc/httpd/conf/srm.conf:
+
+
+ PerlAccessHandler Apache::loncacc
+ SetHandler perl-script
+ PerlHandler Apache::lonpubdir
+ ErrorDocument 403 /adm/login
+ ErrorDocument 404 /adm/notfound.html
+ ErrorDocument 406 /adm/unauthorized.html
+ ErrorDocument 500 /adm/errorhandler
+
+
+
+ PerlAccessHandler Apache::lonacc
+ SetHandler perl-script
+ PerlHandler Apache::lonpubdir
+ ErrorDocument 403 /adm/login
+ ErrorDocument 404 /adm/notfound.html
+ ErrorDocument 406 /adm/unauthorized.html
+ ErrorDocument 500 /adm/errorhandler
+
+
+=head1 INTRODUCTION
+
+This module publishes a directory of files.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+This routine is called by Apache and mod_perl.
+
+=over 4
+
+=item *
+
+read in information
+
+=item *
+
+start page output
+
+=item *
+
+run through list of files and attempt to publish unhidden files
+
+=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
+