--- trunk/index_DBI_filter.pm	2005/01/23 15:18:03	643
+++ branches/ffzg/index_DBI_filter.pm	2005/03/13 02:03:30	697
@@ -11,10 +11,9 @@
 use vars qw($Count);
 use HTML::Entities;
 use URI::Escape;
-use locale;
 use Carp;
-
 use DBI;
+use locale;
 
 # bench time
 my $bench_time = time();
@@ -60,21 +59,21 @@
 sub delete_and_create {
 	my $self = shift;
 
-	my $index = shift || croak "need index name!";
+	my $table = shift || croak "need table name!";
 	my $sql = shift || croak "need sql to create table!";
 
-	print STDERR "## delete_and_create($index)\n" if ($debug);
+	print STDERR "## delete_and_create($table)\n" if ($debug);
 
-	my $sql_delete = "delete from $index";
-	my $sth = $self->{dbh}->prepare($sql_delete) || confess "can't prepare: $sql_delete";
+	my $sql_delete = "delete from $table";
+	my $sth = $self->{dbh}->prepare($sql_delete);
 
-	if ($sth->execute()) {
-		print STDERR "## deleted rows from table $index\n" if ($debug);
+	if ($sth && $sth->execute()) {
+		print STDERR "## deleted rows from table $table\n" if ($debug);
 	} else {
 		# can't delete from table, assume it doesn't exists!
 		$self->{dbh}->rollback;
 		$self->{dbh}->do($sql) || confess "SQL: $sql ".$self->{dbh}->errstr();
-		print STDERR "## creating table $index\n" if ($debug);
+		print STDERR "## creating table $table\n" if ($debug);
 		$self->{dbh}->begin_work;
 	}
 }
@@ -103,7 +102,7 @@
 
 	if (! $self->{c}->{$uc}->{$field}) {
 #print stderr "in index: $index_data\n";
-		$self->{c}->{$uc}->{$field}->{item} = $index_data;
+		$self->{c}->{$uc}->{$field}->{item} = lc($index_data);
 		$self->{c}->{$uc}->{$field}->{display} = $display;
 	}
 
@@ -119,14 +118,14 @@
 
 	my $filter = shift;
 
-	my $tables_sql = 'index';
+	my $tables_sql = 'data';
 	my $where_sql = '';
-	my @sql_args = ( $field, $where );
+	my @sql_args = ( $field, lc($where) );
 
 	if ($filter) {
 		$tables_sql .= ",filters";
 		$where_sql .= "
-			and index.ord = filters.ord
+			and data.ord = filters.ord
 			and filter = ?
 		";
 		push @sql_args, $filter;
@@ -135,7 +134,7 @@
 	my $sql = qq{
 		select count(*)
 		from $tables_sql
-		where name = ? and upper(item) like upper(?)||'%'
+		where name = ? and item like ?||'%'
 		$where_sql
 	};
 
@@ -149,7 +148,7 @@
 		my $sql = qq{
 			select count(*)
 			from $tables_sql
-			where index.name = ?
+			where data.name = ?
 			$where_sql
 		};
 
@@ -178,15 +177,15 @@
 
 	my $from_ord = 0;
 
-	my $tables_sql = 'index';
+	my $tables_sql = 'data';
 	my $where_sql = '';
 
-	my @sql_args = ( $field, $where );
+	my @sql_args = ( $field, lc($where) );
 
 	if ($filter) {
 		$tables_sql .= ",filters";
 		$where_sql .= "
-			and index.ord = filters.ord
+			and data.ord = filters.ord
 			and filter = ?
 		";
 		push @sql_args, $filter;
@@ -194,51 +193,55 @@
 
 	if ($where) {
 		my $sql2 = qq{
-			select index.ord as ord
+			select data.ord as ord
 			from $tables_sql
-			where name = ? and upper(item) like upper(?)||'%'
+			where name = ? and item like ?||'%'
 			$where_sql
+			order by data.ord
 		};
 		my $sth = $self->{dbh}->prepare($sql2) || confess "sql2: $sql2; ".$self->{dbh}->errstr();
 
 		$sth->execute(@sql_args) || confess "sql2: $sql2; ".$self->{dbh}->errstr();
 		if (my $row = $sth->fetchrow_hashref) {
-			$from_ord += $row->{ord} - 1;
+			$from_ord = $row->{ord} - 1;
 		} else {
 			# if no match is found when searching from beginning
 			# of word in index, try substring match anywhere
 			$sql2 = qq{
-				select index.ord as ord
+				select data.ord as ord
 				from $tables_sql
-				where name = ? and upper(item) like '% '||upper(?)||'%'
+				where name = ? and item like '%'||?||'%'
 				$where_sql
+				order by data.ord
 			};
 	
 			$sth = $self->{dbh}->prepare($sql2) || confess "sql2: $sql2; ".$self->{dbh}->errstr();
 			$sth->execute(@sql_args) || confess "sql2: $sql2; ".$self->{dbh}->errstr();
 
 			if (my $row = $sth->fetchrow_hashref) {
-				$from_ord += $row->{ord} - 1;
+				$from_ord = $row->{ord} - 1;
 			}
 		}
 	}
 
 	@sql_args = ( $field, $from_ord );
 	push @sql_args, $filter if ($filter);
-	push @sql_args, ( $rows, $offset );
 
 	my $sql = qq{
-		select item,display,index.count as count
+		select item,display,data.count as count
 		from $tables_sql
 		where name = ?
-			and index.ord > ?
+			and data.ord > ?
 		$where_sql
-			order by index.ord
-			limit ? offset ?
+			order by data.ord
 	};
 
+	# fix SQLite problem which doesn't allow placeholders in limit and offset
+	# http://thread.gmane.org/gmane.comp.db.sqlite.general/9707
+	$sql .= "limit $rows offset $offset";
+
 	my $sth = $self->{dbh}->prepare($sql) || confess "prepare: $sql; ".$self->{dbh}->errstr();
-	$sth->execute(@sql_args) || confess "execute: $sql; ".$self->{dbh}->errstr();
+	$sth->execute(@sql_args) || confess "execute: $sql; ".join("|",@sql_args)." ".$self->{dbh}->errstr();
 	my @arr;
 	while (my $row = $sth->fetchrow_hashref) {
 		$row->{item} = HTML::Entities::encode($row->{item},' <>&"');
@@ -257,8 +260,8 @@
 
 	$self->{dbh}->begin_work || confess $self->{dbh}->errstr();
 
-	$self->delete_and_create('index', qq{
-		create table index (
+	$self->delete_and_create('data', qq{
+		create table data (
 			name varchar(255),
 			ord int,
 			item text,
@@ -282,7 +285,7 @@
 	$self->bench("got ".($#items+1)." items, now sorting");
 	@items = sort @items;
 
-	my $sql = "insert into index  (name,ord,item,display,count) values (?,?,?,?,?)";
+	my $sql = "insert into data (name,ord,item,display,count) values (?,?,?,?,?)";
 	my $sth_index = $self->{dbh}->prepare($sql) || confess "$sql: ".$self->{dbh}->errstr();
 
 	$sql = "insert into filters (filter, ord, count) values (?,?,?)";