[Lxr-commits] CVS: lxr/lib/LXR/Index DB.pm,1.12,1.13 DBI.pm,1.20,1.21 Mysql.pm,1.17,1.18 Oracle.pm,1
Brought to you by:
ajlittoz
Menu
▾
▴
[Lxr-commits] CVS: lxr/lib/LXR/Index DB.pm,1.12,1.13 DBI.pm,1.20,1.21 Mysql.pm,1.17,1.18 Oracle.pm,1.6,1.7 Postgres.pm,1.16,1.17
|
From: Dave B. <bro...@us...> - 2004-07-21 20:44:42
|
Update of /cvsroot/lxr/lxr/lib/LXR/Index In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25090/lib/LXR/Index Modified Files: DB.pm DBI.pm Mysql.pm Oracle.pm Postgres.pm Log Message: perltidy with options: -ce -pt=2 -nolq -nsfs Index: DB.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/DB.pm,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- DB.pm 19 Jul 2004 19:50:21 -0000 1.12 +++ DB.pm 21 Jul 2004 20:44:31 -0000 1.13 @@ -25,16 +25,16 @@ use NDBM_File; sub new { - my ( $self, $dbpath, $mode ) = @_; + my ($self, $dbpath, $mode) = @_; my ($foo); - $self = bless( {}, $self ); + $self = bless({}, $self); $$self{'dbpath'} = $dbpath; $$self{'dbpath'} =~ s@/*$@/@; - foreach ( 'releases', 'files', 'symbols', 'indexes', 'status' ) { + foreach ('releases', 'files', 'symbols', 'indexes', 'status') { $foo = {}; - tie( %$foo, 'NDBM_File', $$self{'dbpath'} . $_, $mode || O_RDONLY, 0664 ) + tie(%$foo, 'NDBM_File', $$self{'dbpath'} . $_, $mode || O_RDONLY, 0664) || die "Can't open database " . $$self{'dbpath'} . $_ . "\n"; $$self{$_} = $foo; } @@ -43,10 +43,10 @@ } sub index { - my ( $self, $symname, $fileid, $line, $type, $rel ) = @_; + my ($self, $symname, $fileid, $line, $type, $rel) = @_; my $symid = $self->symid($symname); - $self->{'indexes'}{$symid} .= join( "\t", $fileid, $line, $type, $rel ) . "\0"; + $self->{'indexes'}{$symid} .= join("\t", $fileid, $line, $type, $rel) . "\0"; # $$self{'index'}{$self->symid($symname, $release)} = # join("\t", $filename, $line, $type, ''); @@ -54,16 +54,16 @@ # Returns array of (fileid, line, type) sub getindex { - my ( $self, $symname, $release ) = @_; + my ($self, $symname, $release) = @_; - my ( @d, $f ); - foreach $f ( split( /\0/, $$self{'indexes'}{ $self->symid( $symname, $release ) } ) ) { - my ( $fi, $l, $t, $s ) = split( /\t/, $f ); + my (@d, $f); + foreach $f (split(/\0/, $$self{'indexes'}{ $self->symid($symname, $release) })) { + my ($fi, $l, $t, $s) = split(/\t/, $f); - my %r = map { ( $_ => 1 ) } split( /;/, $self->{'releases'}{$fi} ); + my %r = map { ($_ => 1) } split(/;/, $self->{'releases'}{$fi}); next unless $r{$release}; - push( @d, [ $self->filename($fi), $l, $t, $s ] ); + push(@d, [ $self->filename($fi), $l, $t, $s ]); } return @d; } @@ -73,28 +73,28 @@ } sub relate { - my ( $self, $symname, $release, $rsymname, $reltype ) = @_; - my $symid = $self->symid( $symname, $release ); + my ($self, $symname, $release, $rsymname, $reltype) = @_; + my $symid = $self->symid($symname, $release); - $$self{''}{$symid} = join( "", - $$self{'relation'}{ $self->symid( $symname, $release ) }, - join( "\t", $self->symid( $rsymname, $release ), $reltype, '' ) ); + $$self{''}{$symid} = join("", + $$self{'relation'}{ $self->symid($symname, $release) }, + join("\t", $self->symid($rsymname, $release), $reltype, '')); } sub getrelations { - my ( $self, $symname, $release ) = @_; + my ($self, $symname, $release) = @_; } sub fileid { - my ( $self, $filename, $release ) = @_; + my ($self, $filename, $release) = @_; return $filename . ';' . $release; } # Convert from fileid to filename sub filename { - my ( $self, $fileid ) = @_; - my ($filename) = split( /;/, $fileid ); + my ($self, $fileid) = @_; + my ($filename) = split(/;/, $fileid); return $filename; } @@ -102,7 +102,7 @@ # If this file has not been indexed earlier, mark it as being indexed # now and return true. Return false if already indexed. sub toindex { - my ( $self, $fileid ) = @_; + my ($self, $fileid) = @_; return undef if $self->{'status'}{$fileid} >= 1; @@ -112,22 +112,22 @@ # Indicate that this filerevision is part of this release sub release { - my ( $self, $fileid, $release ) = @_; + my ($self, $fileid, $release) = @_; $self->{'releases'}{$fileid} .= $release . ";"; } sub symid { - my ( $self, $symname, $release ) = @_; + my ($self, $symname, $release) = @_; my ($symid); return $symname; } sub issymbol { - my ( $self, $symname, $release ) = @_; + my ($self, $symname, $release) = @_; - return $$self{'indexes'}{ $self->symid( $symname, $release ) }; + return $$self{'indexes'}{ $self->symid($symname, $release) }; } sub empty_cache { Index: DBI.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/DBI.pm,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- DBI.pm 19 Jul 2004 19:50:21 -0000 1.20 +++ DBI.pm 21 Jul 2004 20:44:31 -0000 1.21 @@ -23,16 +23,16 @@ use strict; sub new { - my ( $self, $dbname ) = @_; + my ($self, $dbname) = @_; my ($index); - if ( $dbname =~ /^dbi:mysql:/i ) { + if ($dbname =~ /^dbi:mysql:/i) { require LXR::Index::Mysql; $index = new LXR::Index::Mysql($dbname); - } elsif ( $dbname =~ /^dbi:Pg:/i ) { + } elsif ($dbname =~ /^dbi:Pg:/i) { require LXR::Index::Postgres; $index = new LXR::Index::Postgres($dbname); - } elsif ( $dbname =~ /^dbi:oracle:/i ) { + } elsif ($dbname =~ /^dbi:oracle:/i) { require LXR::Index::Oracle; $index = new LXR::Index::Oracle($dbname); } Index: Mysql.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Mysql.pm,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Mysql.pm 20 Jul 2004 15:31:25 -0000 1.17 +++ Mysql.pm 21 Jul 2004 20:44:31 -0000 1.18 @@ -29,18 +29,18 @@ @ISA = ("LXR::Index"); sub new { - my ( $self, $dbname ) = @_; + my ($self, $dbname) = @_; - $self = bless( {}, $self ); - if ( defined( $config->{dbpass} ) ) { - $self->{dbh} = DBI->connect( $dbname, $config->{dbuser}, $config->{dbpass} ) + $self = bless({}, $self); + if (defined($config->{dbpass})) { + $self->{dbh} = DBI->connect($dbname, $config->{dbuser}, $config->{dbpass}) || fatal "Can't open connection to database\n"; } else { - $self->{dbh} = DBI->connect( $dbname, "lxr", $config->{dbpass} ) + $self->{dbh} = DBI->connect($dbname, "lxr", $config->{dbpass}) || fatal "Can't open connection to database\n"; } - if ( $config->{'dbprefix'} ) { + if ($config->{'dbprefix'}) { $prefix = $config->{'dbprefix'}; } else { $prefix = "lxr_"; @@ -66,15 +66,15 @@ $self->{dbh}->prepare("delete from ${prefix}symbols where symname = ?"); $self->{indexes_select} = - $self->{dbh}->prepare( "select f.filename, i.line, d.declaration, i.relsym " + $self->{dbh}->prepare("select f.filename, i.line, d.declaration, i.relsym " . "from ${prefix}symbols s, ${prefix}indexes i, ${prefix}files f, ${prefix}releases r, ${prefix}declarations d " . "where s.symid = i.symid and i.fileid = f.fileid " . "and f.fileid = r.fileid " . "and i.langid = d.langid and i.type = d.declid " - . "and s.symname = ? and r.release = ?" ); + . "and s.symname = ? and r.release = ?"); $self->{indexes_insert} = $self->{dbh}->prepare( -"insert into ${prefix}indexes (symid, fileid, line, langid, type, relsym) values (?, ?, ?, ?, ?, ?)" + "insert into ${prefix}indexes (symid, fileid, line, langid, type, relsym) values (?, ?, ?, ?, ?, ?)" ); $self->{releases_select} = @@ -97,85 +97,85 @@ $self->{usage_insert} = $self->{dbh}->prepare("insert into ${prefix}useage (fileid, line, symid) values (?, ?, ?)"); $self->{usage_select} = - $self->{dbh}->prepare( "select f.filename, u.line " + $self->{dbh}->prepare("select f.filename, u.line " . "from ${prefix}symbols s, ${prefix}files f, ${prefix}releases r, ${prefix}useage u " . "where s.symid = u.symid " . "and f.fileid = u.fileid " . "and u.fileid = r.fileid " . "and s.symname = ? and r.release = ? " - . "order by f.filename" ); + . "order by f.filename"); $self->{decl_select} = $self->{dbh}->prepare( - "select declid from ${prefix}declarations where langid = ? and " . "declaration = ?" ); + "select declid from ${prefix}declarations where langid = ? and " . "declaration = ?"); $self->{decl_insert} = $self->{dbh}->prepare( "insert into ${prefix}declarations (declid, langid, declaration) values (NULL, ?, ?)"); $self->{delete_indexes} = - $self->{dbh}->prepare( "delete from ${prefix}indexes " + $self->{dbh}->prepare("delete from ${prefix}indexes " . "using ${prefix}indexes i, ${prefix}releases r " . "where i.fileid = r.fileid " - . "and r.release = ?" ); + . "and r.release = ?"); $self->{delete_useage} = - $self->{dbh}->prepare( "delete from ${prefix}useage " + $self->{dbh}->prepare("delete from ${prefix}useage " . "using ${prefix}useage u, ${prefix}releases r " . "where u.fileid = r.fileid " - . "and r.release = ?" ); + . "and r.release = ?"); $self->{delete_status} = - $self->{dbh}->prepare( "delete from ${prefix}status " + $self->{dbh}->prepare("delete from ${prefix}status " . "using ${prefix}status s, ${prefix}releases r " . "where s.fileid = r.fileid " - . "and r.release = ?" ); + . "and r.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 " + $self->{dbh}->prepare("delete from ${prefix}files " . "using ${prefix}files f, ${prefix}releases r " . "where f.fileid = r.fileid " - . "and r.release = ?" ); + . "and r.release = ?"); return $self; } sub index { - my ( $self, $symname, $fileid, $line, $langid, $type, $relsym ) = @_; + my ($self, $symname, $fileid, $line, $langid, $type, $relsym) = @_; - $self->{indexes_insert}->execute( $self->symid($symname), - $fileid, $line, $langid, $type, $relsym ? $self->symid($relsym) : undef ); + $self->{indexes_insert}->execute($self->symid($symname), + $fileid, $line, $langid, $type, $relsym ? $self->symid($relsym) : undef); } sub reference { - my ( $self, $symname, $fileid, $line ) = @_; + my ($self, $symname, $fileid, $line) = @_; - $self->{usage_insert}->execute( $fileid, $line, $self->symid($symname) ); + $self->{usage_insert}->execute($fileid, $line, $self->symid($symname)); } sub getindex { - my ( $self, $symname, $release ) = @_; - my ( $rows, @ret ); + my ($self, $symname, $release) = @_; + my ($rows, @ret); - $rows = $self->{indexes_select}->execute( "$symname", "$release" ); + $rows = $self->{indexes_select}->execute("$symname", "$release"); - while ( $rows-- > 0 ) { - push( @ret, [ $self->{indexes_select}->fetchrow_array ] ); + while ($rows-- > 0) { + push(@ret, [ $self->{indexes_select}->fetchrow_array ]); } $self->{indexes_select}->finish(); - map { $$_[3] &&= $self->symname( $$_[3] ) } @ret; + map { $$_[3] &&= $self->symname($$_[3]) } @ret; return @ret; } sub getreference { - my ( $self, $symname, $release ) = @_; - my ( $rows, @ret ); + my ($self, $symname, $release) = @_; + my ($rows, @ret); - $rows = $self->{usage_select}->execute( "$symname", "$release" ); + $rows = $self->{usage_select}->execute("$symname", "$release"); - while ( $rows-- > 0 ) { - push( @ret, [ $self->{usage_select}->fetchrow_array ] ); + while ($rows-- > 0) { + push(@ret, [ $self->{usage_select}->fetchrow_array ]); } $self->{usage_select}->finish(); @@ -184,16 +184,16 @@ } sub fileid { - my ( $self, $filename, $revision ) = @_; + my ($self, $filename, $revision) = @_; my ($fileid); # CAUTION: $revision is not $release! - unless ( defined( $fileid = $files{"$filename\t$revision"} ) ) { - $self->{files_select}->execute( $filename, $revision ); + unless (defined($fileid = $files{"$filename\t$revision"})) { + $self->{files_select}->execute($filename, $revision); ($fileid) = $self->{files_select}->fetchrow_array(); unless ($fileid) { - $self->{files_insert}->execute( $filename, $revision ); - $self->{files_select}->execute( $filename, $revision ); + $self->{files_insert}->execute($filename, $revision); + $self->{files_select}->execute($filename, $revision); ($fileid) = $self->{files_select}->fetchrow_array(); } $files{"$filename\t$revision"} = $fileid; @@ -204,23 +204,23 @@ # Indicate that this filerevision is part of this release sub release { - my ( $self, $fileid, $release ) = @_; + my ($self, $fileid, $release) = @_; - my $rows = $self->{releases_select}->execute( $fileid + 0, $release ); + my $rows = $self->{releases_select}->execute($fileid + 0, $release); $self->{releases_select}->finish(); - unless ( $rows > 0 ) { - $self->{releases_insert}->execute( $fileid, $release ); + unless ($rows > 0) { + $self->{releases_insert}->execute($fileid, $release); $self->{releases_insert}->finish(); } } sub symid { - my ( $self, $symname ) = @_; + my ($self, $symname) = @_; my ($symid); $symid = $symcache{$symname}; - unless ( defined($symid) ) { + unless (defined($symid)) { $self->{symbols_byname}->execute($symname); ($symid) = $self->{symbols_byname}->fetchrow_array(); $self->{symbols_byname}->finish(); @@ -239,10 +239,10 @@ } sub symname { - my ( $self, $symid ) = @_; + my ($self, $symid) = @_; my ($symname); - $self->{symbols_byid}->execute( $symid + 0 ); + $self->{symbols_byid}->execute($symid + 0); ($symname) = $self->{symbols_byid}->fetchrow_array(); $self->{symbols_byid}->finish(); @@ -250,11 +250,11 @@ } sub issymbol { - my ( $self, $symname ) = @_; + my ($self, $symname) = @_; my ($symid); $symid = $symcache{$symname}; - unless ( defined($symid) ) { + unless (defined($symid)) { $self->{symbols_byname}->execute($symname); ($symid) = $self->{symbols_byname}->fetchrow_array(); $self->{symbols_byname}->finish(); @@ -267,27 +267,27 @@ # If this file has not been indexed earlier return true. Return false # if already indexed. sub toindex { - my ( $self, $fileid ) = @_; + my ($self, $fileid) = @_; my ($status); $self->{status_get}->execute($fileid); $status = $self->{status_get}->fetchrow_array(); $self->{status_get}->finish(); - if ( !defined($status) ) { - $self->{status_insert}->execute( $fileid + 0, 0 ); + if (!defined($status)) { + $self->{status_insert}->execute($fileid + 0, 0); } return $status == 0; } sub setindexed { - my ( $self, $fileid ) = @_; - $self->{status_update}->execute( 1, $fileid, 0 ); + my ($self, $fileid) = @_; + $self->{status_update}->execute(1, $fileid, 0); } sub toreference { - my ( $self, $fileid ) = @_; + my ($self, $fileid) = @_; my ($status); $self->{status_get}->execute($fileid); @@ -298,8 +298,8 @@ } sub setreferenced { - my ( $self, $fileid ) = @_; - $self->{status_update}->execute( 2, $fileid, 1 ); + my ($self, $fileid) = @_; + $self->{status_update}->execute(2, $fileid, 1); } # This function should be called before parsing each new file, @@ -310,16 +310,16 @@ } sub getdecid { - my ( $self, $lang, $string ) = @_; + my ($self, $lang, $string) = @_; - my $rows = $self->{decl_select}->execute( $lang, $string ); + my $rows = $self->{decl_select}->execute($lang, $string); $self->{decl_select}->finish(); - unless ( $rows > 0 ) { - $self->{decl_insert}->execute( $lang, $string ); + unless ($rows > 0) { + $self->{decl_insert}->execute($lang, $string); } - $self->{decl_select}->execute( $lang, $string ); + $self->{decl_select}->execute($lang, $string); my $id = $self->{decl_select}->fetchrow_array(); $self->{decl_select}->finish(); @@ -327,7 +327,7 @@ } sub purge { - my ( $self, $version ) = @_; + my ($self, $version) = @_; # 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 @@ -359,7 +359,7 @@ $self->{delete_releases} = undef; $self->{delete_files} = undef; - if ( $self->{dbh} ) { + if ($self->{dbh}) { $self->{dbh}->disconnect(); $self->{dbh} = undef; } Index: Oracle.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Oracle.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Oracle.pm 20 Jul 2004 15:31:25 -0000 1.6 +++ Oracle.pm 21 Jul 2004 20:44:31 -0000 1.7 @@ -29,16 +29,16 @@ @ISA = ("LXR::Index"); sub new { - my ( $self, $dbname ) = @_; + my ($self, $dbname) = @_; - $self = bless( {}, $self ); + $self = bless({}, $self); $self->{dbh} = - DBI->connect( $dbname, $config->{dbuser}, $config->{dbpass}, - { RaiseError => 1, AutoCommit => 1 } ) + DBI->connect($dbname, $config->{dbuser}, $config->{dbpass}, + { RaiseError => 1, AutoCommit => 1 }) || fatal "Can't open connection to database\n"; - if ( $config->{'dbprefix'} ) { + if ($config->{'dbprefix'}) { $prefix = $config->{'dbprefix'}; } else { $prefix = "lxr_"; @@ -63,11 +63,11 @@ $self->{dbh}->prepare("delete from ${prefix}symbols where symname = ?"); $self->{indexes_select} = - $self->{dbh}->prepare( "select f.filename, i.line, i.type, i.relsym " + $self->{dbh}->prepare("select f.filename, i.line, i.type, i.relsym " . "from ${prefix}symbols s, ${prefix}indexes i, ${prefix}files f, ${prefix}releases r " . "where s.symid = i.symid and i.fileid = f.fileid " . "and f.fileid = r.fileid " - . "and s.symname = ? and r.release = ? " ); + . "and s.symname = ? and r.release = ? "); $self->{indexes_insert} = $self->{dbh}->prepare("insert into ${prefix}indexes values (?, ?, ?, ?, ?)"); @@ -90,58 +90,58 @@ $self->{usage_insert} = $self->{dbh}->prepare("insert into ${prefix}usage values (?, ?, ?)"); $self->{usage_select} = - $self->{dbh}->prepare( "select f.filename, u.line " + $self->{dbh}->prepare("select f.filename, u.line " . "from ${prefix}symbols s, ${prefix}files f, ${prefix}releases r, ${prefix}usage u " . "where s.symid = u.symid " . "and f.fileid = u.fileid " . "and u.fileid = r.fileid and " . "s.symname = ? and r.release = ? " - . "order by f.filename" ); + . "order by f.filename"); $self->{delete_indexes} = - $self->{dbh}->prepare( "delete from ${prefix}indexes " + $self->{dbh}->prepare("delete from ${prefix}indexes " . "where fileid in " - . " (select fileid from ${prefix}releases where release = ?)" ); + . " (select fileid from ${prefix}releases where release = ?)"); $self->{delete_usage} = - $self->{dbh}->prepare( "delete from ${prefix}usage " + $self->{dbh}->prepare("delete from ${prefix}usage " . "where fileid in " - . " (select fileid from ${prefix}releases where release = ?)" ); + . " (select fileid from ${prefix}releases where release = ?)"); $self->{delete_status} = - $self->{dbh}->prepare( "delete from ${prefix}status " + $self->{dbh}->prepare("delete from ${prefix}status " . "where fileid in " - . " (select fileid from ${prefix}releases where release = ?)" ); + . " (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 " + $self->{dbh}->prepare("delete from ${prefix}files " . "where fileid in " - . " (select fileid from ${prefix}releases where release = ?)" ); + . " (select fileid from ${prefix}releases where release = ?)"); return $self; } sub index { - my ( $self, $symname, $fileid, $line, $type, $relsym ) = @_; + my ($self, $symname, $fileid, $line, $type, $relsym) = @_; - $self->{indexes_insert}->execute( $self->symid($symname), - $fileid, $line, $type, $relsym ? $self->symid($relsym) : undef ); + $self->{indexes_insert}->execute($self->symid($symname), + $fileid, $line, $type, $relsym ? $self->symid($relsym) : undef); } sub reference { - my ( $self, $symname, $fileid, $line ) = @_; + my ($self, $symname, $fileid, $line) = @_; - $self->{usage_insert}->execute( $fileid, $line, $self->symid($symname) ); + $self->{usage_insert}->execute($fileid, $line, $self->symid($symname)); } sub getindex { # Hinzugefügt von Variable @row, While-Schleife - my ( $self, $symname, $release ) = @_; - my ( $rows, @ret, @row ); + my ($self, $symname, $release) = @_; + my ($rows, @ret, @row); - $rows = $self->{indexes_select}->execute( "$symname", "$release" ); + $rows = $self->{indexes_select}->execute("$symname", "$release"); - while ( @row = $self->{indexes_select}->fetchrow_array ) { - push( @ret, [@row] ); + while (@row = $self->{indexes_select}->fetchrow_array) { + push(@ret, [@row]); } #while ($rows-- > 0) { @@ -150,19 +150,19 @@ $self->{indexes_select}->finish(); - map { $$_[3] &&= $self->symname( $$_[3] ) } @ret; + map { $$_[3] &&= $self->symname($$_[3]) } @ret; return @ret; } sub getreference { - my ( $self, $symname, $release ) = @_; - my ( $rows, @ret, @row ); + my ($self, $symname, $release) = @_; + my ($rows, @ret, @row); - $rows = $self->{usage_select}->execute( "$symname", "$release" ); + $rows = $self->{usage_select}->execute("$symname", "$release"); - while ( @row = $self->{usage_select}->fetchrow_array ) { - push( @ret, [@row] ); + while (@row = $self->{usage_select}->fetchrow_array) { + push(@ret, [@row]); } #while ($rows-- > 0) { @@ -175,16 +175,16 @@ } sub fileid { - my ( $self, $filename, $revision ) = @_; + my ($self, $filename, $revision) = @_; my ($fileid); # CAUTION: $revision is not $release! - unless ( defined( $fileid = $files{"$filename\t$revision"} ) ) { - $self->{files_select}->execute( $filename, $revision ); + unless (defined($fileid = $files{"$filename\t$revision"})) { + $self->{files_select}->execute($filename, $revision); ($fileid) = $self->{files_select}->fetchrow_array(); unless ($fileid) { - $self->{files_insert}->execute( $filename, $revision ); - $self->{files_select}->execute( $filename, $revision ); + $self->{files_insert}->execute($filename, $revision); + $self->{files_select}->execute($filename, $revision); ($fileid) = $self->{files_select}->fetchrow_array(); } @@ -197,26 +197,26 @@ # Indicate that this filerevision is part of this release sub release { - my ( $self, $fileid, $release ) = @_; + my ($self, $fileid, $release) = @_; my (@row); - my $rows = $self->{releases_select}->execute( $fileid + 0, $release ); - while ( @row = $self->{releases_select}->fetchrow_array ) { + my $rows = $self->{releases_select}->execute($fileid + 0, $release); + while (@row = $self->{releases_select}->fetchrow_array) { $rows = 1; } $self->{releases_select}->finish(); - unless ( $rows > 0 ) { - $self->{releases_insert}->execute( $fileid + 0, $release ); + unless ($rows > 0) { + $self->{releases_insert}->execute($fileid + 0, $release); $self->{releases_insert}->finish(); } } sub symid { - my ( $self, $symname ) = @_; + my ($self, $symname) = @_; my ($symid); $symid = $symcache{$symname}; - unless ( defined($symid) ) { + unless (defined($symid)) { $self->{symbols_byname}->execute($symname); ($symid) = $self->{symbols_byname}->fetchrow_array(); $self->{symbols_byname}->finish(); @@ -235,10 +235,10 @@ } sub symname { - my ( $self, $symid ) = @_; + my ($self, $symid) = @_; my ($symname); - $self->{symbols_byid}->execute( $symid + 0 ); + $self->{symbols_byid}->execute($symid + 0); ($symname) = $self->{symbols_byid}->fetchrow_array(); $self->{symbols_byid}->finish(); @@ -246,11 +246,11 @@ } sub issymbol { - my ( $self, $symname ) = @_; + my ($self, $symname) = @_; my ($symid); $symid = $symcache{$symname}; - unless ( defined($symid) ) { + unless (defined($symid)) { $self->{symbols_byname}->execute($symname); ($symid) = $self->{symbols_byname}->fetchrow_array(); $self->{symbols_byname}->finish(); @@ -263,24 +263,24 @@ # If this file has not been indexed earlier, mark it as being indexed # now and return true. Return false if already indexed. sub toindex { - my ( $self, $fileid ) = @_; + my ($self, $fileid) = @_; my ($status); $self->{status_get}->execute($fileid); $status = $self->{status_get}->fetchrow_array(); $self->{status_get}->finish(); - if ( !defined($status) ) { - $self->{status_insert}->execute( $fileid + 0, 0 ); + if (!defined($status)) { + $self->{status_insert}->execute($fileid + 0, 0); } - return $self->{status_update}->execute( 1, $fileid, 0 ) > 0; + return $self->{status_update}->execute(1, $fileid, 0) > 0; } sub toreference { - my ( $self, $fileid ) = @_; + my ($self, $fileid) = @_; my ($rv); - return $self->{status_update}->execute( 2, $fileid, 1 ) > 0; + return $self->{status_update}->execute(2, $fileid, 1) > 0; } # This function should be called before parsing each new file, @@ -291,7 +291,7 @@ } sub purge { - my ( $self, $version ) = @_; + my ($self, $version) = @_; # 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 @@ -321,7 +321,7 @@ $self->{delete_releases} = undef; $self->{delete_files} = undef; - if ( $self->{dbh} ) { + if ($self->{dbh}) { $self->{dbh}->disconnect(); $self->{dbh} = undef; } Index: Postgres.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Postgres.pm,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Postgres.pm 20 Jul 2004 15:31:25 -0000 1.16 +++ Postgres.pm 21 Jul 2004 20:44:31 -0000 1.17 @@ -34,17 +34,17 @@ $delete_status $delete_releases $delete_files $prefix); sub new { - my ( $self, $dbname ) = @_; + my ($self, $dbname) = @_; - $self = bless( {}, $self ); - $dbh ||= DBI->connect( $dbname, $config->{'dbuser'}, $config->{'dbpass'} ); + $self = bless({}, $self); + $dbh ||= DBI->connect($dbname, $config->{'dbuser'}, $config->{'dbpass'}); die($DBI::errstr) unless $dbh; $$dbh{'AutoCommit'} = 0; # $dbh->trace(1); - if ( $config->{'dbprefix'} ) { + if ($config->{'dbprefix'}) { $prefix = $config->{'dbprefix'}; } else { $prefix = "lxr_"; @@ -67,15 +67,15 @@ $symbols_remove = $dbh->prepare("delete from ${prefix}symbols where symname = ?"); $indexes_select = - $dbh->prepare( "select f.filename, i.line, d.declaration, i.relsym " + $dbh->prepare("select f.filename, i.line, d.declaration, i.relsym " . "from ${prefix}symbols s, ${prefix}indexes i, ${prefix}files f, ${prefix}releases r, ${prefix}declarations d " . "where s.symid = i.symid and i.fileid = f.fileid " . "and f.fileid = r.fileid " . "and i.langid = d.langid and i.type = d.declid " - . "and s.symname = ? and r.release = ?" ); + . "and s.symname = ? and r.release = ?"); $indexes_insert = - $dbh->prepare( "insert into ${prefix}indexes (symid, fileid, line, langid, type, relsym) " - . "values (?, ?, ?, ?, ?, ?)" ); + $dbh->prepare("insert into ${prefix}indexes (symid, fileid, line, langid, type, relsym) " + . "values (?, ?, ?, ?, ?, ?)"); $releases_select = $dbh->prepare("select * from ${prefix}releases where fileid = ? and release = ?"); @@ -85,46 +85,46 @@ # ("insert into status select ?, 0 except select fileid, 0 from status"); ( "insert into ${prefix}status select ?, 0 where not exists " - . "(select * from ${prefix}status where fileid = ?)" ); + . "(select * from ${prefix}status where fileid = ?)"); $status_update = $dbh->prepare("update ${prefix}status set status = ? where fileid = ? and status <= ?"); $usage_insert = $dbh->prepare("insert into ${prefix}usage values (?, ?, ?)"); $usage_select = - $dbh->prepare( "select f.filename, u.line " + $dbh->prepare("select f.filename, u.line " . "from ${prefix}symbols s, ${prefix}files f, ${prefix}releases r, ${prefix}usage u " . "where s.symid = u.symid " . "and f.fileid = u.fileid " . "and f.fileid = r.fileid and " - . "s.symname = ? and r.release = ?" ); + . "s.symname = ? and r.release = ?"); $declid_nextnum = $dbh->prepare("select nextval('declnum')"); $decl_select = $dbh->prepare( - "select declid from ${prefix}declarations where langid = ? and " . "declaration = ?" ); + "select declid from ${prefix}declarations where langid = ? and " . "declaration = ?"); $decl_insert = $dbh->prepare( "insert into ${prefix}declarations (declid, langid, declaration) values (?, ?, ?)"); $delete_indexes = - $dbh->prepare( "delete from ${prefix}indexes " + $dbh->prepare("delete from ${prefix}indexes " . "where fileid in " - . " (select fileid from ${prefix}releases where release = ?)" ); + . " (select fileid from ${prefix}releases where release = ?)"); $delete_usage = - $dbh->prepare( "delete from ${prefix}usage " + $dbh->prepare("delete from ${prefix}usage " . "where fileid in " - . " (select fileid from ${prefix}releases where release = ?)" ); + . " (select fileid from ${prefix}releases where release = ?)"); $delete_status = - $dbh->prepare( "delete from ${prefix}status " + $dbh->prepare("delete from ${prefix}status " . "where fileid in " - . " (select fileid from ${prefix}releases where release = ?)" ); - $delete_releases = $dbh->prepare( "delete from ${prefix}releases " . "where release = ?" ); + . " (select fileid from ${prefix}releases where release = ?)"); + $delete_releases = $dbh->prepare("delete from ${prefix}releases " . "where release = ?"); $delete_files = - $dbh->prepare( "delete from ${prefix}files " + $dbh->prepare("delete from ${prefix}files " . "where fileid in " - . " (select fileid from ${prefix}releases where release = ?)" ); + . " (select fileid from ${prefix}releases where release = ?)"); return $self; } @@ -134,51 +134,51 @@ } sub commit_if_limit { - unless ( ++$transactions % $commitlimit ) { + unless (++$transactions % $commitlimit) { $dbh->commit(); } } sub index { - my ( $self, $symname, $fileid, $line, $langid, $type, $relsym ) = @_; + my ($self, $symname, $fileid, $line, $langid, $type, $relsym) = @_; - $indexes_insert->execute( $self->symid($symname), - $fileid, $line, $langid, $type, $relsym ? $self->symid($relsym) : undef ); + $indexes_insert->execute($self->symid($symname), + $fileid, $line, $langid, $type, $relsym ? $self->symid($relsym) : undef); commit_if_limit(); } sub reference { - my ( $self, $symname, $fileid, $line ) = @_; + my ($self, $symname, $fileid, $line) = @_; - $usage_insert->execute( $fileid, $line, $self->symid($symname) ); + $usage_insert->execute($fileid, $line, $self->symid($symname)); commit_if_limit(); } sub getindex { - my ( $self, $symname, $release ) = @_; - my ( $rows, @ret ); + my ($self, $symname, $release) = @_; + my ($rows, @ret); - $rows = $indexes_select->execute( "$symname", "$release" ); + $rows = $indexes_select->execute("$symname", "$release"); - while ( $rows-- > 0 ) { - push( @ret, [ $indexes_select->fetchrow_array ] ); + while ($rows-- > 0) { + push(@ret, [ $indexes_select->fetchrow_array ]); } $indexes_select->finish(); - map { $$_[3] &&= $self->symname( $$_[3] ) } @ret; + map { $$_[3] &&= $self->symname($$_[3]) } @ret; return @ret; } sub getreference { - my ( $self, $symname, $release ) = @_; - my ( $rows, @ret ); + my ($self, $symname, $release) = @_; + my ($rows, @ret); - $rows = $usage_select->execute( "$symname", "$release" ); + $rows = $usage_select->execute("$symname", "$release"); - while ( $rows-- > 0 ) { - push( @ret, [ $usage_select->fetchrow_array ] ); + while ($rows-- > 0) { + push(@ret, [ $usage_select->fetchrow_array ]); } $usage_select->finish(); @@ -187,29 +187,29 @@ } sub relate { - my ( $self, $symname, $release, $rsymname, $reltype ) = @_; + my ($self, $symname, $release, $rsymname, $reltype) = @_; # $relation{$self->symid($symname, $release)} .= # join("\t", $self->symid($rsymname, $release), $reltype, ''); } sub getrelations { - my ( $self, $symname, $release ) = @_; + my ($self, $symname, $release) = @_; } sub fileid { - my ( $self, $filename, $revision ) = @_; + my ($self, $filename, $revision) = @_; my ($fileid); # CAUTION: $revision is not $release! - unless ( defined( $fileid = $files{"$filename\t$revision"} ) ) { - $files_select->execute( $filename, $revision ); + unless (defined($fileid = $files{"$filename\t$revision"})) { + $files_select->execute($filename, $revision); ($fileid) = $files_select->fetchrow_array(); unless ($fileid) { $filenum_nextval->execute(); ($fileid) = $filenum_nextval->fetchrow_array(); - $files_insert->execute( $filename, $revision, $fileid ); + $files_insert->execute($filename, $revision, $fileid); } $files{"$filename\t$revision"} = $fileid; } @@ -219,30 +219,30 @@ # Indicate that this filerevision is part of this release sub release { - my ( $self, $fileid, $release ) = @_; + my ($self, $fileid, $release) = @_; - $releases_select->execute( $fileid + 0, $release ); + $releases_select->execute($fileid + 0, $release); my $firstrow = $releases_select->fetchrow_array(); # $releases_select->finish(); unless ($firstrow) { - $releases_insert->execute( $fileid + 0, $release ); + $releases_insert->execute($fileid + 0, $release); } commit_if_limit(); } sub symid { - my ( $self, $symname ) = @_; + my ($self, $symname) = @_; my ($symid); - unless ( defined( $symid = $symcache{$symname} ) ) { + unless (defined($symid = $symcache{$symname})) { $symbols_byname->execute($symname); ($symid) = $symbols_byname->fetchrow_array(); unless ($symid) { $symnum_nextval->execute(); ($symid) = $symnum_nextval->fetchrow_array(); - $symbols_insert->execute( $symname, $symid ); + $symbols_insert->execute($symname, $symid); } $symcache{$symname} = $symid; } @@ -251,21 +251,21 @@ } sub symname { - my ( $self, $symid ) = @_; + my ($self, $symid) = @_; my ($symname); - $symbols_byid->execute( $symid + 0 ); + $symbols_byid->execute($symid + 0); ($symname) = $symbols_byid->fetchrow_array(); return $symname; } sub issymbol { - my ( $self, $symname ) = @_; + my ($self, $symname) = @_; - unless ( exists( $symcache{$symname} ) ) { + unless (exists($symcache{$symname})) { $symbols_byname->execute($symname); - ( $symcache{$symname} ) = $symbols_byname->fetchrow_array(); + ($symcache{$symname}) = $symbols_byname->fetchrow_array(); } return $symcache{$symname}; @@ -274,32 +274,32 @@ # If this file has not been indexed earlier, mark it as being indexed # now and return true. Return false if already indexed. sub toindex { - my ( $self, $fileid ) = @_; + my ($self, $fileid) = @_; - $status_insert->execute( $fileid + 0, $fileid + 0 ); + $status_insert->execute($fileid + 0, $fileid + 0); commit_if_limit(); - return $status_update->execute( 1, $fileid + 0, 0 ) > 0; + return $status_update->execute(1, $fileid + 0, 0) > 0; } sub toreference { - my ( $self, $fileid ) = @_; + my ($self, $fileid) = @_; - return $status_update->execute( 2, $fileid, 1 ) > 0; + return $status_update->execute(2, $fileid, 1) > 0; } sub getdecid { - my ( $self, $lang, $string ) = @_; + my ($self, $lang, $string) = @_; - my $rows = $decl_select->execute( $lang, $string ); + my $rows = $decl_select->execute($lang, $string); $decl_select->finish(); - unless ( $rows > 0 ) { + unless ($rows > 0) { $declid_nextnum->execute(); my ($declid) = $declid_nextnum->fetchrow_array(); - $decl_insert->execute( $declid, $lang, $string ); + $decl_insert->execute($declid, $lang, $string); } - $decl_select->execute( $lang, $string ); + $decl_select->execute($lang, $string); my $id = $decl_select->fetchrow_array(); $decl_select->finish(); @@ -308,7 +308,7 @@ } sub purge { - my ( $self, $version ) = @_; + my ($self, $version) = @_; # 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 @@ -321,13 +321,13 @@ } sub setindexed { - my ( $self, $fileid ) = @_; - $status_update->execute( 1, $fileid, 0 ); + my ($self, $fileid) = @_; + $status_update->execute(1, $fileid, 0); } sub setreferenced { - my ( $self, $fileid ) = @_; - $status_update->execute( 2, $fileid, 1 ); + my ($self, $fileid) = @_; + $status_update->execute(2, $fileid, 1); } sub END { |
