--- trunk/index_DBI_cache.pm	2004/02/10 10:20:50	225
+++ branches/tehnika/index_DBI_cache.pm	2005/01/16 18:57:15	633
@@ -51,6 +51,13 @@
 
 	$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,9 +69,9 @@
 #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) || warn "SQL: $sql - ".$sth->errstr();
 	}
@@ -95,12 +102,7 @@
 
 	#$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 @@
 	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;