Update of /cvsroot/lxr/lxr/lib/LXR
In directory sc8-pr-cvs1:/tmp/cvs-serv30165/lib/LXR
Modified Files:
Config.pm
Log Message:
Apply patch [ 608981 ] Support baseurl_aliases in lxr.conf from surazal.
Now the lxr.conf file can contain baseurl_aliases sections which allows one
configuration to be accessed at multiple urls.
Index: Config.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Config.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Config.pm 26 Feb 2002 15:59:32 -0000 1.26
+++ Config.pm 5 Jun 2003 15:39:15 -0000 1.27
@@ -84,13 +84,26 @@
die($@) if $@;
my $config;
- foreach $config (@config) {
+ if (scalar(@config) > 0) {
+ %$self = (%$self, %{$config[0]});
+ }
+ CANDIDATE: foreach $config (@config) {
if ($config->{baseurl}) {
- my $root = quotemeta($config->{baseurl});
- next unless $url =~ /^$root/;
+ my @aliases;
+ if ($config->{baseurl_aliases}) {
+ @aliases = @{$config->{baseurl_aliases}};
+ }
+ my $root = $config->{baseurl};
+ push @aliases, $root;
+ foreach my $rt (@aliases) {
+ my $r = quotemeta($rt);
+ if ($url =~ /^$r/) {
+ $config->{baseurl} = $rt;
+ %$self = (%$self, %$config);
+ last CANDIDATE;
+ }
+ }
}
-
- %$self = (%$self, %$config);
}
die "Can't find config for $url\n" if !defined $$self{baseurl};
|
