The 'modules' list on the main query page was just all wrong.

webtools/bonsai/CGI.pl

@@ -265,7 +265,7 @@ sub cvsmenu {
                $desc = $::TreeInfo{$i}{'description'} unless $desc;
 
                $root    = "cvsroot=$::TreeInfo{$i}{'repository'}";
-               $module  = "module=$i";
+               $module  = "module=$::TreeInfo{$i}{'module'}";
                print "<li><a href=\"$page?$root&$module$branch\">$desc</a>\n";
           };
           print "</ul>\n";

webtools/bonsai/cvsqueryform.cgi

@@ -22,8 +22,6 @@
 
 require 'CGI.pl';
 
-use vars qw(@LegalDirs);
-
 $|=1;
 
 print "Content-type: text/html\n\n";
@@ -34,6 +32,9 @@ $CVS_ROOT = pickDefaultRepository() unless $CVS_ROOT;
 $::TreeID = $::FORM{'module'} 
      if (exists($::TreeInfo{$::FORM{'module'}}{'repository'}));
 
+$modules = {};
+require 'modules.pl';
+
 PutsHeader("Bonsai - CVS Query Form", "CVS Query Form",
            "$CVS_ROOT - $::TreeInfo{$::TreeID}{shortdesc}");
 
@@ -90,11 +91,11 @@ else {
 #
 # Print out all the Different Modules
 #
-LoadDirList();
-for $k  (sort( grep(!/\*$/, @::LegalDirs) ) ){
-    print "<OPTION value='$k'>$k\n" if ($k ne $Module);
+for $k  (sort( keys( %$modules ) ) ){
+    print "<OPTION value='$k'>$k\n";
 }
 
+
 print "</SELECT></td>\n";
 print "<td rowspan=2>";
 cvsmenu();

webtools/bonsai/modules.pl

@@ -16,7 +16,6 @@
 # Corporation. Portions created by Netscape are Copyright (C) 1998
 # Netscape Communications Corporation. All Rights Reserved.
 
-require 'utils.pl';
 
 $NOT_LOCAL = 1;
 $IS_LOCAL = 2;