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

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

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

Modified Files:
	Mysql.pm Postgres.pm Oracle.pm 
Log Message:
Feature 1691378 (Rearchitect the DB backends) Part VIII
* Synchronising the implementations of the symdeclarations in Postgres, MySql and Oracle DBI implementations

Index: Mysql.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Mysql.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Mysql.pm	9 May 2009 15:39:00 -0000	1.28
+++ Mysql.pm	9 May 2009 18:55:31 -0000	1.29
@@ -255,15 +255,12 @@
     my ($rows, @ret, @row);
 
     $rows = $self->{indexes_select}->execute("$symname", "$release");
-
     while (@row = $self->{indexes_select}->fetchrow_array) {
+        $row[3] &&= $self->symname($row[3]); # convert the symid
         push(@ret, [@row]);
     }
-
     $self->{indexes_select}->finish();
 
-    map { $$_[3] &&= $self->symname($$_[3]) } @ret;
-
     return @ret;
 }
 
@@ -271,7 +268,7 @@
     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 {
@@ -293,7 +290,6 @@
     my ($self, $symname, $fileid, $line) = @_;
 
     $self->{usage_insert}->execute($fileid, $line, $self->symid($symname));
-
 }
 
 sub issymbol {

Index: Postgres.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Postgres.pm,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Postgres.pm	9 May 2009 15:56:56 -0000	1.29
+++ Postgres.pm	9 May 2009 18:55:31 -0000	1.30
@@ -251,26 +251,23 @@
 }
 
 sub symdeclarations {
-  my ($self, $symname, $release) = @_;
-  my ($rows, @ret);
-
-  $rows = $indexes_select->execute("$symname", "$release");
-
-  while ($rows-- > 0) {
-    my @row = $indexes_select->fetchrow_array;
+    my ($self, $symname, $release) = @_;
+    my ($rows, @ret, @row);
 
-    $row[3] = $self->symname($row[3]); # convert the symid
+    $rows = $indexes_select->execute("$symname", "$release");
 
-    # Also need to remove trailing whitespace erroneously added by the db 
-    # interface that isn't actually stored in the underlying db
-    $row[2] =~ s/^(.+?)\s+$/$1/;
+    while (@row = $indexes_select->fetchrow_array) {
+        $row[3] &&= $self->symname($row[3]); # convert the symid
 
-    push(@ret, \@row);
-  }
+        # Also need to remove trailing whitespace erroneously added by the db 
+        # interface that isn't actually stored in the underlying db
+        $row[2] =~ s/^(.+?)\s+$/$1/;
 
-  $indexes_select->finish();
+        push(@ret, [@row]);
+    }
+    $indexes_select->finish();
 
-  return @ret;
+    return @ret;
 }
 
 sub setsymdeclaration {

Index: Oracle.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Oracle.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Oracle.pm	9 May 2009 15:56:56 -0000	1.18
+++ Oracle.pm	9 May 2009 18:55:31 -0000	1.19
@@ -188,7 +188,6 @@
 
     unless ($rows > 0) {
         $self->{releases_insert}->execute($fileid, $release);
-        $self->{releases_insert}->finish();
     }
 }
 
@@ -249,18 +248,15 @@
 
 sub symdeclarations {
     my ($self, $symname, $release) = @_;
-    my ($rows, @ret,     @row);
+    my ($rows, @ret, @row);
 
     $rows = $self->{indexes_select}->execute("$symname", "$release");
-
     while (@row = $self->{indexes_select}->fetchrow_array) {
+        $row[3] &&= $self->symname($row[3]); # convert the symid
         push(@ret, [@row]);
     }
-
     $self->{indexes_select}->finish();
 
-    map { $$_[3] &&= $self->symname($$_[3]) } @ret;
-
     return @ret;
 }