--- trunk/index_DBI_cache.pm	2003/07/13 19:30:28	94
+++ trunk/index_DBI_cache.pm	2003/10/30 01:02:22	142
@@ -107,19 +107,30 @@
 	}
 }
 
-sub check {
+sub count {
 	my $self = shift;
 
 	my $field = shift;
+	my $where = shift;
 
-	my $sql = "select count(*) from $field";
+	my $sql = "select count(*) from $field where upper(item) like upper(?)||'%'";
 
 	my $sth = $self->{dbh}->prepare($sql) || die $self->{dbh}->errstr();
-	$sth->execute() || die "sql: $sql; ".$self->{dbh}->errstr();
+	$sth->execute($where) || die "sql: $sql; ".$self->{dbh}->errstr();
 
 	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;
 }
 
 
@@ -127,7 +138,6 @@
 	my $self = shift;
 
 	my $field = shift;
-	my $what = shift || 'item';	# 'item,ident'
 	my $where = shift;
 
 	my $from_ord = shift || 0;
@@ -135,15 +145,24 @@
 
 	my @sql_args;
 
-	my $sql = "select $what,ord from $field";
+	my $sql = "select item,ord from $field";
 
 	if ($where) {
-		my $sql2 = " select ord from $field where upper($what) like upper(?)||'%'";
+		my $sql2 = "select ord from $field where upper(item) like upper(?)||'%'";
 		my $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) {
 			$from_ord += $row->{ord} - 1;
+		} 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(?)||'%'";
+			$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) {
+				$from_ord += $row->{ord} - 1;
+			}
 		}
 	}
 	$sql .= " order by ord limit $rows offset $from_ord";
@@ -178,7 +197,7 @@
 
 		my $ord = 0;
 		foreach my $key (@keys) {
-			$sth->execute($ord++,
+			$sth->execute(++$ord,
 				$c_table->{$table}->{$key},
 				$c_count->{$table}->{$key}
 			);