--- trunk/index_DBI.pm	2003/01/22 22:27:19	12
+++ trunk/index_DBI.pm	2003/06/01 13:46:42	50
@@ -10,14 +10,19 @@
 use DBI;
 
 my %Table;	# index tables which where visited in this run
+my %sth_cache;	# cache prepared statements
 
 sub new {
 	my $class = shift;
 	my $self = {};
 	bless($self, $class);
 
-	# FIX: config params
-	$self->{dbh} = DBI->connect("DBI:Pg:dbname=webpac","dpavlin","") || die $DBI::errstr;
+	my $dbd = shift || die "need dbi_dbd= in [global] section of configuration file";
+	my $dsn = shift || die "need dbi_dsn= in [global] section of configuration file";
+	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->{dbh} = DBI->connect("DBI:$dbd:$dsn",$user,$passwd) || die $DBI::errstr;
 	# begin transaction
 	$self->{dbh}->begin_work || die $self->{dbh}->errstr();
 
@@ -31,15 +36,18 @@
 
 	my $field = shift;
 
+#print "#### delete_and_create($field)\n";
+
 	$self->{dbh}->commit;
-	$self->{dbh}->begin_work;
 
 	my $sql = "select count(*) from $field";
 	my $sth = $self->{dbh}->prepare($sql) || die $self->{dbh}->errstr();
 # FIX: this is not a good way to check if table exists!
-	if (1 || $sth->execute() && $sth->fetchrow_hashref) {
+	if ($sth->execute() && $sth->fetchrow_hashref) {
 		my $sql = "drop table $field";
-#		my $sth = $self->{dbh}->do($sql) || die "SQL: $sql ".$self->{dbh}->errstr();
+		$self->{dbh}->begin_work;
+		my $sth = $self->{dbh}->do($sql) || die "SQL: $sql ".$self->{dbh}->errstr();
+		$self->{dbh}->commit;
 	}
 	$sql = "create table $field (
 			item varchar(255),
@@ -48,10 +56,11 @@
 			ord int,
 			primary key (item,ident)
 		)";
-#	$sth = $self->{dbh}->do($sql) || die "SQL: $sql ".$self->{dbh}->errstr();
-	$sth = $self->{dbh}->do($sql) || warn "SQL: $sql ".$self->{dbh}->errstr();
 
+	$self->{dbh}->begin_work;
+	$sth = $self->{dbh}->do($sql); # || warn "SQL: $sql ".$self->{dbh}->errstr();
 	$self->{dbh}->commit;
+
 	$self->{dbh}->begin_work;
 }
 
@@ -59,8 +68,8 @@
 	my $self = shift;
 
 	my $field = shift;
-	my $index_data = shift;
-	my $ident = shift;	# e.g. library id
+	my $index_data = shift || print STDERR "\$index->insert($field,NULL,...)";
+	my $ident = shift || '';	# e.g. library id
 
 	if (! $index_data) {
 		print STDERR "\$index->insert() -- no value to insert\n";
@@ -69,21 +78,25 @@
 
 	if (! $Table{$field}) {
 		$self->delete_and_create($field);
+
+		my $sql = "select item from $field where upper(item)=upper(?)";
+		$sth_cache{$field."select"} = $self->{dbh}->prepare($sql) || die $self->{dbh}->errstr();
+
+		$sql = "insert into $field (item,ident,count) values (?,?,?)";
+		$sth_cache{$field."insert"} = $self->{dbh}->prepare($sql) || die $self->{dbh}->errstr();
+
+		$sql = "update $field set count = count + 1 where item = ? and ident = ?";
+		$sth_cache{$field."update"} = $self->{dbh}->prepare($sql) || die $self->{dbh}->errstr();
 	}
 	$Table{$field}++;
 
-	my $sql = "select item from $field where upper(item)=upper(?)";
-	my $sth = $self->{dbh}->prepare($sql) || die $self->{dbh}->errstr();
-	$sth->execute($index_data) || die "sql: $sql; ".$self->{dbh}->errstr();
-	if (! $sth->fetchrow_hashref) {
-		my $sql = "insert into $field (item,ident,count) values (?,?,?)";
-		my $sth = $self->{dbh}->prepare($sql) || die $self->{dbh}->errstr();
-		$sth->execute($index_data,$ident,1) || die "sql: $sql; ".$self->{dbh}->errstr();
+	$sth_cache{$field."select"}->execute($index_data) || die "cache: $field select; ".$self->{dbh}->errstr();
+	if (! $sth_cache{$field."select"}->fetchrow_hashref) {
+		$index_data = substr($index_data,0,255);
+		$sth_cache{$field."insert"}->execute($index_data,$ident,1) || die "cache: $field insert; ".$self->{dbh}->errstr();
 #print stderr "in index: $index_data\n";
 	} else {
-		my $sql = "update $field set count = count + 1 where item = ? and ident = ?";
-		my $sth = $self->{dbh}->prepare($sql) || die $self->{dbh}->errstr();
-		$sth->execute($index_data,$ident) || die "sql: $sql; ".$self->{dbh}->errstr();
+		$sth_cache{$field."update"}->execute($index_data,$ident) || die "cache: $field update; ".$self->{dbh}->errstr();
 	}
 }
 
@@ -115,7 +128,7 @@
 
 	my @sql_args;
 
-	my $sql = "select $what from $field";
+	my $sql = "select $what,ord from $field";
 
 	if ($where) {
 		my $sql2 = " select ord from $field where upper($what) like upper(?)||'%'";
@@ -123,7 +136,7 @@
 
 		$sth->execute($where) || die "sql2: $sql2; ".$self->{dbh}->errstr();
 		if (my $row = $sth->fetchrow_hashref) {
-			$from_ord += $row->{ord};
+			$from_ord += $row->{ord} - 1;
 		}
 	}
 	$sql .= " order by ord limit $rows offset $from_ord";
@@ -132,7 +145,7 @@
 	$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},'<>&"');
 		push @arr,$row;
 	}
 	return @arr;
@@ -149,7 +162,7 @@
 
 		$self->{dbh}->begin_work || die $self->{dbh}->errstr();
 
-		my $sql = "select oid from $table order by item";
+		my $sql = "select oid from $table order by upper(item)";
 		my $sth = $self->{dbh}->prepare($sql) || die "sql: $sql; ".$self->{dbh}->errstr();
 		$sql = "update $table set ord=? where oid=?";
 		my $sth_update = $self->{dbh}->prepare($sql) || die "sql: $sql; ".$self->{dbh}->errstr();
@@ -172,6 +185,9 @@
 # FIX
 print STDERR "creating ord for $table...\n";
 			create_ord($table);
+			undef $sth_cache{$table."select"};
+			undef $sth_cache{$table."insert"};
+			undef $sth_cache{$table."update"};
 		}
 
 		$self->{dbh}->disconnect;