--- loncom/publisher/lonpubdir.pm	2001/08/18 22:01:00	1.12
+++ loncom/publisher/lonpubdir.pm	2001/12/28 22:14:10	1.19
@@ -1,16 +1,45 @@
 # The LearningOnline Network with CAPA
-#
 # (Publication Handler
+#
+# $Id: lonpubdir.pm,v 1.19 2001/12/28 22:14:10 www Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 
 # (TeX Content Handler
 #
+# YEAR=2000
 # 05/29/00,05/30,10/11 Gerd Kortemeyer)
 #
 # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
+# YEAR=2001
 # 03/23 Guy Albertelli
 # 03/24,03/29 Gerd Kortemeyer)
+# 03/31,04/03,05/09,06/23,08/18,08/20 Gerd Kortemeyer
+# 12/15 Scott Harrison
+# 12/28 Gerd Kortemeyer
 #
-# 03/31,04/03,05/09,06/23,08/18 Gerd Kortemeyer
+###
 
 package Apache::lonpubdir;
 
@@ -19,8 +48,7 @@ use Apache::File;
 use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
-use Apache::lonnet;
-
+use Apache::loncommon();
 
 sub handler {
 
@@ -83,10 +111,12 @@ sub handler {
   my $docroot=$r->dir_config('lonDocRoot');
 
   my $resdir=$docroot.'/res/'.$udom.'/'.$uname.$thisdisfn;
+  my $targetdir=$udom.'/'.$uname.$thisdisfn;
   my $linkdir='/~'.$uname.$thisdisfn;
 
   $r->print('<table border=2>'.
- '<tr><th>Filename</th><th>Modified</th><th>Status</th><th>&nbsp;</th></tr>');
+ '<tr><th>Filename</th><th>Metadata</th><th>Modified</th>'.
+ '<th>Status</th><th>&nbsp;</th></tr>');
 
   my $filename;
   my $dirptr=16384;
@@ -101,10 +131,23 @@ sub handler {
 
      my $extension='';
      if ($filename=~/\.(\w+)$/) { $extension=$1; }
-     if (($extension ne 'meta') && 
-         (&Apache::lonnet::fileembstyle($extension))) {
+     if ($cmode&$dirptr) {
+         my $disfilename=$filename;
+         if ($filename eq '..') {
+	     $disfilename='<i>Parent Directory</i>';
+         }
+         unless ((($filename eq '..') && ($thisdisfn eq '')) ||
+                 ($filename eq '.')) {
+           $r->print('<tr bgcolor=#BBBBFF'.
+           '><td><a href="'.$linkdir.'/'.$filename.'">'.$disfilename.
+ '</a></td><td>&nbsp;</td><td>'.localtime($cmtime).
+ '</td><td>&nbsp;</td><td>&nbsp;</td></tr>'
+           );
+         }
+     } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') {
          my $status='Unpublished';
          my $bgcol='#FFBBBB';
+         my $title='&nbsp;';
          if (-e $resdir.'/'.$filename) {
             my ($rdev,$rino,$rmode,$rnlink,
                 $ruid,$rgid,$rrdev,$rsize,
@@ -113,35 +156,34 @@ sub handler {
             if ($rmtime>=$cmtime) {
 		$status='Published';
                 $bgcol='#BBFFBB';
+                $title=
+ '<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
+ &Apache::lonnet::metadata($targetdir.'/'.$filename,'title').'</a>';
             } else {
                 $status='Modified';
                 $bgcol='#FFFFBB';
+                $title=
+ '<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
+ &Apache::lonnet::metadata($targetdir.'/'.$filename,'title').'</a>';
                 if 
-            (&Apache::lonnet::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
+         (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
                    $status.='<br><a href="/adm/diff?filename=/~'.$uname.
                                          $thisdisfn.'/'.$filename.
 		       '&versionone=priv" target=cat>Diffs</a>';
 	        }
             }   
+            $status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
+              $thisdisfn.'/'.$filename.'" target=cat>Retrieve</a>';
 	 }
          $r->print('<tr bgcolor='.$bgcol.
          '><td><a href="'.$linkdir.'/'.$filename.'">'.$filename.
-         '</a></td><td>'.localtime($cmtime).'</td><td>'.$status.'</td>'.
+         '</a></td><td>'.$title.
+         '<td>'.localtime($cmtime).'</td><td>'.$status.'</td>'.
      '<td><a target="_parent" href="/adm/publish?filename=/~'.$uname.
                                       $thisdisfn.'/'.$filename.'">'.
          'Publish</a></td></tr>');
-     } elsif ($cmode&$dirptr) {
-         my $disfilename=$filename;
-         if ($filename eq '..') {
-	     $disfilename='<i>Parent Directory</i>';
-         }
-         unless ((($filename eq '..') && ($thisdisfn eq '')) ||
-                 ($filename eq '.')) {
-           $r->print('<tr bgcolor=#BBBBFF'.
-           '><td><a href="'.$linkdir.'/'.$filename.'">'.$disfilename.
- '</a></td><td>'.localtime($cmtime).'</td><td>&nbsp;</td><td>&nbsp;</td></tr>'
-           );
-         }
+     } else {
+	# "hidden" extension and not a directory, so hide it away.
      }
   }
   closedir(DIR);
@@ -152,3 +194,60 @@ sub handler {
 
 1;
 __END__
+
+=head1 NAME
+
+Apache::lonpubdir - Publication Handler for Directories
+
+=head1 SYNOPSIS
+
+Invoked (for various locations) by /etc/httpd/conf/srm.conf:
+
+ <LocationMatch "^/\~.*/$">
+ 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
+ </LocationMatch>
+
+ <Location /adm/pubdir>
+ 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
+ </Location>
+
+=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
+
+=cut