--- loncom/interface/lonindexer.pm 2002/03/08 18:33:29 1.37 +++ loncom/interface/lonindexer.pm 2002/07/02 21:08:24 1.46 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.37 2002/03/08 18:33:29 matthew Exp $ +# $Id: lonindexer.pm,v 1.46 2002/07/02 21:08:24 ng Exp $ # # Copyright Michigan State University Board of Trustees # @@ -43,6 +43,7 @@ # 12/11,12/13 Scott Harrison # YEAR=2002 # 1/17 Scott Harrison +# 6/29/2002 H. K. Ng # ### @@ -80,6 +81,11 @@ my $extrafield; # default extra table ce 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; @@ -90,6 +96,11 @@ sub handler { $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....) + undef (@Only); + undef (@Omit); + # ------------------------------------- read in machine configuration variables my $iconpath= $r->dir_config('lonIconsURL') . "/"; my $domain = $r->dir_config('lonDefDomain'); @@ -108,7 +119,8 @@ sub handler { # -------------------------------------- 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']); + ['catalogmode','launch','acts','mode','form','element', + 'only','omit']); #------------------------------------------------------------------- my $closebutton=''; my $groupimportbutton=''; @@ -121,8 +133,7 @@ sub handler { if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) { if ($ENV{'form.launch'} eq '1') { &start_fresh_session(); - } - + } # -------------------- refresh environment with user database values (in %hash) if ($hash{'mode_catalog'} eq 'interactive') { $ENV{'form.catalogmode'}='interactive'; @@ -168,10 +179,20 @@ END &setvalues(\%hash,'form_mode' ,\%ENV,'form.mode' ); &setvalues(\%hash,'form_form' ,\%ENV,'form.form' ); &setvalues(\%hash,'form_element',\%ENV,'form.element'); + &setvalues(\%hash,'form_only' ,\%ENV,'form.only' ); + &setvalues(\%hash,'form_omit' ,\%ENV,'form.omit' ); + # Deal with 'omit' and 'only' + if (exists $ENV{'form.omit'}) { + @Omit = split(',',$ENV{'form.omit'}); + } + if (exists $ENV{'form.only'}) { + @Only = split(',',$ENV{'form.only'}); + } + my $mode = $ENV{'form.mode'}; my ($form,$element); - if ($mode eq 'edit') { + if ($mode eq 'edit' || $mode eq 'parmset') { $form = $ENV{'form.form'}; $element = $ENV{'form.element'}; } @@ -184,7 +205,15 @@ END # by default (ie. if $mode is undefined). This is the easy # way out. Hopefully in the future I'll find a way to get # the calls dealt with in a more comprehensive manner. - if (!defined($mode) || $mode ne 'edit') { + +# +# There is now also mode "simple", which is for the simple version of the rat +# +# + if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) { + my $location = "/adm/groupsort?catalogmode=groupimport&"; + $location .= "mode=".$mode."&"; + $location .= "acts="; $catalogmodefunctions=<<"END"; function select_data(title,url) { changeTitle(title); @@ -192,7 +221,7 @@ function select_data(title,url) { self.close(); } function select_group() { - window.location="/adm/groupsort?catalogmode=groupimport&acts="+document.forms.fileattr.acts.value; + window.location="$location"+document.forms.fileattr.acts.value; } function changeTitle(val) { if (opener.inf) { @@ -209,7 +238,9 @@ function changeURL(val) { } } END - } else { # we are in 'edit' mode + } elsif ($mode eq 'edit') { # we are in 'edit' mode + my $location = "/adm/groupsort?catalogmode=interactive&"; + $location .= "form=$form&element=$element&mode=edit&acts="; $catalogmodefunctions=<print('

The LearningOnline With CAPA '. + $r->print( +'

The LearningOnline Network with CAPA '. 'Network Directory Browser

'."\n"); # ---------------------------------- get state of file attributes to be showing - if ($ENV{'form.attrs'} ne "") { - for (my $i=0; $i<=6; $i++) { + if ($ENV{'form.attrs'} ne '') { + for (my $i=0; $i<=7; $i++) { delete $hash{'display_attrs_'.$i}; if ($ENV{'form.attr'.$i} == 1) { - $attrchk[$i] = "checked"; + $attrchk[$i] = 'checked'; $hash{'display_attrs_'.$i} = 1; } } } else { - for (my $i=0; $i<=6; $i++) { - $attrchk[$i] = "checked" if $hash{'display_attrs_'.$i} == 1; + for (my $i=0; $i<=7; $i++) { + $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1; } } # ------------------------------- output state of file attributes to be showing $r->print(<Display file attributes
+Display file attributes
- - - - + + + + - - - - + + + +
Size Last access Last modified All versions Title Size Last access Last modified
Author Keywords Language  Author Keywords Language All versions
@@ -363,22 +423,27 @@ END # ----------------- output starting row to the indexed file/directory hierarchy my $titleclr="#ddffff"; - $r->print("
\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") +# $r->print(&initdebug()); +# $r->print(&writedebug("Omit:@Omit")) if (@Omit); +# $r->print(&writedebug("Only:@Only")) if (@Only); + $r->print("
NameSize (bytes) ". - "Last accessedLast modified
\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") + $r->print("\n") if ($hash{'display_attrs_3'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_4'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_5'} == 1); - $r->print(""); + $r->print("\n") + if ($hash{'display_attrs_6'} == 1); + $r->print(''); # ----------------- read in what directories have previously been set to "open" foreach (keys %hash) { @@ -410,7 +475,7 @@ END my $indent = 0; $uri = $uri.'/' if $uri !~ /.*\/$/; - if ($bredir ne "on") { + if ($bredir ne 'on') { $hash{'top.level'} = $uri; $toplevel = $uri; @@ -419,7 +484,7 @@ END } # -------------------------------- if not at top level, provide an uplink arrow - if ($toplevel ne "/res/"){ + if ($toplevel ne '/res/'){ my (@uri_com) = split(/\//,$uri); pop @uri_com; my $upone = join('/',@uri_com); @@ -436,11 +501,11 @@ END $r->print(""); # -------------------------------------------------------------- end the tables - $r->print("
NameTitleSize (bytes) ". + "Last accessedAuthor(s)Last modifiedKeywordsAuthor(s)LanguageKeywords
Language
"); - $r->print("
"); + $r->print('
'); + $r->print(''); # --------------------------------------------------- end the output and return - $r->print("\n"); + $r->print(''."\n"); untie(%hash); } else { $r->print('Unable to tie hash to db '. @@ -463,7 +528,7 @@ sub scanDir { my ($strip,$dom,$foo,$testdir,$foo)=split(/\&/,$line,5); next if $strip =~ /.*\.meta$/; my (@fileparts) = split(/\./,$strip); - if ($hash{'display_attrs_6'} != 1) { + if ($hash{'display_attrs_7'} != 1) { if (scalar(@fileparts) >= 3) { my $fext = pop @fileparts; my $ov = pop @fileparts; @@ -472,15 +537,15 @@ sub scanDir { } } - if ($dom eq "domain") { - $compuri = join('',$strip,"/"); # dom list has /res/ + if ($dom eq 'domain') { + $compuri = join('',$strip,'/'); # dom list has /res/ $curdir = $compuri; } else { # user, dir & file have name only, i.e., w/o path - $compuri = join('',$startdir,$strip,"/"); + $compuri = join('',$startdir,$strip,'/'); $curdir = $startdir; } - my $diropen = "closed"; + my $diropen = 'closed'; if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/)) { while (my ($key,$val)= each %dupdirs) { if ($key eq $compuri and $val eq "open") { @@ -490,7 +555,7 @@ sub scanDir { } } &display_line($r,$diropen,$line,$indent,$curdir,$hashref,@list); - &scanDir ($r,$compuri,$indent) if $diropen eq "opened"; + &scanDir ($r,$compuri,$indent) if $diropen eq 'opened'; } $indent--; } @@ -499,10 +564,9 @@ sub scanDir { sub get_list { my ($r,$uri)=@_; my @list; - my $luri = $uri; - $luri =~ s/\//_/g; + (my $luri = $uri) =~ s/\//_/g; - if ($ENV{'form.attrs'} eq "Refresh") { + if ($ENV{'form.attrs'} eq 'Refresh') { foreach (keys %hash) { delete $hash{$_} if ($_ =~ /^dirlist_files_/); } @@ -517,6 +581,29 @@ sub get_list { return @list=&match_ext($r,@list); } +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)=@_;
@@ -529,8 +616,8 @@ sub match_ext {
 	chomp $line;
 	$line =~ s/^\/home\/httpd\/html//;
 	my @unpackline = split (/\&/,$line);
-	next if ($unpackline[0] eq ".");
-	next if ($unpackline[0] eq "..");
+	next if ($unpackline[0] eq '.');
+	next if ($unpackline[0] eq '..');
 	my @filecom = split (/\./,$unpackline[0]);
 	my $fext = pop(@filecom);
 	my $fnptr = $unpackline[3]&$dirptr;
@@ -552,28 +639,28 @@ sub display_line {
     my (@pathfn, $fndir, $fnptr);
     my $dirptr=16384;
     my $fileclr="#ffffe6";
-    my $iconpath= $r->dir_config('lonIconsURL') . "/";
+    my $iconpath= $r->dir_config('lonIconsURL') . '/';
 
     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 eq "opened";
+    $msg = 'Close '.$filecom[0].' directory' if $diropen eq 'opened';
 
-    my $tabtag="";
+    my $tabtag='';
     my $i=0;
 
-    while ($i<=5) {
-	$tabtag=join('',$tabtag," ")
+    while ($i<=6) {
+	$tabtag=join('',$tabtag," ")
 	    if $hash{'display_attrs_'.$i} == 1;
 	$i++;
     }
 
 # display uplink arrow
-    if ($filecom[1] eq "viewOneUp") {
-	$r->print("$extrafield");
-	$r->print("\n");
+    if ($filecom[1] eq 'viewOneUp') {
+	$r->print("$extrafield");
+	$r->print("\n");
 	$r->print ('
print (''."\n")
 	    if ($ENV{'form.dirPointer'} eq "on");
-	$r->print("$extrafield");
-	$r->print("");
+	$r->print("$extrafield");
+	$r->print("");
 	&begin_form ($r,$filecom[0].'/');
 	my $anchor = $filecom[0].'/';
 	$anchor =~ s/\///g;
@@ -613,9 +700,9 @@ sub display_line {
 
 # display user directory
     }
-    if ($filecom[1] eq "user") {
-	$r->print("$extrafield");
-	$r->print("\n");
+    if ($filecom[1] eq 'user') {
+	$r->print("$extrafield");
+	$r->print("\n");
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
@@ -635,9 +722,17 @@ sub display_line {
     }
 
 # display file
-    if ($fnptr == 0 and $filecom[3] ne "") {
+    if ($fnptr == 0 and $filecom[3] ne '') {
 	my @file_ext = split (/\./,$listname);
 	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);
@@ -646,7 +741,7 @@ sub display_line {
 	    (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
 	#
 	my $filelink = $startdir.$filecom[0];
-	$r->print("");
+	$r->print("");
 	my $metafile = grep /^$filecom[0]\.meta\&/, @list;
 	my $title;
         if ($ENV{'form.catalogmode'} eq 'interactive') {
@@ -654,19 +749,20 @@ sub display_line {
 	    $title = &Apache::lonnet::metadata($filelink,'title')
 		if ($metafile == 1);
 	    $title=$listname unless $title;
-	    my $titleesc=$title;
-	    $titleesc=~s/\'/\\'/; #' (clean up this spare quote
+	    my $titleesc=HTML::Entities::encode($title);
+	    $titleesc=~s/\'/\\'/; #' (clean up this spare quote)
             $r->print("");
 	    $r->print("".
 		      "\n");
-	    $r->print("");
+	    $r->print("");
 	}
         elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
 	    $title=$listname;
 	    $title = &Apache::lonnet::metadata($filelink,'title')
 		if ($metafile == 1);
 	    $title=$listname unless $title;
+	    my $titleesc=&HTML::Entities::encode($title);
 	    $r->print("\n");
 	    $r->print("\n");
+		      "value='$titleesc'>\n");
 	    $r->print("
\n");
-	    $r->print("");
+	    $r->print("");
 	    $hash{"pre_${fnum}_link"}=$filelink;
-	    $hash{"pre_${fnum}_title"}=$title;
+	    $hash{"pre_${fnum}_title"}=$titleesc;
   	    $fnum++;
 	}
 
@@ -710,36 +806,40 @@ sub display_line {
 		   "TARGET=_self>metadata) ") if ($metafile == 1);
 
 	$r->print("\n");
-	$r->print(" ",
+	if ($hash{'display_attrs_0'} == 1) {
+	    my $title = &Apache::lonnet::metadata($filelink,'title')
+		if ($metafile == 1);
+	    $r->print(' '.($title eq '' ? ' ' : $title).
+		      ' '."\n");
+	}
+	$r->print(' ',
 		  $filecom[8]," \n") 
-	    if $hash{'display_attrs_0'} == 1;
-	$r->print(" ".
-		  (localtime($filecom[9]))." \n") 
 	    if $hash{'display_attrs_1'} == 1;
-	$r->print(" ".
-		  (localtime($filecom[10]))." \n") 
+	$r->print(' '.
+		  (localtime($filecom[9]))." \n") 
 	    if $hash{'display_attrs_2'} == 1;
+	$r->print(' '.
+		  (localtime($filecom[10]))." \n") 
+	    if $hash{'display_attrs_3'} == 1;
 
-	if ($hash{'display_attrs_3'} == 1) {
+	if ($hash{'display_attrs_4'} == 1) {
 	    my $author = &Apache::lonnet::metadata($filelink,'author')
 		if ($metafile == 1);
-	    $author = ' ' if (!$author);
-	    $r->print(" ".$author.
+	    $r->print(' '.($author eq '' ? ' ' : $author).
 		      " \n");
 	}
-	if ($hash{'display_attrs_4'} == 1) {
+	if ($hash{'display_attrs_5'} == 1) {
 	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords')
 		if ($metafile == 1);
-	    $keywords = ' ' if (!$keywords);
-	    $r->print(" ".$keywords.
+	    # $keywords = ' ' if (!$keywords);
+	    $r->print(' '.($keywords eq '' ? ' ' : $keywords).
 		      " \n");
 	}
-	if ($hash{'display_attrs_5'} == 1) {
+	if ($hash{'display_attrs_6'} == 1) {
 	    my $lang = &Apache::lonnet::metadata($filelink,'language')
 		if ($metafile == 1);
 	    $lang = &Apache::loncommon::languagedescription($lang);
-	    $lang = ' ' if (!$lang);
-	    $r->print(" ".$lang.
+	    $r->print(' '.($lang eq '' ? ' ' : $lang).
 		      " \n");
 	}
 	$r->print("\n");
@@ -752,7 +852,7 @@ sub display_line {
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
-	$r->print("$extrafield");
+	$r->print("$extrafield");
 	&begin_form ($r,$curdir);
 	my $indentm1 = $indent-1;
 	if ($indentm1 < 11 and $indentm1 > 0) {
@@ -805,6 +905,8 @@ sub start_fresh_session {
     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{$_};