--- loncom/interface/lonindexer.pm	2001/07/08 18:31:10	1.13
+++ loncom/interface/lonindexer.pm	2001/08/07 15:14:51	1.15
@@ -1,6 +1,8 @@
 # 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)
 # 11/23 Gerd Kortemeyer
 # 07/20-08/04 H.K. Ng
@@ -30,7 +32,8 @@ my $hidden;
 my $extrafield;
 my $fnum;
 sub BEGIN {
-    my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/language.tab');
+    my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
+			     '/language.tab');
     map {
 	$_=~/(\w+)\s+([\w\s\-]+)/;
 	$language{$1}=$2;
@@ -53,6 +56,10 @@ sub handler {
     my $tabdir  = $r->dir_config('lonTabDir');
 
     my $fileclr='#ffffe6';
+    my $line;
+    my (@attrchk,@openpath);
+    my $uri=$r->uri;
+
 # -------------------------------------- see if called from an interactive mode
     map {
        my ($name, $value) = split(/=/,$_);
@@ -60,44 +67,64 @@ sub handler {
        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
        if ($name eq 'catalogmode') {
            $ENV{'form.'.$name}=$value;
-	   }
+       }
+       if ($name eq 'launch') {
+           $ENV{'form.'.$name}=$value;
+       }
     } (split(/&/,$ENV{'QUERY_STRING'}));
 
     $hidden=''; my $closebutton='';
     my $groupimportbutton='';
     my $colspan=''; 
-    if ($ENV{'form.catalogmode'} eq 'interactive') {
-	$extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
-	    '<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
-	    ' border="0"></td>';
-	$colspan=" colspan='2' ";
-	$hidden=<<END;
+
+    $extrafield='';
+    my $diropendb = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
+
+    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
+	if ($ENV{'form.launch'} eq '1') {
+	    delete $hash{'mode_catalog'};
+	}
+	if ($hash{'mode_catalog'} eq 'interactive') {
+	    $ENV{'form.catalogmode'}='interactive';
+	}
+	if ($hash{'mode_catalog'} eq 'groupimport') {
+	    $ENV{'form.catalogmode'}='groupimport';
+	}
+
+	if ($ENV{'form.catalogmode'} eq 'interactive') {
+	    $hash{'mode_catalog'}='interactive';
+	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
+		'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
+		' border="0"></td>';
+	    $colspan=" colspan='2' ";
+	    $hidden=<<END;
 <input type='hidden' name='catalogmode' value='interactive'>
 END
-        $closebutton=<<END;
+            $closebutton=<<END;
 <input type="button" name="close" value='CLOSE' onClick="self.close()">
 END
-    }
-    elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
-	$extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
-	    '<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
-	    ' border="0"></td>';
-	$colspan=" colspan='2' ";
-	$hidden=<<END;
+         }
+	elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
+	    $hash{'mode_catalog'}='groupimport';
+	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
+		'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
+		' border="0"></td>';
+	    $colspan=" colspan='2' ";
+	    $hidden=<<END;
 <input type='hidden' name='catalogmode' value='groupimport'>
 END
-        $closebutton=<<END;
+            $closebutton=<<END;
 <input type="button" name="close" value='CLOSE' onClick="self.close()">
 END
-        $groupimportbutton=<<END;
+            $groupimportbutton=<<END;
 <input type="button" name="groupimport" value='GROUP IMPORT' onClick="javascript:select_group()">
 END
-    }
+        }
 
-    my $catalogmodefunctions='';
-    if ($ENV{'form.catalogmode'} eq 'interactive' or
-	$ENV{'form.catalogmode'} eq 'groupimport') {
-	$catalogmodefunctions=<<END;
+	my $catalogmodefunctions='';
+	if ($ENV{'form.catalogmode'} eq 'interactive' or
+	    $ENV{'form.catalogmode'} eq 'groupimport') {
+	    $catalogmodefunctions=<<END;
 function select_data(title,url) {
     changeTitle(title);
     changeURL(url);
@@ -156,15 +183,15 @@ function changeURL(val) {
     }
 }
 END
-    }
+        }
 
 # ---------------------------------------------------------------- Print Header
-    $r->print(<<ENDHEADER);
+	$r->print(<<ENDHEADER);
 <html>
 <head>
 <title>The LearningOnline Network With CAPA Directory Browser</title>
 
-<SCRIPT language="javascript">
+<script language="javascript">
 $catalogmodefunctions
 function openWindow(url, wdwName, w, h, toolbar,scrollbar) {
     var options = "width=" + w + ",height=" + h + ",";
@@ -173,20 +200,19 @@ function openWindow(url, wdwName, w, h,
     var newWin = window.open(url, wdwName, options);
     newWin.focus();
 }
-</SCRIPT>
+</script>
 
 </head>
 <body bgcolor="#FFFFFF">
 ENDHEADER
 
-    my $line;
-    my (@attrchk,@openpath);
-    my $uri=$r->uri;
-
-    $r->print('<h2><font color="#888888">The LearningOnline With CAPA Network Directory Browser</font></h2>'."\n");
-
-    my $diropendb = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
-
+	$r->print('<h2><font color="#888888">The LearningOnline With CAPA Network Directory Browser</font></h2>'."\n");
+    }
+    else {
+	$r->print('<html><head></head><body>Unable to tie hash to db file</body></html>');
+	return OK;
+    }
+    untie %hash;
     if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
 
 	if ($ENV{'form.attrs'} ne "") {
@@ -202,7 +228,7 @@ ENDHEADER
 		$attrchk[$i] = "checked" if $hash{'display_attrs_'.$i} == 1;
 	    }
 	}
-    $r->print(<<END);
+	$r->print(<<END);
 <b><font color="#666666">Display file attributes</font></b><br>
 <form method="post" name="fileattr" action="$uri" enctype="application/x-www-form-urlencoded">
 <table border=0><tr>
@@ -223,17 +249,17 @@ $groupimportbutton
 </form>
 END
 
-    my $titleclr="#ddffff";
-    $r->print("<table border=0><tr><td bgcolor=#eeeeee>\n");
-    $r->print("<table border=0><tr>\n");
-    $r->print("<td $colspan bgcolor=$titleclr><b>Name</b></td>\n");
-    $r->print("<td bgcolor=$titleclr align=right><b>Size (bytes) </b></td>\n") if ($hash{'display_attrs_0'} == 1);
-    $r->print("<td bgcolor=$titleclr><b>Last accessed</b></td>\n") if ($hash{'display_attrs_1'} == 1);
-    $r->print("<td bgcolor=$titleclr><b>Last modified</b></td>\n") if ($hash{'display_attrs_2'} == 1);
-    $r->print("<td bgcolor=$titleclr><b>Author(s)</b></td>\n") if ($hash{'display_attrs_3'} == 1);
-    $r->print("<td bgcolor=$titleclr><b>Keywords</b></td>\n") if ($hash{'display_attrs_4'} == 1);
-    $r->print("<td bgcolor=$titleclr><b>Language</b></td>\n") if ($hash{'display_attrs_5'} == 1);
-    $r->print("</tr>");
+        my $titleclr="#ddffff";
+        $r->print("<table border=0><tr><td bgcolor=#eeeeee>\n");
+	$r->print("<table border=0><tr>\n");
+	$r->print("<td $colspan bgcolor=$titleclr><b>Name</b></td>\n");
+	$r->print("<td bgcolor=$titleclr align=right><b>Size (bytes) </b></td>\n") if ($hash{'display_attrs_0'} == 1);
+	$r->print("<td bgcolor=$titleclr><b>Last accessed</b></td>\n") if ($hash{'display_attrs_1'} == 1);
+	$r->print("<td bgcolor=$titleclr><b>Last modified</b></td>\n") if ($hash{'display_attrs_2'} == 1);
+	$r->print("<td bgcolor=$titleclr><b>Author(s)</b></td>\n") if ($hash{'display_attrs_3'} == 1);
+	$r->print("<td bgcolor=$titleclr><b>Keywords</b></td>\n") if ($hash{'display_attrs_4'} == 1);
+	$r->print("<td bgcolor=$titleclr><b>Language</b></td>\n") if ($hash{'display_attrs_5'} == 1);
+	$r->print("</tr>");
 
 	map {
 	    if ($_ =~ /^diropen_status_/) {
@@ -557,7 +583,7 @@ sub display_line{
 
 }
 
-#---------------------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;