LXR Cross Referencer

Update of /cvsroot/lxr/lxr/lib/LXR
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10802/lxr/lib/LXR

Modified Files:
	Config.pm 
Log Message:
Fix for [ 1277254 ] --url option needs better help

Produce better error messages if we can't find a configuration.

Index: Config.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Config.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Config.pm	21 Jul 2004 20:44:30 -0000	1.32
+++ Config.pm	10 Sep 2005 00:09:20 -0000	1.33
@@ -106,8 +106,16 @@
 			}
 		}
 	}
-
-	die "Can't find config for $url\n" if !defined $$self{baseurl};
+	
+	if(!defined $$self{baseurl}) {
+		if($url =~ m!http://.+\.!) {
+			die "Can't find config for $url: make sure there is a 'baseurl' line that matches in lxr.conf\n";
+		} else {	
+			# wasn't a url, so probably genxref with a bad --url parameter
+			die "Can't find config for $url: " . 
+			 	"the --url parameter should be a URL (e.g. http://example.com/lxr) and must match a baseurl line in lxr.conf\n";
+		}
+	}
 }
 
 sub allvariables {

Update of /cvsroot/lxr/lxr/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10802/lxr/tests

Modified Files:
	ConfigTest.pm 
Log Message:
Fix for [ 1277254 ] --url option needs better help

Produce better error messages if we can't find a configuration.

Index: ConfigTest.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/ConfigTest.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ConfigTest.pm	6 Sep 2004 21:54:45 -0000	1.2
+++ ConfigTest.pm	10 Sep 2005 00:09:20 -0000	1.3
@@ -52,6 +52,15 @@
 	$self->assert($#vars == 1, "Too many variables returned got " . $self->{config}->allvariables());
 }
 
+sub test_config_error {
+	my $self = shift;
+	my $t;
+	
+	eval {new LXR::Config("/a/path", "./lxr.conf")};
+	$t = $@;
+	$self->assert(defined($t), "Didn't fail to find config");
+	$self->assert_matches(qr/--url parameter should be a URL \(e\.g\. http:/, $t);
+}
 
 # set_up and tear_down are used to
 # prepare and release resources need for testing

Update of /cvsroot/lxr/lxr/lib/LXR
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13649/lxr/lib/LXR

Modified Files:
	Common.pm 
Log Message:
Fix Bug 1230443: Two letter directories fail.

Fix the various regexps in Common.pm

Index: Common.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Common.pm,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- Common.pm	15 May 2005 22:59:31 -0000	1.52
+++ Common.pm	9 Sep 2005 22:06:18 -0000	1.53
@@ -538,7 +538,7 @@
 	
 	if(defined $path) {
 		# First suppress anything after a dodgy character
-		$path =~ s!(^[\w_+-,.%^/\!]+).*!$1!;
+		$path =~ s!(^[\w_+\-,.%^/\!]+).*!$1!;
 		# Clean out /../
 		while ($path =~ m!/\.\.?/!) {
 			$path =~ s!/\.\.?/!/!g;

Update of /cvsroot/lxr/lxr/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13649/lxr/tests

Modified Files:
	SecurityTest.pm 
Log Message:
Fix Bug 1230443: Two letter directories fail.

Fix the various regexps in Common.pm

Index: SecurityTest.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/SecurityTest.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SecurityTest.pm	15 May 2005 22:55:23 -0000	1.3
+++ SecurityTest.pm	9 Sep 2005 22:06:18 -0000	1.4
@@ -143,6 +143,14 @@
 	$SIG{'__WARN__'} = $warn;
 	$self->assert($pathname eq '/a/test/path+!/some/%chars,v', "pathname not washed, got $pathname");
 	
+	$ENV{'PATH_INFO'} = '/ab/-/path+!/some/%chars,v';
+	$ENV{'QUERY_STRING'} = '';
+	$die = $SIG{'__DIE__'};
+	$warn = $SIG{'__WARN__'};
+	httpinit;
+	$SIG{'__DIE__'} = $die;
+	$SIG{'__WARN__'} = $warn;
+	$self->assert($pathname eq '/ab/-/path+!/some/%chars,v', "pathname not washed, got $pathname");
 }
 
 sub test_filename_compat {