[Lxr-commits] CVS: lxr/lib/LXR/Index Postgres.pm, 1.28, 1.29 Oracle.pm, 1.17, 1.18

[AdrianIssott <adr...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR/Index
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29088/lib/LXR/Index

Modified Files:
	Postgres.pm Oracle.pm 
Log Message:
Feature 1691378 (Rearchitect the DB backends) Part VII
* Further standisation of LXR::Index modules
* Changed parameter for LXR::Index::purge() from $version -> $release in Oracle and Postgres modules

Index: Postgres.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Postgres.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Postgres.pm	9 May 2009 15:39:00 -0000	1.28
+++ Postgres.pm	9 May 2009 15:56:56 -0000	1.29
@@ -367,15 +367,15 @@
 }
 
 sub purge {
-    my ($self, $version) = @_;
+    my ($self, $release) = @_;
 
     # 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_usage->execute($version);
-    $delete_status->execute($version);
-    $delete_releases->execute($version);
-    $delete_files->execute($version);
+    $self->{delete_indexes}->execute($release);
+    $self->{delete_usage}->execute($release);
+    $self->{delete_status}->execute($release);
+    $self->{delete_releases}->execute($release);
+    $self->{delete_files}->execute($release);
     _commitIfLimit();
 }
 

Index: Oracle.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Oracle.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Oracle.pm	9 May 2009 15:39:00 -0000	1.17
+++ Oracle.pm	9 May 2009 15:56:56 -0000	1.18
@@ -24,9 +24,12 @@
 use DBI;
 use LXR::Common;
 
-use vars qw(%files %symcache @ISA $prefix);
+our @ISA = ("LXR::Index");
 
-@ISA = ("LXR::Index");
+#
+# Global variables
+#
+my (%files, %symcache);
 
 sub new {
     my ($self, $dbname) = @_;
@@ -36,20 +39,20 @@
     $self->{dbh} =
       DBI->connect($dbname, $config->{dbuser}, $config->{dbpass},
         { RaiseError => 1, AutoCommit => 1 })
-      || fatal "Can't open connection to database\n";
+      or fatal "Can't open connection to database: $DBI::errstr\n";
 
+    my $prefix;
     if (defined($config->{'dbprefix'})) {
         $prefix = $config->{'dbprefix'};
     } else {
         $prefix = "lxr_";
     }
 
-    %files    = ();
-    %symcache = ();
+    %files        = ();
+    %symcache     = ();
 
     $self->{files_select} =
-      $self->{dbh}
-      ->prepare("select fileid from ${prefix}files where filename = ? and revision = ?");
+      $self->{dbh}->prepare("select fileid from ${prefix}files where filename = ? and revision = ?");
     $self->{files_insert} =
       $self->{dbh}->prepare("insert into ${prefix}files values (?, ?, ${prefix}filenum.nextval)");
 
@@ -87,8 +90,7 @@
       ("insert into ${prefix}status (fileid, status) values (?, ?)");
 
     $self->{status_update} =
-      $self->{dbh}
-      ->prepare("update ${prefix}status set status = ? where fileid = ? and status <= ?");
+      $self->{dbh}->prepare("update ${prefix}status set status = ? where fileid = ? and status <= ?");
 
     $self->{usage_insert} =
       $self->{dbh}->prepare("insert into ${prefix}usage (fileid, line, symid) values (?, ?, ?)");
@@ -120,7 +122,7 @@
           . "where fileid in "
           . "  (select fileid from ${prefix}releases where release = ?)");
     $self->{delete_releases} =
-      $self->{dbh}->prepare("delete from ${prefix}releases " . "where release = ?");
+      $self->{dbh}->prepare("delete from ${prefix}releases where release = ?");
     $self->{delete_files} =
       $self->{dbh}->prepare("delete from ${prefix}files "
           . "where fileid in "
@@ -145,7 +147,7 @@
     $self->{decl_select}     = undef;
     $self->{decl_insert}     = undef;
     $self->{delete_indexes}  = undef;
-    $self->{delete_usage}   = undef;
+    $self->{delete_usage}    = undef;
     $self->{delete_status}   = undef;
     $self->{delete_releases} = undef;
     $self->{delete_files}    = undef;
@@ -266,12 +268,12 @@
     my ($self, $symname, $fileid, $line, $langid, $type, $relsym) = @_;
 
     $self->{indexes_insert}->execute($self->symid($symname),
-        $fileid, $line, $langid, $type, $relsym ? $self->symid($relsym) : undef);
+    $fileid, $line, $langid, $type, $relsym ? $self->symid($relsym) : undef);
 }
 
 sub symreferences {
     my ($self, $symname, $release) = @_;
-    my ($rows, @ret,     @row);
+    my ($rows, @ret, @row);
 
     $rows = $self->{usage_select}->execute("$symname", "$release");
 
@@ -288,11 +290,10 @@
     my ($self, $symname, $fileid, $line) = @_;
 
     $self->{usage_insert}->execute($fileid, $line, $self->symid($symname));
-
 }
 
 sub issymbol {
-    my ($self, $symname, $release) = @_; # TODO make use of $release
+    my ($self, $symname, $release) = @_; # TODO make full use of $release
     my ($symid);
 
     $symid = $symcache{$release}{$symname};
@@ -362,15 +363,15 @@
 }
 
 sub purge {
-    my ($self, $version) = @_;
+    my ($self, $release) = @_;
 
     # 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_usage}->execute($version);
-    $self->{delete_status}->execute($version);
-    $self->{delete_releases}->execute($version);
-    $self->{delete_files}->execute($version);
+    $self->{delete_indexes}->execute($release);
+    $self->{delete_usage}->execute($release);
+    $self->{delete_status}->execute($release);
+    $self->{delete_releases}->execute($release);
+    $self->{delete_files}->execute($release);
 }
 
 1;