Bug 235479 html templates assume cvsroot heirarchy of 'mozilla'

patch by Chris.Yeh@nokia.com r=timeless

webtools/lxr/lib/LXR/Common.pm

@@ -1,4 +1,4 @@
-# $Id: Common.pm,v 1.26 2004-07-14 23:08:22 timeless%mozdev.org Exp $
+# $Id: Common.pm,v 1.27 2005-11-20 22:10:38 timeless%mozdev.org Exp $
 
 package LXR::Common;
 
@@ -575,6 +575,9 @@ sub treename {
     return $Conf->{'treename'};
 }
 
+sub bonsaicvsroot {
+    return $Conf->{'bonsaicvsroot'};
+}
 
 sub titleexpand {
     if ($who eq 'source' || $who eq 'sourcedir' || $who eq 'diff') {
@@ -790,15 +793,16 @@ sub makeheader {
 #	  "</head>\n",
 
     	  &expandtemplate($template,
-			  ('title',	\&titleexpand),
-			  ('banner',	\&bannerexpand),
-			  ('baseurl',	\&baseurl),
-			  ('dotdoturl',	\&dotdoturl),
-			  ('thisurl',	\&thisurl),
-			  ('pathname',	\&pathname),
-			  ('treename',	\&treename),
-    			  ('modes',	\&modeexpand),
-    			  ('variables',	\&varexpand)));
+			  ('title',		\&titleexpand),
+			  ('banner',		\&bannerexpand),
+			  ('baseurl',		\&baseurl),
+			  ('dotdoturl',		\&dotdoturl),
+			  ('thisurl',		\&thisurl),
+			  ('pathname',		\&pathname),
+			  ('treename',		\&treename),
+    			  ('modes',		\&modeexpand),
+    			  ('bonsaicvsroot',	\&bonsaicvsroot),
+    			  ('variables',		\&varexpand)));
 }
 
 

webtools/lxr/lib/LXR/Config.pm

@@ -1,4 +1,4 @@
-# $Id: Config.pm,v 1.5 2002-08-16 01:31:20 myk%mozilla.org Exp $
+# $Id: Config.pm,v 1.6 2005-11-20 22:10:40 timeless%mozdev.org Exp $
 
 package LXR::Config;
 
@@ -61,6 +61,12 @@ sub treeify {
         #append tree name to dbdir
         $self->{'dbdir'} =  $self->{'dbdir'} . "/" . $self->{'treename'} ;
 
+        #find the cvsroot to sed in proper bonsai url
+        my $path = $self->{'sourceroot'};
+        my @pathdirs = split(/\//, $path);
+        my $pathnum = @pathdirs;
+        $self->{'bonsaicvsroot'} = $pathdirs[$pathnum - 1]; 
+
     }
     return($self);
 }