lxr-commits — Don't use, CVS commits

[Lxr-commits] CVS: lxr/lib/LXR Files.pm,1.8,1.8.2.1

[Malcolm B. <mb...@us...>]

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

Modified Files:
      Tag: bk-dev-branch
	Files.pm 
Log Message:
Start of work on BitKeeper support - add new Files access mode for BK


Index: Files.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Files.pm,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- Files.pm	21 Jul 2004 20:44:30 -0000	1.8
+++ Files.pm	4 Dec 2004 23:31:14 -0000	1.8.2.1
@@ -30,6 +30,10 @@
 		require LXR::Files::CVS;
 		$srcroot = $1;
 		$files   = new LXR::Files::CVS($srcroot);
+	} elsif ($srcroot =~ /^bk:(.*)/i) {
+		require LXR::Files::BK;
+		$srcroot = $1;
+		$files = new LXR::Files::BK($srcroot);
 	} else {
 		require LXR::Files::Plain;
 		$files = new LXR::Files::Plain($srcroot);

[Lxr-commits] CVS: lxr/tests TestRunner.pl,NONE,1.1

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10334/tests

Added Files:
	TestRunner.pl 
Log Message:
New script to run all LXR testcode


--- NEW FILE: TestRunner.pl ---
#!/usr/bin/perl -w

use strict;

use Test::Unit::Debug qw(debug_pkgs);
use Test::Unit::TestRunner;

# Uncomment and edit to debug individual packages.
#debug_pkgs(qw/Test::Unit::TestCase/);

my $testrunner = Test::Unit::TestRunner->new();
$testrunner->start(@ARGV);

[Lxr-commits] CVS: lxr diff,1.14,1.15

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

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10923

Modified Files:
	diff 
Log Message:
update $PATH for diff (gnu diff is more likely to be in /usr/local/bin so look there first)

Index: diff
===================================================================
RCS file: /cvsroot/lxr/lxr/diff,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- diff	2 Sep 2004 15:26:42 -0000	1.14
+++ diff	26 Oct 2004 17:08:07 -0000	1.15
@@ -103,7 +103,7 @@
 	}
 
 	fflush;
-	$ENV{'PATH'} = '/bin:/usr/local/bin:/usr/bin:/usr/sbin';
+	$ENV{'PATH'} = '/usr/local/bin:/usr/bin:/bin:/usr/sbin';
 	unless (open(DIFF, "-|")) {
 		open(STDERR, ">&STDOUT");
 		exec('diff', '-U0', $origtemp, $difftemp);

[Lxr-commits] CVS: lxr initdb-oracle.sql,1.3,1.4

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

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17428

Modified Files:
	initdb-oracle.sql 
Log Message:
update with new tables/columns

Index: initdb-oracle.sql
===================================================================
RCS file: /cvsroot/lxr/lxr/initdb-oracle.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- initdb-oracle.sql	20 Jul 2004 15:31:24 -0000	1.3
+++ initdb-oracle.sql	25 Oct 2004 20:18:50 -0000	1.4
@@ -1,16 +1,41 @@
+-- This assumes you have a user 'lxr' set up already.
+
 drop sequence lxr_filenum;
 drop sequence lxr_symnum;
-drop table lxr_indexes;
-drop table lxr_usage;
-drop table lxr_symbols;
-drop table lxr_releases;
-drop table lxr_status;
-drop table lxr_files;
+drop sequence lxr_declnum;
+drop table    lxr_indexes;
+drop table    lxr_declarations;
+drop table    lxr_usage;
+drop table    lxr_symbols;
+drop table    lxr_releases;
+drop table    lxr_status;
+drop table    lxr_files;
 
 commit;
 
-create sequence lxr_filenum;
-create sequence lxr_symnum;
+create sequence lxr_filenum
+INCREMENT BY 1   
+START WITH 1    
+NOMAXVALUE       
+NOMINVALUE       
+CACHE 5          
+NOORDER;         
+
+create sequence lxr_symnum
+INCREMENT BY 1   
+START WITH 1    
+NOMAXVALUE       
+NOMINVALUE       
+CACHE 5          
+NOORDER;         
+
+create sequence lxr_declnum
+INCREMENT BY 1   
+START WITH 1    
+NOMAXVALUE       
+NOMINVALUE       
+CACHE 5          
+NOORDER;         
 
 commit;
 
@@ -20,7 +45,9 @@
 	fileid		number,
 	constraint lxr_pk_files primary key (fileid)
 );
+
 alter table lxr_files add unique (filename, revision);
+
 create index lxr_i_files on lxr_files(filename);
 
 commit;
@@ -28,22 +55,37 @@
 create table lxr_symbols (				
 	symname		varchar2(250),
 	symid		number,
-	constraint lxr_pk_symbols primary key (symid)
+	constraint pk_lxr_symbols primary key (symid)
 );
+
 alter table lxr_symbols add unique(symname);
 
 commit;
 
+create table lxr_declarations (
+	declid		number NULL,
+	langid		number NULL,
+	declaration	varchar2(255),
+	constraint pk_lxr_declarations primary key (declid)
+);
+
+commit;
+
 create table lxr_indexes (
 	symid		number,
 	fileid		number,
 	line		number,
-	type		varchar2(250),
+	langid		number,
+	type		number,
 	relsym		number,
-	constraint lxr_fk_indexes_fileid foreign key (fileid) references lxr_files(fileid),
-	constraint lxr_fk_indexes_symid foreign key (symid) references lxr_symbols(symid),
-	constraint lxr_fk_indexes_relsym foreign key (relsym) references lxr_symbols(symid)
+	constraint fk_lxr_indexes_symid foreign key (symid) references lxr_symbols(symid),
+	constraint fk_lxr_indexes_fileid foreign key (fileid) references lxr_files(fileid),
+	/*constraint fk_lxr_indexes_langid foreign key (langid, type) references lxr_declarations(langid, declid),
+	*/
+	
+	constraint fk_lxr_indexes_relsym foreign key (relsym) references lxr_symbols(symid)
 );
+
 create index lxr_i_indexes on lxr_indexes(symid);
 
 commit;
@@ -51,8 +93,8 @@
 create table lxr_releases (	
 	fileid		number,
 	release		varchar2(250),
-	constraint lxr_pk_releases primary key (fileid,release),
-	constraint lxr_fk_releases_fileid foreign key (fileid) references lxr_files(fileid)
+	constraint pk_lxr_releases primary key (fileid,release),
+	constraint fk_lxr_releases_fileid foreign key (fileid) references lxr_files(fileid)
 );
 
 commit;
@@ -60,19 +102,35 @@
 create table lxr_status (
 	fileid		number,
 	status		number,
-	constraint lxr_pk_status primary key (fileid),
-	constraint lxr_fk_status_fileid foreign key (fileid) references lxr_files(fileid)
+	constraint pk_lxr_status primary key (fileid),
+	constraint fk_lxr_status_fileid foreign key (fileid) references lxr_files(fileid)
 );
 
 commit;
 
-create table lxr_usage (				
+create table lxr_usage (
 	fileid		number,
 	line		number,
 	symid		number,
-	constraint lxr_fk_usage_fileid foreign key (fileid) references lxr_files(fileid),
-	constraint lxr_fk_usage_symid foreign key (symid) references lxr_symbols(symid)
+	constraint fk_lxr_usage_fileid foreign key (fileid) references lxr_files(fileid),
+	constraint fk_lxr_usage_symid foreign key (symid) references lxr_symbols(symid)
 );
+
 create index lxr_i_usage on lxr_usage(symid);
 
+
+--grants
+
+
+grant select                         on lxr_filenum        to lxr;
+grant select                         on lxr_symnum         to lxr;
+grant select                         on lxr_declnum         to lxr;
+grant select, insert, update, delete on lxr_indexes        to lxr;
+grant select, insert, update, delete on lxr_usage          to lxr;
+grant select, insert, update, delete on lxr_symbols        to lxr;
+grant select, insert, update, delete on lxr_releases       to lxr;
+grant select, insert, update, delete on lxr_status         to lxr;
+grant select, insert, update, delete on lxr_files          to lxr;
+grant select, insert, update, delete on lxr_declarations   to lxr;
+
 commit;
\ No newline at end of file

[Lxr-commits] CVS: lxr/lib/LXR/Lang generic.conf,1.17,1.18

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

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

Modified Files:
	generic.conf 
Log Message:
fix "shell" capitalization to match that used in lxr.conf

Index: generic.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/generic.conf,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- generic.conf	10 Aug 2004 16:14:25 -0000	1.17
+++ generic.conf	19 Oct 2004 19:19:21 -0000	1.18
@@ -16,7 +16,7 @@
 		'C++'    => 'c++',
 		'Python' => 'python',
 		'SQL'    => 'SQL2',
-		'Shell'  => 'sh',
+		'shell'  => 'sh',
 	},
 
 	# lang map specifies info for each language

[Lxr-commits] CVS: lxr/lib/LXR/Index Oracle.pm,1.10,1.11

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

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

Modified Files:
	Oracle.pm 
Log Message:
oops, retract local change

Index: Oracle.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Oracle.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Oracle.pm	18 Oct 2004 20:42:45 -0000	1.10
+++ Oracle.pm	18 Oct 2004 22:19:29 -0000	1.11
@@ -18,10 +18,6 @@
 
 package LXR::Index::Oracle;
 
-BEGIN {
-    $ENV{'ORACLE_HOME'}='/lcl/apps/oracle';
-}
-    
 $CVSID = '$Id$ ';
 
 use strict;

[Lxr-commits] CVS: lxr/lib/LXR/Index Mysql.pm,1.19,1.20 Postgres.pm,1.18,1.19

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

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

Modified Files:
	Mysql.pm Postgres.pm 
Log Message:
fix order of delete statements

Index: Mysql.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Mysql.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Mysql.pm	27 Jul 2004 08:05:45 -0000	1.19
+++ Mysql.pm	18 Oct 2004 20:45:37 -0000	1.20
@@ -334,8 +334,8 @@
 	$self->{delete_indexes}->execute($version);
 	$self->{delete_useage}->execute($version);
 	$self->{delete_status}->execute($version);
-	$self->{delete_files}->execute($version);
 	$self->{delete_releases}->execute($version);
+	$self->{delete_files}->execute($version);
 }
 
 sub DESTROY {

Index: Postgres.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Postgres.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Postgres.pm	27 Jul 2004 08:05:45 -0000	1.18
+++ Postgres.pm	18 Oct 2004 20:45:37 -0000	1.19
@@ -315,8 +315,8 @@
 	$delete_indexes->execute($version);
 	$delete_usage->execute($version);
 	$delete_status->execute($version);
-	$delete_files->execute($version);
 	$delete_releases->execute($version);
+	$delete_files->execute($version);
 	commit_if_limit();
 }
 

[Lxr-commits] CVS: lxr/lib/LXR/Index Oracle.pm,1.9,1.10

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

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

Modified Files:
	Oracle.pm 
Log Message:
merge many old structure changes from Mysql.pm

Index: Oracle.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Oracle.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Oracle.pm	18 Oct 2004 19:09:32 -0000	1.9
+++ Oracle.pm	18 Oct 2004 20:42:45 -0000	1.10
@@ -18,6 +18,10 @@
 
 package LXR::Index::Oracle;
 
+BEGIN {
+    $ENV{'ORACLE_HOME'}='/lcl/apps/oracle';
+}
+    
 $CVSID = '$Id$ ';
 
 use strict;
@@ -49,12 +53,12 @@
 
 	$self->{files_select} =
 	  $self->{dbh}
-	  ->prepare("select fileid from ${prefix}files where  filename = ? and  revision = ?");
+	  ->prepare("select fileid from ${prefix}files where filename = ? and revision = ?");
 	$self->{files_insert} =
 	  $self->{dbh}->prepare("insert into ${prefix}files values (?, ?, ${prefix}filenum.nextval)");
 
 	$self->{symbols_byname} =
-	  $self->{dbh}->prepare("select symid from ${prefix}symbols where  symname = ?");
+	  $self->{dbh}->prepare("select symid from ${prefix}symbols where symname = ?");
 	$self->{symbols_byid} =
 	  $self->{dbh}->prepare("select symname from ${prefix}symbols where symid = ?");
 	$self->{symbols_insert} =
@@ -63,18 +67,21 @@
 	  $self->{dbh}->prepare("delete from ${prefix}symbols where symname = ?");
 
 	$self->{indexes_select} =
-	  $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 "
+	  $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 = ? ");
 	$self->{indexes_insert} =
-	  $self->{dbh}->prepare("insert into ${prefix}indexes values (?, ?, ?, ?, ?, ?)");
+	  $self->{dbh}->prepare(
+		"insert into ${prefix}indexes (symid, fileid, line, langid, type, relsym) values (?, ?, ?, ?, ?, ?)"
+	  );
 
 	$self->{releases_select} =
 	  $self->{dbh}->prepare("select * from ${prefix}releases where fileid = ? and  release = ?");
-
-	$self->{releases_insert} = $self->{dbh}->prepare("insert into ${prefix}releases values (?, ?)");
+	$self->{releases_insert} =
+	  $self->{dbh}->prepare("insert into ${prefix}releases (fileid, release) values (?, ?)");
 
 	$self->{status_get} =
 	  $self->{dbh}->prepare("select status from ${prefix}status where fileid = ?");
@@ -82,20 +89,21 @@
 	$self->{status_insert} = $self->{dbh}->prepare
 
 	  #		("insert into status select ?, 0 except select fileid, 0 from status");
-	  ("insert into ${prefix}status values (?, ?)");
+	  ("insert into ${prefix}status (fileid, status) values (?, ?)");
 
 	$self->{status_update} =
 	  $self->{dbh}
 	  ->prepare("update ${prefix}status set status = ? where fileid = ? and status <= ?");
 
-	$self->{usage_insert} = $self->{dbh}->prepare("insert into ${prefix}usage values (?, ?, ?)");
+	$self->{usage_insert} =
+	  $self->{dbh}->prepare("insert into ${prefix}usage (fileid, line, symid) values (?, ?, ?)");
 	$self->{usage_select} =
 	  $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 = ? "
+		  . "and u.fileid = r.fileid "
+		  . "and s.symname = ? and  r.release = ? "
 		  . "order by f.filename");
 	$self->{decl_select} =
 	  $self->{dbh}->prepare(
@@ -192,9 +200,7 @@
 			$self->{files_insert}->execute($filename, $revision);
 			$self->{files_select}->execute($filename, $revision);
 			($fileid) = $self->{files_select}->fetchrow_array();
-
 		}
-
 		$files{"$filename\t$revision"} = $fileid;
 		$self->{files_select}->finish();
 	}
@@ -204,15 +210,12 @@
 # Indicate that this filerevision is part of this release
 sub release {
 	my ($self, $fileid, $release) = @_;
-	my (@row);
+
 	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);
+		$self->{releases_insert}->execute($fileid, $release);
 		$self->{releases_insert}->finish();
 	}
 }
@@ -252,22 +255,22 @@
 }
 
 sub issymbol {
-	my ($self, $symname) = @_;
+	my ($self, $symname, $release, $lang) = @_;
 	my ($symid);
 
-	$symid = $symcache{$symname};
+	$symid = $symcache{$release}{$lang}{$symname};
 	unless (defined($symid)) {
 		$self->{symbols_byname}->execute($symname);
 		($symid) = $self->{symbols_byname}->fetchrow_array();
 		$self->{symbols_byname}->finish();
-		$symcache{$symname} = $symid;
+		$symcache{$release}{$lang}{$symname} = $symid;
 	}
 
 	return $symid;
 }
 
-# If this file has not been indexed earlier, mark it as being indexed
-# now and return true.  Return false if already indexed.
+# If this file has not been indexed earlier return true.  Return false
+# if already indexed.
 sub toindex {
 	my ($self, $fileid) = @_;
 	my ($status);
@@ -279,7 +282,8 @@
 	if (!defined($status)) {
 		$self->{status_insert}->execute($fileid + 0, 0);
 	}
-	return $self->{status_update}->execute(1, $fileid, 0) > 0;
+
+	return $status == 0;
 }
 
 sub setindexed {
@@ -289,9 +293,13 @@
 
 sub toreference {
 	my ($self, $fileid) = @_;
-	my ($rv);
+	my ($status);
 
-	return $self->{status_update}->execute(2, $fileid, 1) > 0;
+	$self->{status_get}->execute($fileid);
+	$status = $self->{status_get}->fetchrow_array();
+	$self->{status_get}->finish();
+
+	return $status < 2;
 }
 
 sub setreferenced {
@@ -323,7 +331,6 @@
 	return $id;
 }
 
-
 sub purge {
 	my ($self, $version) = @_;
 
@@ -349,8 +356,10 @@
 	$self->{status_update}   = undef;
 	$self->{usage_insert}    = undef;
 	$self->{usage_select}    = undef;
+	$self->{decl_select}     = undef;
+	$self->{decl_insert}     = undef;
 	$self->{delete_indexes}  = undef;
-	$self->{delete_useage}   = undef;
+	$self->{delete_usage}   = undef;
 	$self->{delete_status}   = undef;
 	$self->{delete_releases} = undef;
 	$self->{delete_files}    = undef;

[Lxr-commits] CVS: lxr search,1.27,1.28

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

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22688

Modified Files:
	search 
Log Message:
handle errors a bit better; also, rearrange piping in swishsearch for iPlanet

Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- search	2 Sep 2004 15:26:42 -0000	1.27
+++ search	18 Oct 2004 20:22:57 -0000	1.28
@@ -146,25 +146,23 @@
 		  "<p align='center'><i>Version '$release' has not been indexed and is unavailable for searching.</i></p>";
 		return;
 	}
-
 	$ENV{'PATH'} = '/bin:/usr/local/bin:/usr/bin:/usr/sbin';
 	unless (open(SWISH, "-|")) {
-		open(STDERR, ">&STDOUT");
 		exec($config->swishbin, "-f", $config->swishdir . "/" . $release . ".index",
 			"-w", "'(" . $searchtext . ")'");
-
+		open(STDERR, ">&STDOUT");
 		print(STDERR "Couldn't exec " . $config->swishbin . ": $!\n");
 		kill(9, $$);
 	}
 
 	my @result = grep { not /^[\#\.]/ } <SWISH>;
 	close(SWISH);
-	my $retval = $? >> 8;
-
+	my $retval = $?;
 	my @ret;
 	if ($retval == 0) {
 		my $numlines = 0;
 		foreach my $hit (@result) {
+			print $hit, "<br>\n" if $hit =~ $hit =~ /No such file or directory/;	# feeble attempt to print possible errors (e.g. incomplete LD_LIBRARY_PATH causes linking errors)
 			next if $hit =~ /^err:/;    # skip; only 'no results' errors happen with return value 0
 
 			my ($score, $file) = $hit =~ /^(\d+) \/(.+) "(.+)" \d+/;
@@ -176,7 +174,7 @@
 		}
 		return @ret;
 	} else {
-		print("<b>Search failed</b><br>\n@result");
+		print("<b><font color='red'>Search failed: internal error</font></b><br>\n@result");
 		return;
 	}
 }
@@ -310,9 +308,7 @@
 		)
 	);
 }
-
 httpinit;
-
 &makeheader('search');
 &search;
 &makefooter('search');

[Lxr-commits] CVS: lxr/lib/LXR/Index Oracle.pm,1.8,1.9

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

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

Modified Files:
	Oracle.pm 
Log Message:
some oracle fixes

Index: Oracle.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Oracle.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Oracle.pm	27 Jul 2004 08:05:45 -0000	1.8
+++ Oracle.pm	18 Oct 2004 19:09:32 -0000	1.9
@@ -51,14 +51,14 @@
 	  $self->{dbh}
 	  ->prepare("select fileid from ${prefix}files where  filename = ? and  revision = ?");
 	$self->{files_insert} =
-	  $self->{dbh}->prepare("insert into ${prefix}files values (?, ?, filenum.nextval)");
+	  $self->{dbh}->prepare("insert into ${prefix}files values (?, ?, ${prefix}filenum.nextval)");
 
 	$self->{symbols_byname} =
 	  $self->{dbh}->prepare("select symid from ${prefix}symbols where  symname = ?");
 	$self->{symbols_byid} =
 	  $self->{dbh}->prepare("select symname from ${prefix}symbols where symid = ?");
 	$self->{symbols_insert} =
-	  $self->{dbh}->prepare("insert into ${prefix}symbols values ( ?, symnum.nextval)");
+	  $self->{dbh}->prepare("insert into ${prefix}symbols values ( ?, ${prefix}symnum.nextval)");
 	$self->{symbols_remove} =
 	  $self->{dbh}->prepare("delete from ${prefix}symbols where symname = ?");
 
@@ -69,7 +69,7 @@
 		  . "and f.fileid = r.fileid "
 		  . "and  s.symname = ? and  r.release = ? ");
 	$self->{indexes_insert} =
-	  $self->{dbh}->prepare("insert into ${prefix}indexes values (?, ?, ?, ?, ?)");
+	  $self->{dbh}->prepare("insert into ${prefix}indexes values (?, ?, ?, ?, ?, ?)");
 
 	$self->{releases_select} =
 	  $self->{dbh}->prepare("select * from ${prefix}releases where fileid = ? and  release = ?");
@@ -97,6 +97,12 @@
 		  . "and u.fileid = r.fileid and "
 		  . "s.symname = ? and  r.release = ? "
 		  . "order by f.filename");
+	$self->{decl_select} =
+	  $self->{dbh}->prepare(
+		"select declid from ${prefix}declarations where langid = ? and declaration = ?");
+	$self->{decl_insert} =
+	  $self->{dbh}->prepare(
+		"insert into ${prefix}declarations (declid, langid, declaration) values (${prefix}declnum.nextval, ?, ?)");
 
 	$self->{delete_indexes} =
 	  $self->{dbh}->prepare("delete from ${prefix}indexes "
@@ -121,10 +127,10 @@
 }
 
 sub index {
-	my ($self, $symname, $fileid, $line, $type, $relsym) = @_;
+	my ($self, $symname, $fileid, $line, $langid, $type, $relsym) = @_;
 
 	$self->{indexes_insert}->execute($self->symid($symname),
-		$fileid, $line, $type, $relsym ? $self->symid($relsym) : undef);
+		$fileid, $line, $langid, $type, $relsym ? $self->symid($relsym) : undef);
 }
 
 sub reference {
@@ -276,6 +282,11 @@
 	return $self->{status_update}->execute(1, $fileid, 0) > 0;
 }
 
+sub setindexed {
+	my ($self, $fileid) = @_;
+	$self->{status_update}->execute(1, $fileid, 0);
+}
+
 sub toreference {
 	my ($self, $fileid) = @_;
 	my ($rv);
@@ -283,6 +294,11 @@
 	return $self->{status_update}->execute(2, $fileid, 1) > 0;
 }
 
+sub setreferenced {
+	my ($self, $fileid) = @_;
+	$self->{status_update}->execute(2, $fileid, 1);
+}
+
 # This function should be called before parsing each new file,
 # if this is not done the too much memory will be used and
 # tings will become very slow.
@@ -290,6 +306,24 @@
 	%symcache = ();
 }
 
+sub getdecid {
+	my ($self, $lang, $string) = @_;
+
+	my $rows = $self->{decl_select}->execute($lang, $string);
+	$self->{decl_select}->finish();
+
+	unless ($rows > 0) {
+		$self->{decl_insert}->execute($lang, $string);
+	}
+
+	$self->{decl_select}->execute($lang, $string);
+	my $id = $self->{decl_select}->fetchrow_array();
+	$self->{decl_select}->finish();
+
+	return $id;
+}
+
+
 sub purge {
 	my ($self, $version) = @_;
 
@@ -298,8 +332,8 @@
 	$self->{delete_indexes}->execute($version);
 	$self->{delete_usage}->execute($version);
 	$self->{delete_status}->execute($version);
-	$self->{delete_files}->execute($version);
 	$self->{delete_releases}->execute($version);
+	$self->{delete_files}->execute($version);
 }
 
 sub DESTROY {

[Lxr-commits] CVS: lxr INSTALL,1.18,1.19

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

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11917

Modified Files:
	INSTALL 
Log Message:
explain icons for unlucky people who can't use Apache

Index: INSTALL
===================================================================
RCS file: /cvsroot/lxr/lxr/INSTALL,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- INSTALL	20 Jul 2004 15:34:37 -0000	1.18
+++ INSTALL	11 Oct 2004 19:39:26 -0000	1.19
@@ -209,6 +209,15 @@
 http://yoursite/lxr/source and you should see the listing for the top
 of your source tree.
 
+If you are using a webserver other than Apache, you need to provide:
+/icons/back.gif
+/icons/folder.gif
+/icons/c.gif
+/icons/text.gif
+/icons/compressed.gif
+/icons/image2.gif
+/icons/generic.gif
+
 Getting help if it doesn't work:
 --------------------------------
 If you can't get LXR to work then you can try asking on the mailing

[Lxr-commits] CVS: lxr/tests README,NONE,1.1

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28608

Added Files:
	README 
Log Message:
Describe how to run the automatic tests


--- NEW FILE: README ---
To run these tests:

- Make sure Test::Unit is installed
- Execute TestRunner.pl AllTests

[Lxr-commits] CVS: lxr/tests ConfigTest.pm,1.1,1.2

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28503

Modified Files:
	ConfigTest.pm 
Log Message:
Fix test to work correctly


Index: ConfigTest.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/ConfigTest.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ConfigTest.pm	4 Mar 2002 15:11:27 -0000	1.1
+++ ConfigTest.pm	6 Sep 2004 21:54:45 -0000	1.2
@@ -31,14 +31,14 @@
 	my $self = shift;
 	$self->assert($self->{config}->swishindex eq '/test/lxr/bin/swish-e',
 		   "swishindex read failed");
-	$self->assert($self->{config}->baseurl eq 'http://test/lxr',
-		   "Config accessed wrong baseurl");
+	$self->assert($self->{config}->baseurl eq 'http://test/lxr/',
+		   "Config accessed wrong baseurl " . $self->{config}->baseurl);
 }
 
 # test access to the variables section
 sub test_variables {
 	my $self = shift;
-	$self->assert($self->{config}->variable('v') == '1.0.6',
+	$self->assert($self->{config}->variable('v') eq '1.0.6',
 		   "Variable default not correct");
 	$self->assert(($self->{config}->varrange('v'))[1] =~ /hi hippy/,
 		   "Variable value missing");
@@ -49,7 +49,7 @@
 	my @vars = $self->{config}->allvariables();
     $self->assert(grep {$_ eq 'v'} @vars, "allvariables didn't return v");
 	$self->assert(grep {$_ eq 'a'} @vars, "allvariables didn't return a");
-	$self->assert($#vars == 2, "Too many variables returned");
+	$self->assert($#vars == 1, "Too many variables returned got " . $self->{config}->allvariables());
 }
 
 

[Lxr-commits] CVS: lxr/lib/LXR/Files CVS.pm,1.31,1.32

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

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

Modified Files:
	CVS.pm 
Log Message:
iPlanet on solaris.. what a fun non-gnu platform... anyway, this keeps error messages from getting output and creating malformed headers

Index: CVS.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/CVS.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- CVS.pm	21 Jul 2004 20:44:30 -0000	1.31
+++ CVS.pm	2 Sep 2004 18:50:03 -0000	1.32
@@ -38,7 +38,7 @@
 
 		# the rcsdiff command (used in getdiff) uses parameters only supported by GNU diff
 		$ENV{'PATH'} = '/bin:/usr/local/bin:/usr/bin:/usr/sbin';
-		if (`diff --version` =~ /GNU/) {
+		if (`diff --version 2>/dev/null` =~ /GNU/) {
 			$gnu_diff = 1;
 		} else {
 			$gnu_diff = 0;

[Lxr-commits] CVS: lxr diff,1.13,1.14 find,1.23,1.24 ident,1.20,1.21 search,1.26,1.27 source,1.43,1.44

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

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23459

Modified Files:
	diff find ident search source 
Log Message:
fix a bug I made a while back; explain each "use" line

Index: diff
===================================================================
RCS file: /cvsroot/lxr/lxr/diff,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- diff	21 Jul 2004 20:44:30 -0000	1.13
+++ diff	2 Sep 2004 15:26:42 -0000	1.14
@@ -26,7 +26,8 @@
 $CVSID = '$Id$ ';
 
 use strict;
-use lib '.';
+use lib '.'; # for Local.pm
+use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; # if LXR modules are in ./lib
 
 use LXR::Common qw(:html);
 use Local;

Index: find
===================================================================
RCS file: /cvsroot/lxr/lxr/find,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- find	21 Jul 2004 20:44:30 -0000	1.23
+++ find	2 Sep 2004 15:26:42 -0000	1.24
@@ -26,7 +26,8 @@
 $CVSID = '$Id$ ';
 
 use strict;
-use lib '.';
+use lib '.'; # for Local.pm
+use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; # if LXR modules are in ./lib
 
 use LXR::Common qw(:html);
 use LXR::Config;

Index: ident
===================================================================
RCS file: /cvsroot/lxr/lxr/ident,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ident	21 Jul 2004 20:44:30 -0000	1.20
+++ ident	2 Sep 2004 15:26:42 -0000	1.21
@@ -26,7 +26,8 @@
 $CVSID = '$Id$ ';
 
 use strict;
-use lib '.';
+use lib '.'; # for Local.pm
+use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; # if LXR modules are in ./lib
 
 use LXR::Common qw(:html);
 use Local;

Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- search	26 Jul 2004 20:53:17 -0000	1.26
+++ search	2 Sep 2004 15:26:42 -0000	1.27
@@ -26,7 +26,8 @@
 $CVSID = '$Id$ ';
 
 use strict;
-use lib '.';
+use lib '.'; # for Local.pm
+use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; # if LXR modules are in ./lib
 
 use LXR::Common qw(:html);
 use LXR::Config;

Index: source
===================================================================
RCS file: /cvsroot/lxr/lxr/source,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- source	21 Jul 2004 20:44:30 -0000	1.43
+++ source	2 Sep 2004 15:26:42 -0000	1.44
@@ -27,7 +27,8 @@
 $CVSID = '$Id$ ';
 
 use strict;
-use lib '.';
+use lib '.'; # for Local.pm
+use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; # if LXR modules are in ./lib
 
 use LXR::Common qw(:html);
 use Local;

[Lxr-commits] CVS: lxr/lib/LXR/Lang Cobol.pm,NONE,1.1 generic.conf,1.16,1.17

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

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

Modified Files:
	generic.conf 
Added Files:
	Cobol.pm 
Log Message:
add cobol support

--- NEW FILE: Cobol.pm ---
# -*- tab-width: 4 -*- ###############################################
#
# $Id: Cobol.pm,v 1.1 2004/08/10 16:14:25 brondsem Exp $
#
# Enhances the support for the Java language over that provided by
# Generic.pm
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

package LXR::Lang::Cobol;

my $CVSID = '$Id: Cobol.pm,v 1.1 2004/08/10 16:14:25 brondsem Exp $ ';

use strict;
use LXR::Common;
require LXR::Lang;
require LXR::Lang::Generic;

@LXR::Lang::Cobol::ISA = ('LXR::Lang::Generic');

sub referencefile { }

sub processcode {
	my ($self, $code) = @_;

	$$code =~ s {(^|[^\w\#-])([\w~-][\w-]*)\b}
	{
	  $1.
		( $2 eq "" ? $2 :
		(grep(/^$2$/, $self->langinfo('reserved')) ? "<span class='reserved'>$2</span>" : 
		(
		  $index->issymbol($2, $$self{'release'})) ?
		 join($2, @{$$self{'itag'}}) :
		 $2));
	}ge;

}

1;


Index: generic.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/generic.conf,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- generic.conf	21 Jul 2004 20:44:31 -0000	1.16
+++ generic.conf	10 Aug 2004 16:14:25 -0000	1.17
@@ -160,9 +160,394 @@
 			'langid'   => '5',
 		},
 
-		'COBOL' => {
-			'reserved' => [],
-			'langid'   => '6',
+		'Cobol' => {
+			'reserved' => [
+
+				# other
+				'LIKE',
+				'END-IF',
+
+				# ansi
+				'ACCEPT',
+				'ACCESS',
+				'ADD',
+				'ADVANCING',
+				'AFTER',
+				'ALL',
+				'ALPHABET',
+				'ALPHABETIC',
+				'ALPHABETICLOWER',
+				'ALPHABETICUPPER',
+				'ALPHANUMERIC',
+				'ALPHANUMERICEDITED',
+				'ALSO',
+				'ALTER',
+				'ALTERNATE',
+				'AND',
+				'ANY',
+				'ARE',
+				'AREA',
+				'AREAS',
+				'ASCENDING',
+				'ASSIGN',
+				'AT',
+				'AUTHOR',
+				'BEFORE',
+				'BINARY',
+				'BLANK',
+				'BLOCK',
+				'BOTTOM',
+				'BY',
+				'CALL',
+				'CANCEL',
+				'CD',
+				'CF',
+				'CH',
+				'CHARACTER',
+				'CHARACTERS',
+				'CLASS',
+				'CLOCKUNITS',
+				'CLOSE',
+				'COBOL',
+				'CODE',
+				'CODESET',
+				'COLLATING',
+				'COLUMN',
+				'COMMA',
+				'COMMON',
+				'COMMUNICATION',
+				'COMP',
+				'COMP0',
+				'COMP1',
+				'COMP2',
+				'COMP3',
+				'COMP4',
+				'COMP5',
+				'COMP6',
+				'COMPUTATIONAL',
+				'COMPUTATIONAL0',
+				'COMPUTATIONAL1',
+				'COMPUTATIONAL2',
+				'COMPUTATIONAL3',
+				'COMPUTATIONAL4',
+				'COMPUTATIONAL5',
+				'COMPUTATIONAL6',
+				'COMPUTATIONALX',
+				'COMPUTE',
+				'COMPX',
+				'CONFIGURATION',
+				'CONTAINS',
+				'CONTENT',
+				'CONTINUE',
+				'CONTROL',
+				'CONTROLAREA',
+				'CONTROLS',
+				'CONVERTING',
+				'COPY',
+				'CORR',
+				'CORRESPONDING',
+				'COUNT',
+				'CURRENCY',
+				'DATA',
+				'DATE',
+				'DATECOMPILED',
+				'DATEWRITTEN',
+				'DAY',
+				'DAYOFWEEK',
+				'DE',
+				'DEBUGCONTENTS',
+				'DEBUGGING',
+				'DEBUGITEM',
+				'DEBUGLINE',
+				'DEBUGNAME',
+				'DEBUGSUB1',
+				'DEBUGSUB2',
+				'DEBUGSUB3',
+				'DECIMALPOINT',
+				'DECLARATIVES',
+				'DELETE',
+				'DELIMITED',
+				'DELIMITER',
+				'DEPENDING',
+				'DESCENDING',
+				'DESTINATION',
+				'DETAIL',
+				'DISABLE',
+				'DISPLAY',
+				'DIVIDE',
+				'DIVISION',
+				'DOWN',
+				'DUPLICATES',
+				'DYNAMIC',
+				'EGI',
+				'ELSE',
+				'EMI',
+				'ENABLE',
+				'END',
+				'ENDADD',
+				'ENDCALL',
+				'ENDCOMPUTE',
+				'ENDDELETE',
+				'ENDDIVIDE',
+				'ENDEVALUATE',
+				'ENDIF',
+				'ENDMULTIPLY',
+				'ENDOFPAGE',
+				'ENDPERFORM',
+				'ENDREAD',
+				'ENDRECEIVE',
+				'ENDRETURN',
+				'ENDREWRITE',
+				'ENDSEARCH',
+				'ENDSTART',
+				'ENDSTRING',
+				'ENDSUBTRACT',
+				'ENDUNSTRING',
+				'ENDWRITE',
+				'ENTER',
+				'ENVIRONMENT',
+				'EOP',
+				'EQUAL',
+				'ERROR',
+				'ESI',
+				'EVALUATE',
+				'EVERY',
+				'EXCEPTION',
+				'EXIT',
+				'EXTEND',
+				'EXTERNAL',
+				'FALSE',
+				'FD',
+				'FILE',
+				'FILECONTROL',
+				'FILLER',
+				'FINAL',
+				'FIRST',
+				'FOOTING',
+				'FOR',
+				'FROM',
+				'FUNCTION',
+				'GENERATE',
+				'GIVING',
+				'GLOBAL',
+				'GO',
+				'GREATER',
+				'GROUP',
+				'HEADING',
+				'HIGHVALUE',
+				'HIGHVALUES',
+				'IDENTIFICATION',
+				'IF',
+				'IN',
+				'INDEX',
+				'INDEXED',
+				'INDICATE',
+				'INITIAL',
+				'INITIALIZE',
+				'INITIATE',
+				'INPUT',
+				'INPUTOUTPUT',
+				'INSPECT',
+				'INSTALLATION',
+				'INTO',
+				'INVALID',
+				'IO',
+				'IOCONTROL',
+				'JUST',
+				'JUSTIFIED',
+				'KEY',
+				'LABEL',
+				'LAST',
+				'LEADING',
+				'LEFT',
+				'LENGTH',
+				'LESS',
+				'LIMIT',
+				'LIMITS',
+				'LINAGE',
+				'LINAGECOUNTER',
+				'LINE',
+				'LINECOUNTER',
+				'LINES',
+				'LINKAGE',
+				'LOCK',
+				'LOWVALUE',
+				'LOWVALUES',
+				'MEMORY',
+				'MERGE',
+				'MESSAGE',
+				'MODE',
+				'MODULES',
+				'MORELABELS',
+				'MOVE',
+				'MULTIPLE',
+				'MULTIPLY',
+				'NATIVE',
+				'NEGATIVE',
+				'NEXT',
+				'NO',
+				'NOT',
+				'NUMBER',
+				'NUMERIC',
+				'NUMERICEDITED',
+				'OBJECTCOMPUTER',
+				'OCCURS',
+				'OF',
+				'OFF',
+				'OMITTED',
+				'ON',
+				'OPEN',
+				'OPTIONAL',
+				'OR',
+				'ORDER',
+				'ORGANIZATION',
+				'OTHER',
+				'OUTPUT',
+				'OVERFLOW',
+				'PACKEDDECIMAL',
+				'PADDING',
+				'PAGE',
+				'PAGECOUNTER',
+				'PERFORM',
+				'PF',
+				'PH',
+				'PIC',
+				'PICTURE',
+				'PLUS',
+				'POINTER',
+				'POSITION',
+				'POSITIVE',
+				'PRINTING',
+				'PROCEDURE',
+				'PROCEDURES',
+				'PROCEED',
+				'PROGRAM',
+				'PROGRAMID',
+				'PURGE',
+				'QUEUE',
+				'QUOTE',
+				'QUOTES',
+				'RANDOM',
+				'RD',
+				'READ',
+				'RECEIVE',
+				'RECORD',
+				'RECORDS',
+				'REDEFINES',
+				'REEL',
+				'REFERENCE',
+				'REFERENCES',
+				'RELATIVE',
+				'RELEASE',
+				'REMAINDER',
+				'REMOVAL',
+				'RENAMES',
+				'REPLACE',
+				'REPLACING',
+				'REPORT',
+				'REPORTING',
+				'REPORTS',
+				'RERUN',
+				'RESERVE',
+				'RETURN',
+				'REVERSED',
+				'REWIND',
+				'REWRITE',
+				'RF',
+				'RH',
+				'RIGHT',
+				'ROUNDED',
+				'RUN',
+				'SAME',
+				'SD',
+				'SEARCH',
+				'SECTION',
+				'SECURITY',
+				'SEGMENT',
+				'SEGMENTLIMIT',
+				'SELECT',
+				'SEND',
+				'SENTENCE',
+				'SEPARATE',
+				'SEQUENCE',
+				'SEQUENTIAL',
+				'SET',
+				'SIGN',
+				'SIZE',
+				'SORT',
+				'SORTMERGE',
+				'SOURCE',
+				'SOURCECOMPUTER',
+				'SPACE',
+				'SPACES',
+				'SPECIALNAMES',
+				'STANDARD',
+				'STANDARD1',
+				'STANDARD2',
+				'START',
+				'STATUS',
+				'STOP',
+				'STRING',
+				'SUBQUEUE1',
+				'SUBQUEUE2',
+				'SUBQUEUE3',
+				'SUBTRACT',
+				'SUM',
+				'SUPER',
+				'SUPPRESS',
+				'SYMBOLIC',
+				'SYNC',
+				'SYNCHRONIZED',
+				'TALLYING',
+				'TAPE',
+				'TERMINAL',
+				'TERMINATE',
+				'TEST',
+				'TEXT',
+				'THAN',
+				'THEN',
+				'THROUGH',
+				'THRU',
+				'TIME',
+				'TIMES',
+				'TO',
+				'TOP',
+				'TRAILING',
+				'TRUE',
+				'TYPE',
+				'UNIT',
+				'UNSTRING',
+				'UNTIL',
+				'UP',
+				'UPON',
+				'USAGE',
+				'USE',
+				'USING',
+				'VALUE',
+				'VALUES',
+				'VARYING',
+				'WHEN',
+				'WITH',
+				'WORDS',
+				'WORKINGSTORAGE',
+				'WRITE',
+				'ZERO',
+				'ZEROES',
+				'ZEROS',
+			],
+			'spec' => [
+				'comment' => ('^[\d ]*\*', '$'),
+				'string'  => ('"',         '"'),
+			],
+			'typemap' => {
+				'd' => 'data item',
+				'f' => 'file description',
+				'g' => 'group item',
+				'p' => 'paragraph',
+				'P' => 'program id',
+				's' => 'section',
+			},
+			'langid' => '6',
 		},
 		'Perl' => {
 			'reserved' => [ 'sub', ],

[Lxr-commits] CVS: lxr/templates lxr.conf,1.23,1.24

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

Update of /cvsroot/lxr/lxr/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6751/templates

Modified Files:
	lxr.conf 
Log Message:
add cobol support

Index: lxr.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lxr.conf,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- lxr.conf	21 Jul 2004 20:44:31 -0000	1.23
+++ lxr.conf	10 Aug 2004 16:14:25 -0000	1.24
@@ -163,10 +163,10 @@
 			# Some languages are commented out until the relevant entries in generic.conf are made
 			# The list here is the set supported by ctags 5.0.1
 			# 'Beta'    => [ 'Beta',   '(?i)\.bet$', 'LXR::Lang::Generic' ],
-			# 'Cobol'   => [ 'Cobol',  '(?i)\.cob$', 'LXR::Lang::Generic' ],
 			# 'Eiffel'  => [ 'Eiffel', '(?i)\.e$',   'LXR::Lang::Generic' ],
 			# 'Fortran' =>
 			#   [ 'Fortran', '(?i)\.f$|\.for$|\.ftn$|\.f77$|\.f90$|\.f95$', 'LXR::Lang::Generic' ],
+			'Cobol' => [ 'Cobol',  '(?i)\.cob$', 'LXR::Lang::Cobol' ],
 			'Java' => [ 'Java', '(?i)\.java$', 'LXR::Lang::Java', '4' ],
 
 			# 'Lisp' => [

[Lxr-commits] CVS: lxr/templates lxr.css,1.1,1.2

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

Update of /cvsroot/lxr/lxr/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6451/templates

Modified Files:
	lxr.css 
Log Message:
highlight reserved words; different colors for comments and strings

Index: lxr.css
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lxr.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lxr.css	28 Sep 2001 13:48:39 -0000	1.1
+++ lxr.css	10 Aug 2004 16:13:03 -0000	1.2
@@ -110,12 +110,17 @@
 
 /* comments */
 .comment {
-  color: #000066;
+  color: #808080;
 }
 
 /* strings */
 .string {
-  color: #000066;
+  color: #0000CC;
+}
+
+/* reserved words */
+.reserved {
+  color: #800000;
 }
 
 /****************************************/

[Lxr-commits] CVS: lxr/lib/LXR/Lang Generic.pm,1.17,1.18 Java.pm,1.6,1.7

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

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

Modified Files:
	Generic.pm Java.pm 
Log Message:
highlight reserved words; different colors for comments and strings

Index: Generic.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Generic.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Generic.pm	21 Jul 2004 20:44:31 -0000	1.17
+++ Generic.pm	10 Aug 2004 16:13:02 -0000	1.18
@@ -149,7 +149,6 @@
 #   $code - reference to the code to markup
 #   @itag - ???
 # TODO : Make the handling of identifier recognition language dependant
-
 sub processcode {
 	my ($self, $code) = @_;
 	my ($start, $id);
@@ -157,10 +156,10 @@
 	# Replace identifier by link unless it's a reserved word
 	{
 	  $1.
-		((!grep(/^$2$/, $self->langinfo('reserved')) &&
-		  $index->issymbol($2, $$self{'release'})) ?
-		 join($2, @{$$self{'itag'}}) :
-		 $2);
+		(
+		  grep(/^$2$/, $self->langinfo('reserved')) ? "<span class='reserved'>$2</span>" : 
+		  ($index->issymbol($2, $$self{'release'}) ? join($2, @{$$self{'itag'}}) : $2)
+		);
 	}ge;
 }
 

Index: Java.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Java.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Java.pm	21 Jul 2004 20:44:31 -0000	1.6
+++ Java.pm	10 Aug 2004 16:13:03 -0000	1.7
@@ -40,7 +40,7 @@
 	# Deal with package declaration of the form
 	# "package java.lang.util"
 	$$frag =~ s#(package\s+)([\w.]+)#
-	    $1.
+	    "<span class='reserved'>$1</span>".
 	    ($index->issymbol($2, $$self{'release'}) ?
 		join($2, @{$$self{'itag'}}) : $2)
 	    #e;
@@ -48,7 +48,7 @@
 	# Deal with import declaration of the form
 	# "import java.awt.*" by providing link to the package
 	$$frag =~ s#(import\s+)([\w.]+)(\.\*)#
-		$1.
+		"<span class='reserved'>$1</span>".
 			($index->issymbol($2, $$self{'release'}) ?
 			 join($2, @{$$self{'itag'}}) : $2) . 
 				 $3 #e;
@@ -57,7 +57,7 @@
 	# "import java.awt.classname" by providing links to the
 	# package and the class
 	$$frag =~ s#(import\s+)([\w.]+)\.(\w+)(\W)#
-  		$1.
+		"<span class='reserved'>$1</span>".
   			($index->issymbol($2, $$self{'release'}) ?
   			 join($2, @{$$self{'itag'}}) : $2) . "." .
 				 ($index->issymbol($3, $$self{'release'}) ?

[Lxr-commits] CVS: lxr/lib/LXR/Index Mysql.pm,1.18,1.19 Oracle.pm,1.7,1.8 Postgres.pm,1.17,1.18

[Malcolm B. <mb...@us...>]

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

Modified Files:
	Mysql.pm Oracle.pm Postgres.pm 
Log Message:
Fix logic of dbprefix test so that a null prefix works properly for older installations.


Index: Mysql.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Mysql.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Mysql.pm	21 Jul 2004 20:44:31 -0000	1.18
+++ Mysql.pm	27 Jul 2004 08:05:45 -0000	1.19
@@ -40,7 +40,7 @@
 		  || fatal "Can't open connection to database\n";
 	}
 
-	if ($config->{'dbprefix'}) {
+	if (defined($config->{'dbprefix'})) {
 		$prefix = $config->{'dbprefix'};
 	} else {
 		$prefix = "lxr_";

Index: Oracle.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Oracle.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Oracle.pm	21 Jul 2004 20:44:31 -0000	1.7
+++ Oracle.pm	27 Jul 2004 08:05:45 -0000	1.8
@@ -38,7 +38,7 @@
 		{ RaiseError => 1, AutoCommit => 1 })
 	  || fatal "Can't open connection to database\n";
 
-	if ($config->{'dbprefix'}) {
+	if (defined($config->{'dbprefix'})) {
 		$prefix = $config->{'dbprefix'};
 	} else {
 		$prefix = "lxr_";

Index: Postgres.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Postgres.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Postgres.pm	21 Jul 2004 20:44:31 -0000	1.17
+++ Postgres.pm	27 Jul 2004 08:05:45 -0000	1.18
@@ -44,7 +44,7 @@
 
 	#	$dbh->trace(1);
 
-	if ($config->{'dbprefix'}) {
+	if (defined($config->{'dbprefix'})) {
 		$prefix = $config->{'dbprefix'};
 	} else {
 		$prefix = "lxr_";

[Lxr-commits] CVS: lxr search,1.25,1.26

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

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29489

Modified Files:
	search 
Log Message:
use same template variables between swish-e & glimpse;
use parenthesis to avoid the swish-e syntax problem instead of providing a tip;


Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- search	26 Jul 2004 20:47:43 -0000	1.25
+++ search	26 Jul 2004 20:53:17 -0000	1.26
@@ -150,7 +150,7 @@
 	unless (open(SWISH, "-|")) {
 		open(STDERR, ">&STDOUT");
 		exec($config->swishbin, "-f", $config->swishdir . "/" . $release . ".index",
-			"-w", "'" . $searchtext . "'");
+			"-w", "'(" . $searchtext . ")'");
 
 		print(STDERR "Couldn't exec " . $config->swishbin . ": $!\n");
 		kill(9, $$);
@@ -176,8 +176,6 @@
 		return @ret;
 	} else {
 		print("<b>Search failed</b><br>\n@result");
-		print "<br><i>Tip: you may need to quote words that end with *</i>"
-		  if join('', @result) =~ /Wildcard not allowed within a word/;
 		return;
 	}
 }
@@ -195,7 +193,6 @@
 			$ret .= expandtemplate(
 				$templ,
 				(
-					score   => sub { return '' },
 					text    => sub { return '' },
 					fileref => sub { fileref("$file", "find-file", "/$file") },
 				)
@@ -219,7 +216,7 @@
 			$ret .= expandtemplate(
 				$templ,
 				(
-					score   => sub { return $score },
+					text   => sub { return $score },
 					fileref => sub { fileref("$file", "find-file", "/$file") },
 				)
 			);

[Lxr-commits] CVS: lxr/templates html-search-glimpse.html,1.2,1.3 html-search-swish.html,1.2,1.3

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

Update of /cvsroot/lxr/lxr/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28509/templates

Modified Files:
	html-search-glimpse.html html-search-swish.html 
Log Message:
combine file name search and freetext search

Index: html-search-glimpse.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-search-glimpse.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- html-search-glimpse.html	15 Jul 2004 14:41:04 -0000	1.2
+++ html-search-glimpse.html	26 Jul 2004 20:47:44 -0000	1.3
@@ -2,10 +2,48 @@
 <form method="get" action="search">
     $variables{<input type="hidden" name="$variable" value="$value">}
     
-    <b>Search for: </b><input type="text" name="string" value="$searchtext_escaped" size="50">
-    <input type="submit" value="search">
-    <br>
-    Powered by glimpse.
+	<table border="0">
+		<tr>
+			<td>
+				<b>Files named:</b>
+			</td>
+			<td>
+				<input type="text" name="filestring" value="$filetext_escaped" size="50">
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td>
+				<input type="checkbox" name="advanced" $advancedchecked value="1"/>
+					Advanced (allow <a href="http://www.perldoc.com/perl5.8.4/pod/perlrequick.html" target="_blank">perl regex</a>)
+				&nbsp;&nbsp;&nbsp;&nbsp;
+				<input type="checkbox" name="casesensitive" $casesensitivechecked value="1"/>
+					Case-sensitive
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2">
+				&nbsp;
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<b>Containing:</b>
+			</td>
+			<td>
+				<input type="text" name="string" value="$searchtext_escaped" size="50">
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td>
+				Powered by glimpse.
+			</td>
+		</tr>
+	</table>
+
+    <input type="submit" value="Search">
+    <br><br>
 </form>
 <hr>
 

Index: html-search-swish.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-search-swish.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- html-search-swish.html	15 Jul 2004 14:41:04 -0000	1.2
+++ html-search-swish.html	26 Jul 2004 20:47:44 -0000	1.3
@@ -2,12 +2,50 @@
 <form method="get" action="search">
     $variables{<input type="hidden" name="$variable" value="$value">}
     
-    <b>Search for: </b><input type="text" name="string" value="$searchtext_escaped" size="50">
-    <input type="submit" value="search">
+	<table border="0">
+		<tr>
+			<td>
+				<b>Files named:</b>
+			</td>
+			<td>
+				<input type="text" name="filestring" value="$filetext_escaped" size="50">
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td>
+				<input type="checkbox" name="advanced" $advancedchecked value="1"/>
+					Advanced (allow <a href="http://www.perldoc.com/perl5.8.4/pod/perlrequick.html" target="_blank">perl regex</a>)
+				&nbsp;&nbsp;&nbsp;&nbsp;
+				<input type="checkbox" name="casesensitive" $casesensitivechecked value="1"/>
+					Case-sensitive
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2">
+				&nbsp;
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<b>Containing:</b>
+			</td>
+			<td>
+				<input type="text" name="string" value="$searchtext_escaped" size="50">
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td>
+			    Supported operators: AND, OR, NOT, ( ) boolean grouping, trailing *, " " phrase grouping<br>
+			    Example: (book* OR magazine*) NOT "my magazine"<br>
+			    Powered by <a href="http://swish-e.org" target="_blank">Swish-E</a>.  <a href="http://swish-e.org/current/docs/SWISH-SEARCH.html" target="_blank">Full search syntax</a>
+			</td>
+		</tr>
+	</table>
+
+    <input type="submit" value="Search">
     <br><br>
-    Supported operators: AND, OR, NOT, ( ) boolean grouping, trailing *, " " phrase grouping<br>
-    Example: (book* OR magazine*) NOT "my magazine"<br>
-    Powered by <a href="http://swish-e.org" target="_blank">Swish-E</a>.  <a href="http://swish-e.org/current/docs/SWISH-SEARCH.html" target="_blank">Full search syntax</a>
 </form>
 <hr>
 
@@ -17,5 +55,5 @@
 <h1>$searchtext</h1>
 
 $results{
-    $score $fileref<br>
+    $text $fileref<br>
 }

[Lxr-commits] CVS: lxr search,1.24,1.25

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

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28509

Modified Files:
	search 
Log Message:
combine file name search and freetext search

Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- search	21 Jul 2004 20:44:30 -0000	1.24
+++ search	26 Jul 2004 20:47:43 -0000	1.25
@@ -51,8 +51,30 @@
 	return $ret;
 }
 
+sub filename_matches {
+	my ($filetext, $advanced, $casesensitive, $file) = @_;
+	if ($advanced) {
+		if ($casesensitive) {
+			if ($file =~ /$filetext/) {
+				return 1;
+			}
+		} elsif ($file =~ /$filetext/i) {
+			return 1;
+		}
+	} else {
+		if ($casesensitive) {
+			if (index($file, $filetext) != -1) {
+				return 1;
+			}
+		} elsif (index(lc($file), lc($filetext)) != -1) {
+			return 1;
+		}
+	}
+	return 0;
+}
+
 sub glimpsesearch {
-	my ($searchtext) = @_;
+	my ($searchtext, $filetext, $advanced, $casesensitive) = @_;
 
 	$ENV{'PATH'} = '/bin:/usr/local/bin:/usr/bin:/usr/sbin';
 	unless (open(GLIMPSE, "-|")) {
@@ -69,7 +91,7 @@
 	while (<GLIMPSE>) {
 		$numlines++;
 		push(@glimpselines, $_);
-		if ($numlines > $maxhits) {
+		if ($numlines >= $maxhits) {
 			last;
 		}
 	}
@@ -91,6 +113,8 @@
 
 			$glimpseline =~ s/$sourceroot//;
 			my ($file, $line, $text) = $glimpseline =~ /(.*?):\s*(\d+)\s*:(.*)/;
+			next if $filetext and !filename_matches($filetext, $advanced, $casesensitive, $file);
+
 			$text =~ s/&/&amp;/g;
 			$text =~ s/</&lt;/g;
 			$text =~ s/>/&gt;/g;
@@ -114,7 +138,7 @@
 }
 
 sub swishsearch {
-	my ($searchtext) = @_;
+	my ($searchtext, $filetext, $advanced, $casesensitive) = @_;
 
 	if (!-e $config->swishdir . "/" . $release . ".index") {
 		print
@@ -126,7 +150,7 @@
 	unless (open(SWISH, "-|")) {
 		open(STDERR, ">&STDOUT");
 		exec($config->swishbin, "-f", $config->swishdir . "/" . $release . ".index",
-			"-m", $maxhits, "-w", "'" . $searchtext . "'");
+			"-w", "'" . $searchtext . "'");
 
 		print(STDERR "Couldn't exec " . $config->swishbin . ": $!\n");
 		kill(9, $$);
@@ -138,10 +162,16 @@
 
 	my @ret;
 	if ($retval == 0) {
+		my $numlines = 0;
 		foreach my $hit (@result) {
 			next if $hit =~ /^err:/;    # skip; only 'no results' errors happen with return value 0
+
 			my ($score, $file) = $hit =~ /^(\d+) \/(.+) "(.+)" \d+/;
+			next if $filetext and !filename_matches($filetext, $advanced, $casesensitive, $file);
 			push @ret, [ $file, $score ];
+			$numlines++;
+
+			last if ($numlines >= $maxhits);
 		}
 		return @ret;
 	} else {
@@ -159,13 +189,22 @@
 
 	foreach (@results) {
 
-		# glimpse and swish-e provide different data for each result
-		my (@params) = @$_;
-
-		if ($config->glimpsebin) {
-			my $file = $params[0];
-			my $line = $params[1];
-			my $text = $params[2];
+		# filename, glimpse and swish-e searches provide different data for each result
+		if (!ref) {
+			my $file = $_;
+			$ret .= expandtemplate(
+				$templ,
+				(
+					score   => sub { return '' },
+					text    => sub { return '' },
+					fileref => sub { fileref("$file", "find-file", "/$file") },
+				)
+			);
+		} elsif ($config->glimpsebin) {
+			my (@params) = @$_;
+			my $file     = $params[0];
+			my $line     = $params[1];
+			my $text     = $params[2];
 			$ret .= expandtemplate(
 				$templ,
 				(
@@ -174,8 +213,9 @@
 				)
 			);
 		} else {
-			my $file  = $params[0];
-			my $score = $params[1];
+			my (@params) = @$_;
+			my $file     = $params[0];
+			my $score    = $params[1];
 			$ret .= expandtemplate(
 				$templ,
 				(
@@ -203,17 +243,53 @@
 		die "'htmlsearch' template not configured";
 	}
 
-	my $searchtext = $HTTP->{'param'}->{'string'};
+	my $searchtext    = $HTTP->{'param'}->{'string'};
+	my $filetext      = $HTTP->{'param'}->{'filestring'};
+	my $advanced      = $HTTP->{'param'}->{'advanced'};
+	my $casesensitive = $HTTP->{'param'}->{'casesensitive'};
 
 	my @results;
 	if ($searchtext ne "") {
 		if ($config->glimpsebin) {
-			@results = glimpsesearch($searchtext);
+			@results = glimpsesearch($searchtext, $filetext, $advanced, $casesensitive);
 		} elsif ($config->swishbin and $config->swishdir) {
-			@results = swishsearch($searchtext);
+			@results = swishsearch($searchtext, $filetext, $advanced, $casesensitive);
 		} else {
 			warning("No freetext search engine configured.");
 		}
+	} elsif ($filetext ne "") {
+		my $FILELISTING;
+		if ($config->swishdir and $config->swishbin) {
+			unless ($FILELISTING = new IO::File($config->swishdir . "/$release.filenames")) {
+				&warning(
+					"Version '$release' has not been indexed and is unavailable for searching<br>Could not open "
+					  . $config->swishdir
+					  . "/$release.filenames.");
+				return;
+			}
+		} elsif ($config->glimpsedir and $config->glimpsebin) {
+			unless ($FILELISTING =
+				new IO::File($config->glimpsedir . "/" . $release . "/.glimpse_filenames"))
+			{
+				&warning(
+					"Version '$release' has not been indexed and is unavailable for searching<br>Could not open "
+					  . $config->glimpsedir
+					  . "/$release/.glimpse_filenames.");
+				return;
+			}
+		} else {
+			warning(
+				"Freetext search engine required for file search, and no freetext search engine is configured"
+			);
+			return;
+		}
+		my $sourceroot = $config->sourceroot . '/' . $release . '/';
+		while (<$FILELISTING>) {
+			chomp;
+			s/^$sourceroot//;
+			push @results, $_ if filename_matches($filetext, $advanced, $casesensitive, $_);
+		}
+		close($FILELISTING);
 	}
 
 	print expandtemplate(
@@ -222,7 +298,10 @@
 			variables          => sub { varinputs(@_) },
 			searchtext         => sub { return $searchtext },
 			searchtext_escaped => sub { $_ = $searchtext; s/\"/&quot;/g; return $_; },
-			maxhits_message    => sub {
+			filetext_escaped   => sub { $_ = $filetext; s/\"/&quot;/g; return $_; },
+			advancedchecked      => sub { return $advanced      ? "checked" : "" },
+			casesensitivechecked => sub { return $casesensitive ? "checked" : "" },
+			maxhits_message      => sub {
 				return @results == $maxhits
 				  ? "<b>Too many hits, displaying first $maxhits</b><br>"
 				  : "";

[Lxr-commits] CVS: lxr/lib/LXR Common.pm,1.49,1.50

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

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

Modified Files:
	Common.pm 
Log Message:
combine file name search and freetext search

Index: Common.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Common.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- Common.pm	21 Jul 2004 20:44:30 -0000	1.49
+++ Common.pm	26 Jul 2004 20:47:43 -0000	1.50
@@ -599,13 +599,10 @@
 		return $config->sourcerootname . $pathname;
 	} elsif ($who eq 'ident') {
 		my $i = $HTTP->{'param'}->{'i'};
-		return $config->sourcerootname . ' identfier search' . ($i ? ": $i" : '');
+		return $config->sourcerootname . ' identifier search' . ($i ? ": $i" : '');
 	} elsif ($who eq 'search') {
 		my $s = $HTTP->{'param'}->{'string'};
-		return $config->sourcerootname . ' freetext search' . ($s ? ": $s" : '');
-	} elsif ($who eq 'find') {
-		my $s = $HTTP->{'param'}->{'string'};
-		return $config->sourcerootname . ' file search' . ($s ? ": $s" : '');
+		return $config->sourcerootname . ' general search' . ($s ? ": $s" : '');
 	}
 }
 
@@ -661,23 +658,13 @@
 	}
 
 	if ($who eq 'search') {
-		push(@mlist, "<span class='modes-sel'>freetext search</span>");
+		push(@mlist, "<span class='modes-sel'>general search</span>");
 	} else {
 		push(@mlist,
 			    "<a class=\"modes\" "
 			  . "href=\"$config->{virtroot}/search"
 			  . urlargs
-			  . "\">freetext search</a>");
-	}
-
-	if ($who eq 'find') {
-		push(@mlist, "<span class='modes-sel'>file search</span>");
-	} else {
-		push(@mlist,
-			    "<a class='modes' "
-			  . "href=\"$config->{virtroot}/find"
-			  . urlargs
-			  . "\">file search</a>");
+			  . "\">general search</a>");
 	}
 
 	foreach $mode (@mlist) {
@@ -714,11 +701,6 @@
 				    "<a class=\"varlink\" href=\"$config->{virtroot}/search"
 				  . &urlargs("$var=$val", "string=" . $HTTP->{'param'}->{'string'})
 				  . "\">$val</a>";
-			} elsif ($who eq 'find') {
-				$vallink =
-				    "<a class=\"varlink\" href=\"$config->{virtroot}/find"
-				  . &urlargs("$var=$val", "string=" . $HTTP->{'param'}->{'string'})
-				  . "\">$val</a>";
 			}
 		}
 

[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

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

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 {