use strict qw(vars);
use vars qw($Count);
use HTML::Entities;
+use URI::Escape;
+use locale;
use DBI;
my $user = shift || die "need dbi_user= in [global] section of configuration file";
my $passwd = shift || die "need dbi_passwd= in [global] section of configuration file";
+ $self->{dbd} = $dbd;
+
$self->{dbh} = DBI->connect("DBI:$dbd:$dsn",$user,$passwd) || die $DBI::errstr;
$Count++;
$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;
}
# FIX: this is not a good way to check if table exists!
if ($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),
+ display text,
count int,
ord int,
primary key (item)
my $field = shift;
my $index_data = shift || print STDERR "\$index->insert($field,NULL,...)";
- my $ident = shift || ''; # e.g. library id
+ my $display = shift || $index_data;
if (! $index_data) {
print STDERR "\$index->insert() -- no value to insert\n";
if (! $c_table->{$field}->{$uc}) {
#print stderr "in index: $index_data\n";
$c_table->{$field}->{$uc} = $index_data;
+ $c_table->{$field}->{$uc}->{display} = $display;
$c_count->{$field}->{$uc} = 1;
} else {
$c_count->{$field}->{$uc}++;
my ($total) = $sth->fetchrow_array();
- return $total;
+ # no results, count all
+ if (! $total) {
+ my $sql = "select count(*) from $field";
+
+ my $sth = $self->{dbh}->prepare($sql) || die $self->{dbh}->errstr();
+ $sth->execute() || die "sql: $sql; ".$self->{dbh}->errstr();
+ $total = $sth->fetchrow_array();
+
+ }
+
+ return $total || 1;
}
my @sql_args;
- my $sql = "select item,ord from $field";
+ my $sql = "select item,display,ord from $field";
if ($where) {
my $sql2 = "select ord from $field where upper(item) like upper(?)||'%'";
} else {
# if no match is found when searching from beginning
# of word in index, try substring match anywhere
- $sql2 = "select ord from $field where upper(item) like '%'||upper(?)||'%'";
+ $sql2 = "select ord from $field where upper(item) like '% '||upper(?)||'%'";
$sth = $self->{dbh}->prepare($sql2) || die "sql2: $sql2; ".$self->{dbh}->errstr();
$sth->execute($where) || die "sql2: $sql2; ".$self->{dbh}->errstr();
if (my $row = $sth->fetchrow_hashref) {
$sth->execute() || die "execute: $sql; ".$self->{dbh}->errstr();
my @arr;
while (my $row = $sth->fetchrow_hashref) {
- $row->{item} = HTML::Entities::encode($row->{item},'<>&"');
+ $row->{item} = HTML::Entities::encode($row->{item},' <>&"');
+ $row->{display} = HTML::Entities::encode($row->{display},'<>&"');
push @arr,$row;
}
return @arr;
$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");
- my $sql = "insert into $table (ord,item,count) values (?,?,?)";
+ $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();
my $ord = 0;
foreach my $key (@keys) {
$sth->execute(++$ord,
$c_table->{$table}->{$key},
+ $c_table->{$table}->{$key}->{display},
$c_count->{$table}->{$key}
);
}
$self->{dbh}->commit || die $self->{dbh}->errstr();
}
+
+ if ($self->{dbd} =~ m/(Pg|SQLite)/) {
+ $self->{dbh}->do(qq{vacuum}) || warn "vacumming failed. It shouldn't if you are using PostgreSQL or SQLite: ".$self->{dbh}->errstr();
+ }
+
$self->bench("disconnecting from database");
$self->{dbh}->disconnect;