--- loncom/interface/lonindexer.pm 2001/06/15 19:05:26 1.10 +++ loncom/interface/lonindexer.pm 2002/03/25 19:27:17 1.40 @@ -1,46 +1,101 @@ # The LearningOnline Network with CAPA # Directory Indexer -# (Login Screen -# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14 Gerd Kortemeyer) +# +# $Id: lonindexer.pm,v 1.40 2002/03/25 19:27:17 matthew 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/ +# +# YEAR=1999 +# 5/21/99, 5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14 Gerd Kortemeyer) # 11/23 Gerd Kortemeyer +# YEAR=2000 # 07/20-08/04 H.K. Ng -# +# YEAR=2001 # 05/9-05/19/2001 H. K. Ng # 05/21/2001 H. K. Ng # 05/23/2001 H. K. Ng -# 05/31/2001 Scott Harrison -# 06/01/2001 Scott Harrison -# 06/02/2001 Scott Harrison -# 06/15/2001 Scott Harrison +# 5/31,6/1,6/2,6/15 Scott Harrison +# 6/26,7/8 H. K. Ng +# 8/6,8/7,8/10 Scott Harrison +# 8/14 H. K. Ng +# 8/28,10/15,11/28,11/29 Scott Harrison +# 11/30 Matthew Hall +# 12/11,12/13 Scott Harrison +# YEAR=2002 +# 1/17 Scott Harrison +# +### + +############################################################################### +## ## +## ORGANIZATION OF THIS PERL MODULE ## +## ## +## 1. Description of functions ## +## 2. Modules used by this module ## +## 3. Choices for different output views (detailed, summary, xml, etc) ## +## 4. BEGIN block (to be run once after compilation) ## +## 5. Handling routine called via Apache and mod_perl ## +## 6. Other subroutines ## +## ## +############################################################################### package Apache::lonindexer; +# ------------------------------------------------- modules used by this module use strict; use Apache::lonnet(); +use Apache::loncommon(); use Apache::Constants qw(:common); use Apache::File; use GDBM_File; -my %hash; -my %dirs; -my %language; -my $hidden; -my $extrafield; -my $fnum; -sub BEGIN { - my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/language.tab'); - map { - $_=~/(\w+)\s+([\w\s\-]+)/; - $language{$1}=$2; - } <$fh>; -} +# ---------------------------------------- variables used throughout the module +my %hash; # tied to a user-specific gdbm file +my %dirs; # keys are directories, values are the open/close status +my %language; # has the reference information present in language.tab + +# ----- Values which are set by the handler subroutine and are accessible to +# ----- other methods. +my $extrafield; # default extra table cell +my $fnum; # file counter +my $dnum; # directory counter + +# ----- Used to include or exclude files with certain extensions. +my @Only = (); +my @Omit = (); + +# ----------------------------- Handling routine called via Apache and mod_perl sub handler { my $r = shift; $r->content_type('text/html'); $r->send_http_header; return OK if $r->header_only; $fnum=0; + $dnum=0; + untie %hash; + +# ------------------------------------- read in machine configuration variables my $iconpath= $r->dir_config('lonIconsURL') . "/"; my $domain = $r->dir_config('lonDefDomain'); my $role = $r->dir_config('lonRole'); @@ -50,120 +105,209 @@ sub handler { my $lonhost = $r->dir_config('lonHostID'); my $tabdir = $r->dir_config('lonTabDir'); -# my $iconpath='/res/adm/pages/indexericons/'; my $fileclr='#ffffe6'; -# -------------------------------------- see if called from an interactive mode - map { - my ($name, $value) = split(/=/,$_); - $value =~ tr/+/ /; - $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - if ($name eq 'catalogmode') { - $ENV{'form.'.$name}=$value; - } - } (split(/&/,$ENV{'QUERY_STRING'})); + my $line; + my (@attrchk,@openpath); + my $uri=$r->uri; - $hidden=''; my $closebutton=''; +# -------------------------------------- see if called from an interactive mode + # Get the parameters from the query string + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['catalogmode','launch','acts','mode','form','element', + 'only','omit']); + #------------------------------------------------------------------- + my $closebutton=''; my $groupimportbutton=''; my $colspan=''; - if ($ENV{'form.catalogmode'} eq 'interactive') { - $extrafield=''. - ''; - $colspan=" colspan='2' "; - $hidden=< -END - $closebutton=<'. + ''; + $colspan=" colspan='2' "; + $closebutton=< END - } - elsif ($ENV{'form.catalogmode'} eq 'groupimport') { - $extrafield=''. - ''; - $colspan=" colspan='2' "; - $hidden=< -END - $closebutton=<'. + ''; + $colspan=" colspan='2' "; + $closebutton=< END - $groupimportbutton=< + $groupimportbutton=< END - } - - my $catalogmodefunctions=''; - if ($ENV{'form.catalogmode'} eq 'interactive' or - $ENV{'form.catalogmode'} eq 'groupimport') { - $catalogmodefunctions=<print(<print(< The LearningOnline Network With CAPA Directory Browser - +function gothere(val) { + window.location=val+'?acts='+document.forms.fileattr.acts.value; +} + ENDHEADER - my $line; - my (@attrchk,@openpath); - my $uri=$r->uri; - - $r->print("

The LearningOnline With CAPA Network Directory Browser

\n"); - - my $diropen = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db"; - - if (tie(%hash,'GDBM_File',$diropen,&GDBM_WRCREAT,0640)) { - +# - Evaluate actions from previous page (both cumulatively and chronologically) + if ($ENV{'form.catalogmode'} eq 'groupimport') { + my $acts=$ENV{'form.acts'}; + my @Acts=split(/b/,$acts); + my %ahash; + my %achash; + my $ac=0; + # some initial hashes for working with data + foreach (@Acts) { + my ($state,$ref)=split(/a/); + $ahash{$ref}=$state; + $achash{$ref}=$ac; + $ac++; + } + # sorting through the actions and changing the tied database hash + foreach (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) { + my $key=$_; + if ($ahash{$key} eq '1') { + $hash{'store_'.$hash{'pre_'.$key.'_link'}}= + $hash{'pre_'.$key.'_title'}; + $hash{'storectr_'.$hash{'pre_'.$key.'_link'}}= + $hash{'storectr'}+0; + $hash{'storectr'}++; + } + if ($ahash{$key} eq '0') { + if ($hash{'store_'.$hash{'pre_'.$key.'_link'}}) { + delete $hash{'store_'.$hash{'pre_'.$key.'_link'}}; + } + } + } + # deleting the previously cached listing + foreach (keys %hash) { + if ($_ =~ /^pre_/ && $_ =~/link$/) { + my $key = $_; + $key =~ s/^pre_//; + $key =~ s/_[^_]*$//; + delete $hash{'pre_'.$key.'_title'}; + delete $hash{'pre_'.$key.'_link'}; + } + } + } + +# ---------------------------------------------------------------- output title + $r->print('

The LearningOnline With CAPA '. + 'Network Directory Browser

'."\n"); +# ---------------------------------- get state of file attributes to be showing if ($ENV{'form.attrs'} ne "") { - for (my $i=0; $i<=5; $i++) { + for (my $i=0; $i<=6; $i++) { delete $hash{'display_attrs_'.$i}; if ($ENV{'form.attr'.$i} == 1) { $attrchk[$i] = "checked"; @@ -197,49 +380,65 @@ ENDHEADER } } } else { - for (my $i=0; $i<=5; $i++) { + for (my $i=0; $i<=6; $i++) { $attrchk[$i] = "checked" if $hash{'display_attrs_'.$i} == 1; } } - $r->print(<Display file attributes
-
+# ------------------------------- output state of file attributes to be showing + $r->print(<Display file attributes
+ - - - + + + + - - - + + + +
Size Last access Last modified Size Last access Last modified All versions
Author Keywords Language Author Keywords Language 
-  - -$hidden + + +  + $closebutton $groupimportbutton END - my $titleclr="#ddffff"; - $r->print(""; my $i=0; while ($i<=5) { -# my $key="form.attr".$i; -# $tabtag=join('',$tabtag,"") if $ENV{$key} == 1; - $tabtag=join('',$tabtag,"") if $hash{'display_attrs_'.$i} == 1; + $tabtag=join('',$tabtag,"") + if $hash{'display_attrs_'.$i} == 1; $i++; } + +# display uplink arrow + if ($filecom[1] eq "viewOneUp") { + $r->print("$extrafield"); + $r->print("\n"); + return OK; + } + +# display domain if ($filecom[1] eq "domain") { + $r->print (''."\n") + if ($ENV{'form.dirPointer'} eq "on"); $r->print("$extrafield"); $r->print("\n"); return OK; + +# display user directory } if ($filecom[1] eq "user") { $r->print("$extrafield"); - $r->print("\n"); + &begin_form ($r,$curdir); + $r->print (''."\n"); + $r->print (''); + $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'. + "\n"); + $r->print (''); + $r->print ($listname.$tabtag.''."\n"); return OK; } + # display file if ($fnptr == 0 and $filecom[3] ne "") { my @file_ext = split (/\./,$listname); - my $curfext = $file_ext[scalar(@file_ext)-1]; + my $curfext = $file_ext[-1]; + if (@Omit) { + foreach (@Omit) { return OK if ($curfext eq $_); } + } + if (@Only) { + my $skip = 1; + foreach (@Only) { $skip = 0 if ($curfext eq $_); } + return OK if ($skip > 0); + } + # Set the icon for the file + my $iconname = "unknown.gif"; + my $embstyle = &Apache::loncommon::fileembstyle($curfext); + # The unless conditional that follows is a bit of overkill + $iconname = $curfext.".gif" unless + (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn'); + # my $filelink = $startdir.$filecom[0]; $r->print("\n"); -# $r->print("\n") if $ENV{'form.attr0'} == 1; - $r->print("\n") if $hash{'display_attrs_0'} == 1; - $r->print("\n") if $hash{'display_attrs_1'} == 1; - $r->print("\n") if $hash{'display_attrs_2'} == 1; + $r->print("\n") + if $hash{'display_attrs_0'} == 1; + $r->print("\n") + if $hash{'display_attrs_1'} == 1; + $r->print("\n") + if $hash{'display_attrs_2'} == 1; if ($hash{'display_attrs_3'} == 1) { - my $author = &Apache::lonnet::metadata($filelink,'author') if ($metafile == 1); + my $author = &Apache::lonnet::metadata($filelink,'author') + if ($metafile == 1); $author = ' ' if (!$author); - $r->print("\n"); + $r->print("\n"); } if ($hash{'display_attrs_4'} == 1) { - my $keywords = &Apache::lonnet::metadata($filelink,'keywords') if ($metafile == 1); + my $keywords = &Apache::lonnet::metadata($filelink,'keywords') + if ($metafile == 1); $keywords = ' ' if (!$keywords); - $r->print("\n"); + $r->print("\n"); } if ($hash{'display_attrs_5'} == 1) { - my $lang = &Apache::lonnet::metadata($filelink,'language') if ($metafile == 1); - $lang = $language{$lang}; + my $lang = &Apache::lonnet::metadata($filelink,'language') + if ($metafile == 1); + $lang = &Apache::loncommon::languagedescription($lang); $lang = ' ' if (!$lang); - $r->print("\n"); + $r->print("\n"); } $r->print("\n"); } + # -- display directory if ($fnptr == $dirptr) { my @file_ext = split (/\./,$listname); @@ -507,41 +837,220 @@ sub display_line{ $r->print("$extrafield\n"); + $r->print (''); + $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'. + "\n"); + $r->print (''. + "\n"); + $r->print ("$listname$tabtag\n"); } } -#---------------------prints the beginning of a form for directory or file link +# ------------------- prints the beginning of a form for directory or file link sub begin_form { my ($r,$uri) = @_; my $anchor = $uri; $anchor =~ s/\///g; - $r->print ("\n"); - $r->print ("$hidden\n"); + $r->print (''."\n"); + $r->print (''. + "\n"); + $r->print (''."\n"); + $dnum++; +} + +# --------- settings whenever the user causes the indexer window to be launched +sub start_fresh_session { + delete $hash{'mode_catalog'}; + delete $hash{'form_mode'}; + delete $hash{'form_form'}; + delete $hash{'form_element'}; + delete $hash{'form_omit'}; + delete $hash{'form_only'}; + foreach (keys %hash) { + if ($_ =~ /^pre_/) { + delete $hash{$_}; + } + if ($_ =~ /^store/) { + delete $hash{$_}; + } + } +} -# for (my $i=0; $i<=5; $i++) { -# $r->print ("\n") if $ENV{'form.attr'.$i} == 1; -# } +# ------------------------------------------------------------------- setvalues +sub setvalues { + # setvalues is used in registerurl to synchronize the database + # hash and environment hashes + my ($H1,$h1key,$H2,$h2key) =@_; + # + if (exists $H2->{$h2key}) { + $H1->{$h1key} = $H2->{$h2key}; + } elsif (exists $H1->{$h1key}) { + $H2->{$h2key} = $H1->{$h1key}; + } } 1; -__END__ + +=head1 NAME + +Apache::lonindexer - mod_perl module for cross server filesystem browsing + +=head1 SYNOPSIS + +Invoked by /etc/httpd/conf/srm.conf: + + + SetHandler perl-script + PerlHandler Apache::lonindexer + + +=head1 INTRODUCTION + +This module enables a scheme of browsing across a cross server. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 BEGIN SUBROUTINE + +This routine is only run once after compilation. + +=over 4 + +=item * + +Initializes %language hash table. + +=back + +=head1 HANDLER SUBROUTINE + +This routine is called by Apache and mod_perl. + +=over 4 + +=item * + +read in machine configuration variables + +=item * + +see if called from an interactive mode + +=item * + +refresh environment with user database values (in %hash) + +=item * + +define extra fields and buttons in case of special mode + +=item * + +set catalogmodefunctions to have extra needed javascript functionality + +=item * + +print header + +=item * + +evaluate actions from previous page (both cumulatively and chronologically) + +=item * + +output title + +=item * + +get state of file attributes to be showing + +=item * + +output state of file attributes to be showing + +=item * + +output starting row to the indexed file/directory hierarchy + +=item * + +read in what directories have previously been set to "open" + +=item * + +if not at top level, provide an uplink arrow + +=item * + +recursively go through all the directories and output as appropriate + +=item * + +information useful for group import + +=item * + +end the tables + +=item * + +end the output and return + +=back + +=head1 OTHER SUBROUTINES + +=over 4 + +=item * + +scanDir - recursive scan of a directory + +=item * + +get_list - get complete matched list based on the uri (returns an array) + +=item * + +match_ext - filters out files based on extensions (returns an array) + +=item * + +display_line - displays one line in appropriate table format + +=item * + +begin_form - prints the beginning of a form for directory or file link + +=item * + +start_fresh_session - settings whenever the user causes the indexer window +to be launched + +=back + +=cut
\n"); - $r->print("\n"); - $r->print("\n"); - $r->print("\n") if ($hash{'display_attrs_0'} == 1); - $r->print("\n") if ($hash{'display_attrs_1'} == 1); - $r->print("\n") if ($hash{'display_attrs_2'} == 1); - $r->print("\n") if ($hash{'display_attrs_3'} == 1); - $r->print("\n") if ($hash{'display_attrs_4'} == 1); - $r->print("\n") if ($hash{'display_attrs_5'} == 1); - $r->print(""); +# ----------------- output starting row to the indexed file/directory hierarchy + my $titleclr="#ddffff"; +# $r->print(&initdebug()); +# $r->print(&writedebug("Omit:@Omit")) if (@Omit); +# $r->print(&writedebug("Only:@Only")) if (@Only); + $r->print("
NameSize (bytes) Last accessedLast modifiedAuthor(s)KeywordsLanguage
\n"); + $r->print("\n"); + $r->print("\n"); + $r->print("\n") if ($hash{'display_attrs_0'} == 1); + $r->print("\n") + if ($hash{'display_attrs_1'} == 1); + $r->print("\n") + if ($hash{'display_attrs_2'} == 1); + $r->print("\n") + if ($hash{'display_attrs_3'} == 1); + $r->print("\n") + if ($hash{'display_attrs_4'} == 1); + $r->print("\n") + if ($hash{'display_attrs_5'} == 1); + $r->print(""); - map { +# ----------------- read in what directories have previously been set to "open" + foreach (keys %hash) { if ($_ =~ /^diropen_status_/) { my $key = $_; $key =~ s/^diropen_status_//; $dirs{$key} = $hash{$_}; } - } keys %hash; + } if ($ENV{'form.openuri'}) { # take care of review and refresh options my $uri=$ENV{'form.openuri'}; @@ -256,27 +455,55 @@ END $dirs{$uri} = 'open'; } } - - my $toplevel = "/res/"; + + my $bredir = $ENV{'form.dirPointer'}; + my $toplevel; my $indent = 0; - &scanDir ($r,$toplevel,$indent); + $uri = $uri.'/' if $uri !~ /.*\/$/; + + if ($bredir ne "on") { + $hash{'top.level'} = $uri; + $toplevel = $uri; + + } else { + $toplevel = $hash{'top.level'}; + } +# -------------------------------- if not at top level, provide an uplink arrow + if ($toplevel ne "/res/"){ + my (@uri_com) = split(/\//,$uri); + pop @uri_com; + my $upone = join('/',@uri_com); + my @list = qw (0); + &display_line ($r,'opened',$upone.'&viewOneUp',0,$upone,@list); + $indent = 1; + } + +# -------- recursively go through all the directories and output as appropriate + &scanDir ($r,$toplevel,$indent,\%hash); + +# ---------------------------- embed hidden information useful for group import $r->print(""); $r->print(""); + +# -------------------------------------------------------------- end the tables $r->print("
NameSize (bytes) ". + "Last accessedLast modifiedAuthor(s)KeywordsLanguage
"); $r->print("
"); + +# --------------------------------------------------- end the output and return $r->print("\n"); untie(%hash); } else { - $r->print("Unable to tie hash to db file"); + $r->print('Unable to tie hash to db '. + 'file'); + return OK; } return OK; } - -# --------------------recursive scan of a directory +# ----------------------------------------------- recursive scan of a directory sub scanDir { - my ($r,$startdir,$indent)=@_; + my ($r,$startdir,$indent,$hashref)=@_; my ($compuri,$curdir); my $dirptr=16384; $indent++; @@ -286,29 +513,40 @@ sub scanDir { foreach my $line (@list) { my ($strip,$dom,$foo,$testdir,$foo)=split(/\&/,$line,5); next if $strip =~ /.*\.meta$/; + my (@fileparts) = split(/\./,$strip); + if ($hash{'display_attrs_6'} != 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+/); + } + } + if ($dom eq "domain") { - $compuri = join('',$strip,"/"); # domain list has /res/ + $compuri = join('',$strip,"/"); # dom list has /res/ $curdir = $compuri; } else { - $compuri = join('',$startdir,$strip,"/"); # user, dir & file having name only, i.e., w/o path + # user, dir & file have name only, i.e., w/o path + $compuri = join('',$startdir,$strip,"/"); $curdir = $startdir; } - my $diropen = 0; + my $diropen = "closed"; if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/)) { while (my ($key,$val)= each %dupdirs) { if ($key eq $compuri and $val eq "open") { - $diropen = 1; + $diropen = "opened"; delete $dupdirs{key},$dirs{$key}; } } } - &display_line($r,$diropen,$line,$indent,$curdir,@list); - &scanDir ($r,$compuri,$indent) if $diropen == 1; + &display_line($r,$diropen,$line,$indent,$curdir,$hashref,@list); + &scanDir ($r,$compuri,$indent) if $diropen eq "opened"; } $indent--; } -# ----------------- get complete matched list based on the uri ------ +# --------------- get complete matched list based on the uri (returns an array) sub get_list { my ($r,$uri)=@_; my @list; @@ -316,9 +554,9 @@ sub get_list { $luri =~ s/\//_/g; if ($ENV{'form.attrs'} eq "Refresh") { - map { + foreach (keys %hash) { delete $hash{$_} if ($_ =~ /^dirlist_files_/); - } keys %hash; + } } if ($hash{'dirlist_files'.$luri}) { @@ -330,7 +568,30 @@ sub get_list { return @list=&match_ext($r,@list); } -#-------------------------- filters out files based on extensions +sub initdebug { + return < +var debugging = true; +if (debugging) { + var debuggingWindow = window.open('','Debug','width=400,height=300',true); +} + +function output(text) { + if (debugging) { + debuggingWindow.document.writeln(text); + } +} +output("Debugging Window
");   
+
+ENDJS
+}
+
+sub writedebug {
+    my $text = shift;
+    return "";
+}
+
+# -------------------- filters out files based on extensions (returns an array)
 sub match_ext {
     my ($r,@packlist)=@_;
     my @trimlist;
@@ -338,16 +599,6 @@ sub match_ext {
     my @fileext;
     my $dirptr=16384;
 
-    my $tabdir  = $r->dir_config('lonTabDir');
-    my $fn = $tabdir."/filetypes.tab";
-    if (-e $fn) {
-	my $FH=Apache::File->new($fn);
-	my @content=<$FH>;
-	foreach my $line (@content) {
-	    (my $ext,my $foo) = split /\s+/,$line;
-	    push @fileext,$ext;
-	}
-    }
     foreach my $line (@packlist) {
 	chomp $line;
 	$line =~ s/^\/home\/httpd\/html//;
@@ -358,9 +609,9 @@ sub match_ext {
 	my $fext = pop(@filecom);
 	my $fnptr = $unpackline[3]&$dirptr;
  	if ($fnptr == 0 and $unpackline[3] ne "") {
-	    foreach my $nextline (@fileext) {
-		push @trimlist,$line if $nextline eq $fext;
-	    }
+	    my $embstyle = &Apache::loncommon::fileembstyle($fext);
+            push @trimlist,$line if (defined($embstyle) && 
+				     ($embstyle ne 'hdn' or $fext eq 'meta'));
 	} else {
 	    push @trimlist,$line;
 	}
@@ -369,63 +620,113 @@ sub match_ext {
     return @trimlist;
 }
 
-#------------------- displays one line in appropriate table format
-sub display_line{
-    my ($r,$diropen,$line,$indent,$startdir,@list)=@_;
+# ------------------------------- displays one line in appropriate table format
+sub display_line {
+    my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
     my (@pathfn, $fndir, $fnptr);
     my $dirptr=16384;
     my $fileclr="#ffffe6";
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
-#    my $iconpath="/res/adm/pages/indexericons/";
 
     my @filecom = split (/\&/,$line);
     my @pathcom = split (/\//,$filecom[0]);
     my $listname = $pathcom[scalar(@pathcom)-1];
     my $fnptr = $filecom[3]&$dirptr;
     my $msg = 'View '.$filecom[0].' resources';
-    $msg = 'Close '.$filecom[0].' directory' if $diropen == 1;
+    $msg = 'Close '.$filecom[0].' directory' if $diropen eq "opened";
 
     my $tabtag="
   
\n"); + $r->print ('
'."\n"); + $r->print (''."\n"); + $r->print (''."\n"); + $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'. + "\n"); + $r->print("Up $tabtag
"); &begin_form ($r,$filecom[0].'/'); my $anchor = $filecom[0].'/'; $anchor =~ s/\///g; - $r->print ("\nprint (" name=\"$msg\" height=\"22\" type=\"image\" border=\"0\">\n"); + $r->print (''); + $r->print (''); + $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'. + "\n"); + $r->print ('print (' border="0" />'."\n"); $r->print("Domain - $listname $tabtag
\n"); + $r->print("\n"); my $curdir = $startdir.$filecom[0].'/'; - &begin_form ($r,$curdir); my $anchor = $curdir; $anchor =~ s/\///g; -# $r->print ("\n\n"); - $r->print ("\n\n"); - $r->print ("print ("folder_pointer_closed.gif\"") if $diropen == 0; - $r->print ("folder_pointer_opened.gif\"") if $diropen == 1; - $r->print (" name=\"$msg\" height=\"22\" type=\"image\" border=\"0\">\n"); - $r->print ("\n"); - $r->print ("$listname $tabtag
"); my $metafile = grep /^$filecom[0]\.meta\&/, @list; @@ -435,9 +736,12 @@ sub display_line{ $title = &Apache::lonnet::metadata($filelink,'title') if ($metafile == 1); $title=$listname unless $title; - $r->print(""); - $r->print("\n"); + my $titleesc=$title; + $titleesc=~s/\'/\\'/; #' (clean up this spare quote + $r->print(""); + $r->print("". + "\n"); $r->print(""); } elsif ($ENV{'form.catalogmode'} eq 'groupimport') { @@ -447,56 +751,82 @@ sub display_line{ $title=$listname unless $title; $r->print("
\n"); $r->print("\n"); + "value='$filelink' onClick='". + "javascript:queue(\"form$fnum\")' "); + if ($hash{'store_'.$filelink}) { + $r->print("checked"); + } + $r->print(">\n"); $r->print("\n"); $r->print("
\n"); $r->print("		"); + $hash{"pre_${fnum}_link"}=$filelink; + $hash{"pre_${fnum}_title"}=$title; $fnum++; } - if ($indent < 11) { - $r->print("\n"); - } else { + if ($indent > 0 and $indent < 11) { + $r->print("\n"); + } elsif ($indent >0) { my $ten = int($indent/10.); my $rem = $indent%10.0; my $count = 0; while ($count < $ten) { - $r->print("\n"); + $r->print("\n"); $count++; } - $r->print("\n") if $rem > 0; + $r->print("\n") if $rem > 0; } - $r->print("\n"); - $r->print(" ",$listname,"\n"); - - $r->print (" (metadata) ") if ($metafile == 1); + $r->print("\n"); + $r->print (" $listname "); + + $r->print (" (metadata) ") if ($metafile == 1); $r->print(" ",$filecom[8]," ",$filecom[8]," ".(localtime($filecom[9]))." ".(localtime($filecom[10]))." ", + $filecom[8]," ". + (localtime($filecom[9]))." ". + (localtime($filecom[10]))." ".$author." ".$author. + " ".$keywords." ".$keywords. + " ".$lang." ".$lang. + "
"); &begin_form ($r,$curdir); my $indentm1 = $indent-1; - if ($indentm1 < 11) { - $r->print("\n"); + if ($indentm1 < 11 and $indentm1 > 0) { + $r->print("\n"); } else { my $ten = int($indentm1/10.); my $rem = $indentm1%10.0; my $count = 0; while ($count < $ten) { - $r->print("\n"); - $count++; + $r->print ("\n"); + $count++; } - $r->print("\n") if $rem > 0; + $r->print ("\n") if $rem > 0; } - $r->print ("\nprint ("folder_pointer_closed.gif\"") if $diropen == 0; - $r->print ("folder_pointer_opened.gif\"") if $diropen == 1; - $r->print (" name=\"$msg\" height=\"22\" type=\"image\" border=\"0\">\n"); - $r->print("\n") if $diropen == 0; - $r->print("\n") if $diropen == 1; - $r->print("$listname $tabtag