--- trunk/index_DBI_cache.pm	2005/01/16 16:38:40	630
+++ trunk/index_DBI_cache.pm	2005/01/16 18:29:24	631
@@ -102,6 +102,8 @@
 
 	#$sth_cache{$field."select"}->execute($index_data) || die "cache: $field select; ".$self->{dbh}->errstr();
 
+	$index_data =~ s#&(\w)(acute|cedil|circ|grave|ring|slash|tilde|uml);#$1#gi;
+
 	my $uc = uc($index_data);
 	if (! $c_table->{$field}->{$uc}) {
 #print stderr "in index: $index_data\n";
@@ -179,6 +181,8 @@
 	while (my $row = $sth->fetchrow_hashref) {
 		$row->{item} = HTML::Entities::encode($row->{item},' <>&"');
 		$row->{display} = HTML::Entities::encode($row->{display},'<>&"');
+		$row->{item} =~ s#&amp;(\w)(acute|cedil|circ|grave|ring|slash|tilde|uml);#$1#gi;
+		$row->{display} =~ s#&amp;(\w)(acute|cedil|circ|grave|ring|slash|tilde|uml);#&$1$2;#gi;
 		push @arr,$row;
 	}
 	return @arr;