[Lxr-commits] CVS: lxr/lib/LXR/Index Mysql.pm,1.14,1.15 Oracle.pm,1.3,1.4 Postgres.pm,1.12,1.13

[Dave B. <bro...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR/Index
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19976/lib/LXR/Index

Modified Files:
	Mysql.pm Oracle.pm Postgres.pm 
Log Message:
useage v. usage spelling difference; misc fixes for 'purge' statements

Index: Mysql.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Mysql.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Mysql.pm	15 Jul 2004 20:29:56 -0000	1.14
+++ Mysql.pm	15 Jul 2004 20:42:41 -0000	1.15
@@ -348,6 +348,11 @@
 	$self->{usage_select} = undef;
 	$self->{decl_select} = undef;
 	$self->{decl_insert} = undef;
+	$self->{delete_indexes} = undef;
+	$self->{delete_useage} = undef;
+	$self->{delete_status} = undef;
+	$self->{delete_releases} = undef;
+	$self->{delete_files} = undef;
 	
 	if($self->{dbh}) {
 		$self->{dbh}->disconnect();

Index: Oracle.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Oracle.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Oracle.pm	15 Jul 2004 20:29:56 -0000	1.3
+++ Oracle.pm	15 Jul 2004 20:42:41 -0000	1.4
@@ -93,8 +93,8 @@
 	  ("delete from indexes ".
 		 "where fileid in ".
 		 "  (select fileid from releases where release = ?)");
-	$self->{delete_useage} = $self->{dbh}->prepare
-	  ("delete from useage ".
+	$self->{delete_usage} = $self->{dbh}->prepare
+	  ("delete from usage ".
 		 "where fileid in ".
 		 "  (select fileid from releases where release = ?)");
 	$self->{delete_status} = $self->{dbh}->prepare
@@ -292,7 +292,7 @@
 	# we don't delete symbols, because they might be used by other versions
     # so we can end up with unused symbols, but that doesn't cause any problems
 	$self ->{delete_indexes}->execute($version);
-	$self ->{$delete_useage}->execute($version);
+	$self ->{$delete_usage}->execute($version);
 	$self ->{$delete_status}->execute($version);
 	$self ->{$delete_releases}->execute($version);
 	$self ->{$delete_files}->execute($version);
@@ -311,6 +311,11 @@
 	$self->{status_update} = undef;
 	$self->{usage_insert} = undef;
 	$self->{usage_select} = undef;
+	$self->{delete_indexes} = undef;
+	$self->{delete_useage} = undef;
+	$self->{delete_status} = undef;
+	$self->{delete_releases} = undef;
+	$self->{delete_files} = undef;
 
 	if($self->{dbh}) {
 		$self->{dbh}->disconnect();

Index: Postgres.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Postgres.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Postgres.pm	15 Jul 2004 20:29:56 -0000	1.12
+++ Postgres.pm	15 Jul 2004 20:42:41 -0000	1.13
@@ -30,7 +30,8 @@
 			$symbols_remove $symbols_insert $indexes_select $indexes_insert
 			$releases_select $releases_insert $status_insert
 			$status_update $usage_insert $usage_select $decl_select
-		    $declid_nextnum $decl_insert);
+			$declid_nextnum $decl_insert $delete_indexes $delete_usage
+			$delete_status $delete_releases $delete_files);
 
 
 sub new {
@@ -109,13 +110,12 @@
 	$decl_insert = $dbh->prepare
 	  ("insert into declarations (declid, langid, declaration) values (?, ?, ?)");
 
-
 	$delete_indexes = $dbh->prepare
 	  ("delete from indexes ".
 		 "where fileid in ".
 		 "  (select fileid from releases where release = ?)");
-	$delete_useage = $dbh->prepare
-	  ("delete from useage ".
+	$delete_usage = $dbh->prepare
+	  ("delete from usage ".
 		 "where fileid in ".
 		 "  (select fileid from releases where release = ?)");
 	$delete_status = $dbh->prepare
@@ -324,10 +324,11 @@
 	# we don't delete symbols, because they might be used by other versions
     # so we can end up with unused symbols, but that doesn't cause any problems
 	$delete_indexes->execute($version);
-	$delete_useage->execute($version);
+	$delete_usage->execute($version);
 	$delete_status->execute($version);
 	$delete_releases->execute($version);
 	$delete_files->execute($version);
+	commit_if_limit();
 	}
 
 sub setindexed {
@@ -360,7 +361,12 @@
 	$decl_select = undef;
 	$declid_nextnum= undef;
 	$decl_insert = undef;
-
+	$delete_indexes = undef;
+	$delete_usage = undef;
+	$delete_status = undef;
+	$delete_releases = undef;
+	$delete_files = undef;
+	
 	$dbh->commit();
 	$dbh->disconnect();
 	$dbh = undef;