From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 12 Aug 2009 11:15:54 +0000 (+0100)
Subject: Fix nonunique island/arch name reporting
X-Git-Tag: 3.4~221
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=commitdiff_plain;h=beff42c07503b7a74bd455d1c299341d16a493cd

Fix nonunique island/arch name reporting
---

diff --git a/yarrg/web/routetextstring b/yarrg/web/routetextstring
index 70d6144..4cec5f9 100644
--- a/yarrg/web/routetextstring
+++ b/yarrg/web/routetextstring
@@ -46,23 +46,23 @@ foreach my $each (split m#[/|,]#, $string) {
 		$output_wrong->($msg);
 		$m->abort();
 	};
-	my @m;
+	my %m;
 	my $results;
 	foreach my $pat ("$each\%", "\%$each\%") {
 		$sth->execute($pat,$pat);
 		$results= $sth->fetchall_arrayref();
 		last if @$results==1;
-		push @m, @$results;
+		map { $m{ $_->[2] }=1 } @$results;
 		$results= undef;
 	}
 	if (!$results) {
-		if (!@m) {
+		if (!%m) {
 			$err->('no island or arch matches "%s"');
-		} elsif (@m > 3) {
+		} elsif (%m > 5) {
 			$err->('&nbsp;');
 		} else {
 			$err->('ambiguous island or arch "%s", could be '.
-				join(', ', map { $_->[2] } @m));
+				join(', ', sort keys %m));
 		}
 	}
 	push @results, $results->[0];