bugfix: check Isis database error in correct place

[webpac] / index_DBI_cache.pm

diff --git a/index_DBI_cache.pm b/index_DBI_cache.pm
index dc9a911..b3741fa 100644 (file)
--- a/index_DBI_cache.pm
+++ b/index_DBI_cache.pm
@@ -102,6 +102,8 @@ sub insert {
 
        #$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 @@ sub fetch {
        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;