--- loncom/interface/lonindexer.pm	2003/02/20 19:41:26	1.61
+++ loncom/interface/lonindexer.pm	2003/07/22 19:00:51	1.71
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.61 2003/02/20 19:41:26 www Exp $
+# $Id: lonindexer.pm,v 1.71 2003/07/22 19:00:51 ng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,6 +62,7 @@ use strict;
 use Apache::lonnet();
 use Apache::loncommon();
 use Apache::Constants qw(:common);
+use Apache::lonmeta;
 use Apache::File;
 use GDBM_File;
 
@@ -84,13 +85,13 @@ my @Omit = ();
 # ----------------------------- Handling routine called via Apache and mod_perl
 sub handler {
     my $r = shift;
+    my $c = $r->connection();
     $r->content_type('text/html');
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
     $fnum=0;
     $dnum=0;
-    untie %hash;
 
     # Deal with stupid global variables (is there a way around making
     # these global to this package?  It is just so wrong....)
@@ -124,9 +125,18 @@ sub handler {
 
     $extrafield='';
     my $diropendb = 
-	"/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
-
-    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
+	"/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_indexer.db";
+    %hash = ();
+    {
+	my %dbfile;
+	if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
+	    while(my($key,$value)=each(%dbfile)) {
+		$hash{$key}=$value;
+	    }
+	    untie(%dbfile);
+	}
+    }
+    {
 	if ($ENV{'form.launch'} eq '1') {
 	    &start_fresh_session();
         }
@@ -309,10 +319,14 @@ END
 
 <script type="text/javascript">
 $catalogmodefunctions
-function openWindow(url, wdwName, w, h, toolbar,scrollbar) {
-    var options = "width=" + w + ",height=" + h + ",";
+function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {
+    var xpos = (screen.width-w)/2;
+    xpos = (xpos < 0) ? '0' : xpos;
+    var ypos = (screen.height-h)/2-30;
+    ypos = (ypos < 0) ? '0' : ypos;
+    var options = "width=" + w + ",height=" + h + ",screenx="+xpos+",screeny="+ypos+",";
     options += "resizable=yes,scrollbars="+scrollbar+",status=no,";
-    options += "menubar=no,toolbar="+toolbar+",location=no,directories=no";
+    options += "menubar=no,toolbar="+toolbar+",location="+locationbar+",directories=no";
     var newWin = window.open(url, wdwName, options);
     newWin.focus();
 }
@@ -368,7 +382,7 @@ $r->print(&Apache::loncommon::bodytag('B
 	
 # ---------------------------------- get state of file attributes to be showing
 	if ($ENV{'form.attrs'} ne '') {
-	    for (my $i=0; $i<=8; $i++) {
+	    for (my $i=0; $i<=9; $i++) {
 		delete $hash{'display_attrs_'.$i};
 		if ($ENV{'form.attr'.$i} == 1) {
 		    $attrchk[$i] = 'checked';
@@ -376,11 +390,13 @@ $r->print(&Apache::loncommon::bodytag('B
 		}
 	    }
 	} else {
-	    for (my $i=0; $i<=8; $i++) {
+	    for (my $i=0; $i<=9; $i++) {
 		$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
 	    }
 	}
 # ------------------------------- output state of file attributes to be showing
+#                                 All versions has to the last item
+#                                 since it does not take an extra col
 	$r->print(<<END);
 <form method="post" name="fileattr" action="$uri"
  enctype="application/x-www-form-urlencoded">
@@ -390,16 +406,17 @@ $r->print(&Apache::loncommon::bodytag('B
 <td><input type="checkbox" name="attr1" value="1" $attrchk[1] /> Size</td>
 <td><input type="checkbox" name="attr2" value="1" $attrchk[2] /> Last access</td>
 <td><input type="checkbox" name="attr3" value="1" $attrchk[3] /> Last modified</td>
-<td rowspan="2"><input type="checkbox" name="attr8" value="1" $attrchk[8] /> Show Resource</td></tr><tr>
+<td><input type="checkbox" name="attr8" value="1" $attrchk[8] /> Statistics</td></tr><tr>
 <td><input type="checkbox" name="attr4" value="1" $attrchk[4] /> Author</td>
 <td><input type="checkbox" name="attr5" value="1" $attrchk[5] /> Keywords</td>
 <td><input type="checkbox" name="attr6" value="1" $attrchk[6] /> Language</td>
-<td><input type="checkbox" name="attr7" value="1" $attrchk[7] /> All versions</td>
+<td><input type="checkbox" name="attr7" value="1" $attrchk[7] /> Show Resource</td>
+<td><input type="checkbox" name="attr9" value="1" $attrchk[9] /> All versions</td>
+<td>&nbsp;</td>
 </tr></table>
 <input type="hidden" name="dirPointer" value="on" />
 <input type="hidden" name="acts" value="" />
-<input type="submit" name="attrs" value="Review" />&nbsp;
-<input type="submit" name="attrs" value="Refresh" />
+<input type="submit" name="attrs" value="Update Display" />
 $closebutton
 $groupimportbutton
 </form>
@@ -428,6 +445,8 @@ END
 	$r->print("<td><b>Language</b></td>\n")
 	    if ($hash{'display_attrs_6'} == 1);
 	$r->print("<td><b>Resource</b></td>\n")
+	    if ($hash{'display_attrs_7'} == 1);
+	$r->print("<td><b>Usage Statistics <br />(Courses/Network Hits)</b></td>\n")
 	    if ($hash{'display_attrs_8'} == 1);
 	$r->print('</tr>');
 
@@ -492,18 +511,28 @@ END
 
 # --------------------------------------------------- end the output and return
 	$r->print('</body></html>'."\n");
-	untie(%hash);
-    } else {
-	$r->print('<html><head></head><body>Unable to tie hash to db '.
-		  'file</body></html>');
-	return OK;
+#    } else {
+#	$r->print('<html><head></head><body>Unable to tie hash to db '.
+#		  'file</body></html>');
+#	return OK;
+    }
+    if(! $c->aborted()) {
+	my %dbfile;
+        if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_NEWDB(),0640)) {
+            while (my($key,$value) = each(%hash)) {
+                $dbfile{$key}=$value;
+            }
+            untie(%dbfile);
+        }
     }
+
     return OK;
 }
 
 # ----------------------------------------------- recursive scan of a directory
 sub scanDir {
     my ($r,$startdir,$indent,$hashref)=@_;
+    my $c = $r->connection();
     my ($compuri,$curdir);
     my $dirptr=16384;
     $indent++;
@@ -511,15 +540,16 @@ sub scanDir {
     my %dupdirs = %dirs;
     my @list=&get_list($r,$startdir);
     foreach my $line (@list) {
+        return if ($c->aborted());
 	my ($strip,$dom,undef,$testdir,undef)=split(/\&/,$line,5); 
 	next if $strip =~ /.*\.meta$/;
 	my (@fileparts) = split(/\./,$strip);
-	if ($hash{'display_attrs_7'} != 1) {
+	if ($hash{'display_attrs_9'} != 1) {
 	    if (scalar(@fileparts) >= 3) {
 		my $fext = pop @fileparts;
 		my $ov = pop @fileparts;
 		my $fname = join ('.',@fileparts,$fext);
-		next if (grep /$fname/,@list and $ov =~ /\d+/);
+		next if (grep /\Q$fname\E/,@list and $ov =~ /\d+/);
 	    }
 	}
 
@@ -553,7 +583,7 @@ sub get_list {
     my @list;
     (my $luri = $uri) =~ s/\//_/g;
 
-    if ($ENV{'form.attrs'} eq 'Refresh') {
+    if ($ENV{'form.attrs'} eq 'Update Display') {
 	foreach (keys %hash) {
 	    delete $hash{$_} if ($_ =~ /^dirlist_files_/);
 	    }
@@ -638,16 +668,18 @@ sub display_line {
     my $tabtag='</td>';
     my $i=0;
 
-    while ($i<=6) {
+    while ($i<=8) {
 	$tabtag=join('',$tabtag,"<td>&nbsp;</td>")
 	    if $hash{'display_attrs_'.$i} == 1;
 	$i++;
     }
+	
+    my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');
 
 # display uplink arrow
     if ($filecom[1] eq 'viewOneUp') {
-	$r->print("<tr bgcolor=$fileclr>$extrafield");
-	$r->print("<td valign=bottom>\n");
+	$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
+	$r->print("<td>\n");
 	$r->print ('<form method="post" name="dirpathUP" action="'.$startdir.
 		   '/" '.
 		   'onSubmit="return rep_dirpath(\'UP\','.
@@ -663,13 +695,16 @@ sub display_line {
 	$r->print("Up $tabtag</tr></form>\n");
 	return OK;
     }
+# Do we have permission to look at this?
+
+    return OK if (!&Apache::lonnet::allowed('bre',$startdir.$filecom[0]));
 
 # display domain
     if ($filecom[1] eq 'domain') {
 	$r->print ('<input type="hidden" name="dirPointer" value="on">'."\n")
 	    if ($ENV{'form.dirPointer'} eq "on");
-	$r->print("<tr bgcolor=$fileclr>$extrafield");
-	$r->print("<td valign=bottom>");
+	$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
+	$r->print("<td>");
 	&begin_form ($r,$filecom[0].'/');
 	my $anchor = $filecom[0].'/';
 	$anchor =~ s/\///g;
@@ -693,8 +728,8 @@ sub display_line {
 # display user directory
     }
     if ($filecom[1] eq 'user') {
-	$r->print("<tr bgcolor=$fileclr>$extrafield");
-	$r->print("<td valign=bottom nowrap>\n");
+	$r->print("<tr valign=$valign bgcolor=$fileclr>$extrafield");
+	$r->print("<td nowrap>\n");
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
@@ -720,7 +755,6 @@ sub display_line {
 # display file
     if ($fnptr == 0 and $filecom[3] ne '') {
 	my $filelink = $startdir.$filecom[0];
-	return OK if (!&Apache::lonnet::allowed('bre',$filelink));
 	my @file_ext = split (/\./,$listname);
 	my $curfext = $file_ext[-1];
         if (@Omit) {
@@ -738,8 +772,8 @@ sub display_line {
 	$iconname = $curfext.".gif" unless
 	    (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
 	#
-	$r->print("<tr bgcolor=$fileclr><td nowrap valign='bottom'>");
-	my $metafile = grep /^$filecom[0]\.meta\&/, @list;
+	$r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap>");
+	my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list;
 	my $title;
         if ($ENV{'form.catalogmode'} eq 'interactive') {
 	    $title=$listname;
@@ -752,7 +786,7 @@ sub display_line {
                       $titleesc,"','",$filelink,"')\">");
 	    $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
 		      "\n");
-	    $r->print("</td><td valign='bottom' nowrap>");
+	    $r->print("</td><td nowrap>");
 	}
         elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
 	    $title=$listname;
@@ -771,7 +805,7 @@ sub display_line {
 	    $r->print("<input type='hidden' name='title"."' ".
 		      "value='$titleesc'>\n");
 	    $r->print("</form>\n");
-	    $r->print("</td><td valign='bottom' nowrap>");
+	    $r->print("</td><td nowrap>");
 	    $hash{"pre_${fnum}_link"}=$filelink;
 	    $hash{"pre_${fnum}_title"}=$titleesc;
   	    $fnum++;
@@ -795,51 +829,51 @@ sub display_line {
 
 	$r->print("<img src=$iconpath$iconname border='0' />\n");
 	$r->print (" <a href=\"javascript:openWindow('".$filelink.
-		   "', 'metadatafile', '450', '500', 'no', 'yes')\";".
+		   "', 'previewfile', '450', '500', 'no', 'yes','yes')\";".
 		   " TARGET=_self>$listname</a> ");
 
 	$r->print (" (<a href=\"javascript:openWindow('".$filelink.
-		   ".meta', 'metadatafile', '400', '450', 'no', 'yes')\"; ".
+		   ".meta', 'metadatafile', '500', '550', 'no', 'yes','no')\"; ".
 		   "TARGET=_self>metadata</a>) ") if ($metafile == 1);
 
 	$r->print("</td>\n");
 	if ($hash{'display_attrs_0'} == 1) {
-	    my $title = &Apache::lonnet::metadata($filelink,'title')
+	    my $title = &Apache::lonnet::gettitle($filelink,'title')
 		if ($metafile == 1);
-	    $r->print('<td valign=bottom> '.($title eq '' ? '&nbsp;' : $title).
+	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
 	}
-	$r->print('<td align=right valign=bottom> ',
+	$r->print('<td align=right> ',
 		  $filecom[8]," </td>\n") 
 	    if $hash{'display_attrs_1'} == 1;
-	$r->print('<td valign=bottom> '.
+	$r->print('<td> '.
 		  (localtime($filecom[9]))." </td>\n") 
 	    if $hash{'display_attrs_2'} == 1;
-	$r->print('<td valign=bottom> '.
+	$r->print('<td> '.
 		  (localtime($filecom[10]))." </td>\n") 
 	    if $hash{'display_attrs_3'} == 1;
 
 	if ($hash{'display_attrs_4'} == 1) {
 	    my $author = &Apache::lonnet::metadata($filelink,'author')
 		if ($metafile == 1);
-	    $r->print('<td valign=bottom> '.($author eq '' ? '&nbsp;' : $author).
+	    $r->print('<td> '.($author eq '' ? '&nbsp;' : $author).
 		      " </td>\n");
 	}
 	if ($hash{'display_attrs_5'} == 1) {
 	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords')
 		if ($metafile == 1);
 	    # $keywords = '&nbsp;' if (!$keywords);
-	    $r->print('<td valign=bottom> '.($keywords eq '' ? '&nbsp;' : $keywords).
+	    $r->print('<td> '.($keywords eq '' ? '&nbsp;' : $keywords).
 		      " </td>\n");
 	}
 	if ($hash{'display_attrs_6'} == 1) {
 	    my $lang = &Apache::lonnet::metadata($filelink,'language')
 		if ($metafile == 1);
 	    $lang = &Apache::loncommon::languagedescription($lang);
-	    $r->print('<td valign=bottom> '.($lang eq '' ? '&nbsp;' : $lang).
+	    $r->print('<td> '.($lang eq '' ? '&nbsp;' : $lang).
 		      " </td>\n");
 	}
-        if ($hash{'display_attrs_8'} == 1) {
+        if ($hash{'display_attrs_7'} == 1) {
             my $output='';
             my $embstyle=&Apache::loncommon::fileembstyle($curfext);
 	    if ($embstyle eq 'ssi') {
@@ -852,9 +886,18 @@ sub display_line {
 		 $Apache::lonnet::hostname{&Apache::lonnet::homeserver($2,$1)}.
                  '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';
            }
-	   $r->print('<td valign=bottom> '.($output eq '' ? '&nbsp;':$output).
+	   $r->print('<td> '.($output eq '' ? '&nbsp;':$output).
 		      " </td>\n");
         }
+	if ($hash{'display_attrs_8'} == 1) {
+	    my (%stat) = &Apache::lonmeta::dynamicmeta($filelink) if ($metafile == 1);
+	    my $stat = (exists($stat{'course'}) ? $stat{'course'} : '').
+		((exists($stat{'course'}) || exists($stat{'count'})) ? '/' : '').
+		(exists($stat{'count'}) ? $stat{'count'} : '');
+	    $r->print('<td align=center> '.($stat eq '' ? '&nbsp;' : $stat).
+		      ' </td>'."\n");
+	}
+
 	$r->print("</tr>\n");
     }
 
@@ -865,7 +908,7 @@ sub display_line {
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
-	$r->print("<tr bgcolor=$fileclr>$extrafield<td valign=bottom>");
+	$r->print("<tr bgcolor=$fileclr>$extrafield<td valign=$valign>");
 	&begin_form ($r,$curdir);
 	my $indentm1 = $indent-1;
 	if ($indentm1 < 11 and $indentm1 > 0) {
@@ -943,9 +986,6 @@ sub setvalues {
 sub cleanup {
     if (tied(%hash)){
 	&Apache::lonnet::logthis('Cleanup indexer: hash');
-        unless (untie(%hash)) {
-	    &Apache::lonnet::logthis('Failed cleanup indexer: hash');
-        }
     }
 }