diff -u -r ./find /var/www/mxr/find
--- ./find	2006-02-03 03:37:55.000000000 +0200
+++ /var/www/mxr/find	2006-05-29 23:51:50.000000000 +0300
@@ -23,7 +23,7 @@
 
 ######################################################################
 
-use lib 'lib/';
+use lib 'lib';
 use LXR::Common;
 use LXR::Config;
 
diff -u -r ./ident /var/www/mxr/ident
--- ./ident	2006-05-29 11:25:33.000000000 +0300
+++ /var/www/mxr/ident	2006-05-29 23:51:46.000000000 +0300
@@ -23,7 +23,7 @@
 
 ######################################################################
 
-use lib 'lib/';
+use lib 'lib';
 use LXR::Common;
 use LXR::Config;
 use DB_File;
@@ -79,7 +79,7 @@
 	@refs = split(/\t/,$xref{$identifier});
 
 	print("<h1>$identifier</h1>\n");
-        print("<p><i>If you can't find what you're looking for, you can always <a href='search?string=\\b$identifier\\b&regexp=on&find=$filter'>search</a> for it.</i></p>");
+        print("<p><i>If you can't find what you're looking for, you can always <a href='search?string=$identifier&find=$filter&filter=\\b$identifier\\b'>search</a> for it.</i></p>");
 
 	if (@refs) {
 	    tie(%fileidx, "DB_File", $Conf->dbdir."/fileidx", 
diff -u -r ./index.cgi /var/www/mxr/index.cgi
--- ./index.cgi	2005-07-06 22:41:50.000000000 +0300
+++ /var/www/mxr/index.cgi	2006-05-30 00:07:37.000000000 +0300
@@ -1,12 +1,22 @@
 #!/usr/bin/perl 
-print "Content-Type: text/html
+use lib 'lib';
+use LXR::Common;
+use LXR::Config;
+
+($Conf, $HTTP, $Path) = &init($0);
 
-";
 if ($ENV{SCRIPT_NAME}=~m%(?:/[^/]+){3,}%) {
 open INDEX, "<index.html";
 } else {
 open INDEX, "<root/index.html";
 }
-print while <INDEX>;
+
+{
+local $/ = undef;
+my $template = <INDEX>;
+print &expandtemplate($template,
+                      'rootname', sub { return $Conf->{'sourceprefix'}; }
+                     );
+}
 close INDEX;
 
diff -u -r ./index.html /var/www/mxr/index.html
--- ./index.html	2006-05-29 11:14:13.000000000 +0300
+++ /var/www/mxr/index.html	2006-05-29 23:20:30.000000000 +0300
@@ -32,7 +32,7 @@
       <TABLE BORDER=0 CELLPADDING=0 CELLSPACING=2 WIDTH="100%">
        <TR>
         <TD>
-         <FONT SIZE="+1"><A HREF="source/"><B>/mozilla</B></A></FONT>
+         <FONT SIZE="+1"><A HREF="source/"><B>/$rootname</B></A></FONT>
         </TD>
         <TD>
          <FONT SIZE="-1">
diff -u -r ./lib/LXR/Common.pm /var/www/mxr/lib/LXR/Common.pm
--- ./lib/LXR/Common.pm	2006-05-29 11:15:34.000000000 +0300
+++ /var/www/mxr/lib/LXR/Common.pm	2006-05-30 00:48:13.000000000 +0300
@@ -589,7 +589,7 @@
     unshift(@pathelem, $Conf->sourcerootname.'/');
     unshift(@addrelem, $fix);
     
-    foreach (0..$#pathelem) {
+    foreach (1..$#pathelem) {
 	if (defined($addrelem[$_])) {
 
 	    # jwz: put a space after each / in the banner so that it's possible
diff -u -r ./lib/LXR/Config.pm /var/www/mxr/lib/LXR/Config.pm
--- ./lib/LXR/Config.pm	2005-12-06 08:55:07.000000000 +0200
+++ /var/www/mxr/lib/LXR/Config.pm	2006-05-30 00:39:17.000000000 +0300
@@ -44,7 +44,7 @@
         #component from the script name which will be of the form: 
         # /seamonkey/source
         $self->{'treename'} = $ENV{'SCRIPT_NAME'};
-        $self->{'treename'} =~ s/.*\/([^\/]+)\/[\w]*/$1/;
+        $self->{'treename'} =~ s|.*/([^/]+)/[^/]*|$1|;
 
         #Match the tree name against our list of trees and extract the proper
         #directory. Set "sourceroot" to this directory.
@@ -253,7 +253,7 @@
 
 sub sourcerootname {
     my $self = shift;
-    return($self->varexpand($self->{'srcrootname'}));
+    return($self->varexpand(defined $self->{'sourceprefix'} ? $self->{'sourceprefix'} : $self->{'srcrootname'}));
 }
 
 sub virtroot{
diff -u -r ./lxr.conf /var/www/mxr/lxr.conf
--- ./lxr.conf	2006-05-29 11:14:13.000000000 +0300
+++ /var/www/mxr/lxr.conf	2006-05-30 00:45:42.000000000 +0300
@@ -73,7 +73,7 @@
 sourceroot: webtools /var/www/html/mxr/lxr-root/lxr-data/webtools/webtools
 sourceprefix: webtools webtools
 sourceroot: mxr-test /var/www/html/mxr-test
-sourceprefix: mxr-test mxr-test
+sourceprefix: mxr-test mozilla/webtools/mxr-test
 sourceroot: bugzilla /var/www/html/mxr/lxr-root/lxr-data/bugzilla/bugzilla
 sourceprefix: bugzilla webtools/bugzilla
 sourceroot: bugzilla2.22.x /var/www/html/mxr/lxr-root/lxr-data/bugzilla2.22.x/bugzilla
 
 
Binary files ./patches/mxr-test.zip and /var/www/mxr/patches/mxr-test.zip differ
diff -u -r ./search /var/www/mxr/search
--- ./search	2006-05-29 11:17:08.000000000 +0300
+++ /var/www/mxr/search	2006-05-29 23:51:41.000000000 +0300
@@ -23,7 +23,7 @@
 
 ######################################################################
 
-use lib 'lib/';
+use lib 'lib';
 use LXR::Common;
 use LXR::Config;
 
diff -u -r ./source /var/www/mxr/source
--- ./source	2006-05-28 13:19:30.000000000 +0300
+++ /var/www/mxr/source	2006-05-30 00:49:50.000000000 +0300
@@ -23,7 +23,7 @@
 ######################################################################
 
 use Local;
-use lib 'lib/';
+use lib 'lib';
 use SimpleParse;
 use LXR::Common;
 use LXR::Config;
@@ -196,6 +196,8 @@
 	foreach $f (sort(grep/^[^\.]/,readdir(DIR))) {
 	    if ($f eq "CVS") {
 		# skip it
+	    } elsif ($f eq ".svn") {
+		# skip it
 	    } elsif (-d $Path->{'real'}.$f) {
 		push(@dirs,"$f/");
 	    } else {
diff -u -r ./update-search.pl /var/www/mxr/update-search.pl
--- ./update-search.pl	2006-05-29 11:14:13.000000000 +0300
+++ /var/www/mxr/update-search.pl	2006-05-30 00:50:35.000000000 +0300
@@ -45,6 +45,8 @@
 
 # don't index CVS files
 system("echo '/CVS/' > .glimpse_exclude");
+# don't index SVN files
+system("echo '/.svn/' >> .glimpse_exclude");
 
 #XXX what does |set -e| mean?
 #system ("set -e >> $log");