remove all accents from pager links

[webpac] / index_DBI_cache.pm

diff --git a/index_DBI_cache.pm b/index_DBI_cache.pm
index 724cd1f..b3741fa 100644 (file)
--- a/index_DBI_cache.pm
+++ b/index_DBI_cache.pm
@@ -51,6 +51,13 @@ sub new {
 
        $self->bench("connected to $dbd as $user");
 
+       # force SQLite to support binary 0 in data (which shouldn't
+       # happend, but it did to me)
+       eval {
+               no warnings 'all';
+               $self->{dbh}->{sqlite_handle_binary_nulls} = 1;
+       };
+
        return $self;
 }
 
@@ -62,11 +69,11 @@ sub delete_and_create {
 #print "#### delete_and_create($field)\n";
 
        my $sql = "select count(*) from $field";
-       my $sth = $self->{dbh}->prepare($sql) || die $self->{dbh}->errstr();
+       my $sth = $self->{dbh}->prepare($sql);
 # FIX: this is not a good way to check if table exists!
-       if ($sth->execute() && $sth->fetchrow_hashref) {
+       if ($sth && $sth->execute() && $sth->fetchrow_hashref) {
                my $sql = "drop table $field";
-               my $sth = $self->{dbh}->do($sql) || die "SQL: $sql ".$self->{dbh}->errstr();
+               my $sth = $self->{dbh}->do($sql) || warn "SQL: $sql - ".$sth->errstr();
        }
        $sql = "create table $field (
                        item varchar(255),
@@ -95,12 +102,7 @@ sub insert {
 
        #$sth_cache{$field."select"}->execute($index_data) || die "cache: $field select; ".$self->{dbh}->errstr();
 
-       # XXX for some strange reason, it seems that some entries in my
-       # database produce strings which start with null byte. I suspect
-       # this to be bug in OpenIsis 0.9.0.
-       # This should fix it..
-       $index_data =~ s/^[^\w]+//;
-       $index_data = substr($index_data,0,255);
+       $index_data =~ s#&(\w)(acute|cedil|circ|grave|ring|slash|tilde|uml);#$1#gi;
 
        my $uc = uc($index_data);
        if (! $c_table->{$field}->{$uc}) {
@@ -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;
@@ -195,10 +199,10 @@ sub close {
 
                $self->{dbh}->begin_work || die $self->{dbh}->errstr();
 
-               $self->bench("Sorting ".$Table{$table}." items in $table");
+               $self->bench("Sorting ".$Table{$table}." (with duplicates) items in $table");
                my @keys = sort keys %{$c_table->{$table}};
 
-               $self->bench("Dumping data into $table");
+               $self->bench("Dumping ".($#keys+1)." items into $table");
                my $sql = "insert into $table (ord,item,display,count) values (?,?,?,?)";
                my $sth = $self->{dbh}->prepare($sql) || die "sql: $sql; ".$self->{dbh}->errstr();