lxr-commits — Don't use, CVS commits

[Lxr-commits] CVS: lxr/lib/LXR Common.pm,1.36,1.37

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

Update of /cvsroot/lxr/lxr/lib/LXR
In directory usw-pr-cvs1:/tmp/cvs-serv15958/lib/LXR

Modified Files:
	Common.pm 
Log Message:
Fix bug 476695 - Java interfaces display as docs.
Changes the type field in the indexes table to be a (langid, typeid) tuple, 
and adds another table to look up the (langid, typeid) -> string mapping.
This means that each language module can manage its own string table and the
right identifier type can easily be displayed.

This also means that each identifier is tagged with the language it occurs in, 
which could be used for filtering displayed results when browsing.  This has
not been implemented.

This change is database incompatible - you will need to drop and recreate the 
lxr database.  MySQL has been tested, Postgres has not though the changes have
been made.

Also add some limited support for Makefile in generic.conf.


Index: Common.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Common.pm,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Common.pm	2001/11/17 03:06:19	1.36
+++ Common.pm	2001/11/18 03:31:34	1.37
@@ -28,13 +28,13 @@
 
 use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS 
 			$files $index $config $pathname $identifier $release
-			$HTTP %type_names $wwwdebug $tmpcounter);
+			$HTTP $wwwdebug $tmpcounter);
 
 @ISA		= qw(Exporter);
 
 @EXPORT		= qw($files $index $config &fatal);
 @EXPORT_OK	= qw($files $index $config $pathname $identifier $release
-				 $HTTP %type_names
+				 $HTTP
 				 &warning &fatal &abortall &fflush &urlargs &fileref
 				 &idref &incref &htmlquote &freetextmarkup &markupfile
 				 &markupstring &httpinit &makeheader &makefooter
@@ -53,21 +53,6 @@
 
 $wwwdebug = 1;
 
-%type_names = ('c' => 'class',
-			   'd' => 'macro (un)definition',
-			   'e' => 'enumerator',
-			   'f' => 'function definition',
-			   'g' => 'enumeration name',
-			   'm' => 'class, struct, or union member',
-			   'n' => 'namespace',
-			   'p' => 'function prototype or declaration',
-			   's' => 'structure name',
-			   't' => 'typedef',
-			   'u' => 'union names',
-			   'v' => 'variable definition',
-			   'x' => 'extern or forward variable declaration',
-			   'i' => 'interface');
-
 $tmpcounter = 23;
 
 
@@ -296,7 +281,8 @@
 	
 	# A source code file
 	if ($lang) {
-	    my $language = $lang->language;  # To get back to the key to lookup the tabwidth.
+		my $language = $lang->language;  # To get back to the key to lookup the tabwidth.
+	  
 	    &LXR::SimpleParse::init($fileh, $config->filetype->{$language}[3], $lang->parsespec);
 
 		my ($btype, $frag) = &LXR::SimpleParse::nextfrag;

[Lxr-commits] CVS: lxr ident,1.11,1.12 initdb-mysql,1.6,1.7 initdb-postgres,1.3,1.4

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

Update of /cvsroot/lxr/lxr
In directory usw-pr-cvs1:/tmp/cvs-serv15958

Modified Files:
	ident initdb-mysql initdb-postgres 
Log Message:
Fix bug 476695 - Java interfaces display as docs.
Changes the type field in the indexes table to be a (langid, typeid) tuple, 
and adds another table to look up the (langid, typeid) -> string mapping.
This means that each language module can manage its own string table and the
right identifier type can easily be displayed.

This also means that each identifier is tagged with the language it occurs in, 
which could be used for filtering displayed results when browsing.  This has
not been implemented.

This change is database incompatible - you will need to drop and recreate the 
lxr database.  MySQL has been tested, Postgres has not though the changes have
been made.

Also add some limited support for Makefile in generic.conf.


Index: ident
===================================================================
RCS file: /cvsroot/lxr/lxr/ident,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ident	2001/10/16 20:38:37	1.11
+++ ident	2001/11/18 03:31:33	1.12
@@ -52,12 +52,11 @@
     my $def;
     foreach my $def (@refs) {
 	my ($file, $line, $type, $rel) = @$def;
-	
 	$rel &&= "(member of ".idref($rel, "search-member", $rel).")";
 	$ret .= expandtemplate($templ,
 			       (file => sub { $file },
 				line => sub { $line },
-				type => sub { $type_names{$type} },
+				type => sub { $type },
 				rel  => sub { $rel },
 				fileref  => sub {
 				    fileref("$file, line $line", 

Index: initdb-mysql
===================================================================
RCS file: /cvsroot/lxr/lxr/initdb-mysql,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- initdb-mysql	2001/09/26 14:47:56	1.6
+++ initdb-mysql	2001/11/18 03:31:33	1.7
@@ -27,7 +27,8 @@
         symid           int not null references symbols,
         fileid          int not null references files,
         line            int not null,
-        type            char(1) binary,
+		langid          tinyint not null references declarations,
+        type            smallint not null references declarations,
         relsym          int          references symbols
 );
 
@@ -47,6 +48,13 @@
         (fileid         int not null references files,
         status          tinyint not null,
         primary key     (fileid)
+);
+
+create table declarations
+		(declid  		smallint not null auto_increment,
+		 langid         tinyint not null,
+		 declaration    char(255) not null,
+		 primary key    (declid, langid)
 );
 
 

Index: initdb-postgres
===================================================================
RCS file: /cvsroot/lxr/lxr/initdb-postgres,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- initdb-postgres	2001/09/26 14:47:56	1.3
+++ initdb-postgres	2001/11/18 03:31:33	1.4
@@ -9,6 +9,7 @@
 
 create sequence filenum cache 50;
 create sequence symnum cache 50;
+create sequence declnum cache 10;
 
 create table files (
 	filename	varchar,
@@ -31,7 +32,8 @@
 	symid		int		references symbols,
 	fileid		int		references files,
 	line		int,
-	type		varchar,
+	langid		tinyint not null references declarations,
+	type		smallint not null references declarations,
 	relsym		int		references symbols
 );
 
@@ -49,9 +51,15 @@
 
 create table status
 	(fileid		int		references files,
-	status		int,
+	status		smallint,
 	primary key	(fileid)
 );
+create table declarations
+	(declid     smallint not null,
+	langid		tinyint not null,
+	declaration	char(255) not null,
+	primary key (declid, langid)
+); 
 
 create index indexindex on indexes using btree (symid);
 create index symbolindex on symbols using btree (symname);

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

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

Update of /cvsroot/lxr/lxr/lib/LXR/Lang
In directory usw-pr-cvs1:/tmp/cvs-serv29481

Modified Files:
	Generic.pm 
Log Message:
Fix bug with referencing files due to omitting a parameter to SimpleParse::init



Index: Generic.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Generic.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Generic.pm	2001/11/14 15:03:29	1.6
+++ Generic.pm	2001/11/17 04:00:55	1.7
@@ -133,7 +133,8 @@
   my ($self, $name, $path, $fileid, $index, $config) = @_;
 
   require LXR::SimpleParse;
-  &LXR::SimpleParse::init(new FileHandle($path), $self->parsespec);
+  # Use dummy tabwidth here since it doesn't matter for referencing
+  &LXR::SimpleParse::init(new FileHandle($path), 1, $self->parsespec);
 
   my $linenum = 1;
   my ($btype, $frag) = &LXR::SimpleParse::nextfrag;

[Lxr-commits] CVS: lxr/templates html-head.html,1.3,1.4

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

Update of /cvsroot/lxr/lxr/templates
In directory usw-pr-cvs1:/tmp/cvs-serv27430

Modified Files:
	html-head.html 
Log Message:
Remove reference to "Cross referencing Linux" and replaced with more
generic header line.
Still to do: Create a LXR logo and replace the pengmini.gif with it


Index: html-head.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-head.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- html-head.html	2001/09/28 14:22:14	1.3
+++ html-head.html	2001/11/17 03:48:25	1.4
@@ -17,7 +17,7 @@
       <table width='100%' border='0' cellpadding='0' cellspacing='0'>
         <tr>
           <td align='center'>
-            <a href="blurb.html" class=main>Cross-Referencing Linux</a>
+            <a href="blurb.html" class=main>The LXR Cross Referencer</a>
           </td>
         </tr>
         <tr>

[Lxr-commits] CVS: lxr/lib/LXR Common.pm,1.35,1.36

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

Update of /cvsroot/lxr/lxr/lib/LXR
In directory usw-pr-cvs1:/tmp/cvs-serv18411

Modified Files:
	Common.pm 
Log Message:
Fix bug with configurable tabwidth and files that have no language associated
with them.

Remove the stat-ing of all the included modules when generating a Last-Modified
header.  This should speed up HTML generation since there are a lot of modules
and they change very rarely.


Index: Common.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Common.pm,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Common.pm	2001/11/14 15:03:29	1.35
+++ Common.pm	2001/11/17 03:06:19	1.36
@@ -293,11 +293,11 @@
 	
 	my @itag = &idref(1, "fid", 1) =~ /^(.*=)1(\">)1(<\/a>)$/;
 	my $lang = new LXR::Lang($pathname, $release, @itag);
-	my $language = $lang->language;  # To get back to the key to lookup the tabwidth.
 	
 	# A source code file
 	if ($lang) {
-		&LXR::SimpleParse::init($fileh, $config->filetype->{$language}[3], $lang->parsespec);
+	    my $language = $lang->language;  # To get back to the key to lookup the tabwidth.
+	    &LXR::SimpleParse::init($fileh, $config->filetype->{$language}[3], $lang->parsespec);
 
 		my ($btype, $frag) = &LXR::SimpleParse::nextfrag;
 
@@ -426,19 +426,23 @@
 	my $time2 = (stat($config->confpath))[9];
 	$time = $time2 if $time2 > $time;
 
-	my %mods = ('main' => $0, %INC);
-	my ($mod, $path);
-	while (($mod, $path) = each %mods) {
-		$mod  =~ s/.pm$//;
-		$mod  =~ s|/|::|g;
-		$path =~ s|/+|/|g;
+	# Remove this to see if we get a speed increase by not stating all
+	# the modules.  Since for most sites the modules change rarely,
+	# this is a big hit for each access.
+	
+# 	my %mods = ('main' => $0, %INC);
+# 	my ($mod, $path);
+# 	while (($mod, $path) = each %mods) {
+# 		$mod  =~ s/.pm$//;
+# 		$mod  =~ s|/|::|g;
+# 		$path =~ s|/+|/|g;
 
-		no strict 'refs';
-		next unless $ {$mod.'::CVSID'};
+# 		no strict 'refs';
+# 		next unless $ {$mod.'::CVSID'};
 
-		$time2 = (stat($path))[9];
-		$time = $time2 if $time2 > $time;
-	}
+# 		$time2 = (stat($path))[9];
+# 		$time = $time2 if $time2 > $time;
+# 	}
 
 	if ($time > 0) {
 		my ($sec, $min, $hour, $mday, $mon, $year,$wday) = gmtime($time);

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

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

Update of /cvsroot/lxr/lxr/lib/LXR/Index
In directory usw-pr-cvs1:/tmp/cvs-serv28624/lib/LXR/Index

Modified Files:
	Mysql.pm 
Log Message:
Make Mysql insert statements less fragile if fields are moved/renamed in db.
Fixes bug #426646


Index: Mysql.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Mysql.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Mysql.pm	2001/10/17 23:52:42	1.10
+++ Mysql.pm	2001/11/14 15:41:37	1.11
@@ -47,14 +47,14 @@
 	$self->{files_select} = $self->{dbh}->prepare
 		("select fileid from files where  filename = ? and  revision = ?");
 	$self->{files_insert} = $self->{dbh}->prepare
-		("insert into files values (?, ?, NULL)");
+		("insert into files (filename, revision, fileid) values (?, ?, NULL)");
 
 	$self->{symbols_byname} = $self->{dbh}->prepare
 		("select symid from symbols where  symname = ?");
 	$self->{symbols_byid} = $self->{dbh}->prepare
 		("select symname from symbols where symid = ?");
 	$self->{symbols_insert} = $self->{dbh}->prepare
-		("insert into symbols values ( ?, NULL)");
+		("insert into symbols (symname, symid) values ( ?, NULL)");
 	$self->{symbols_remove} = $self->{dbh}->prepare
 		("delete from symbols where symname = ?");
 
@@ -65,25 +65,25 @@
 		 "and f.fileid = r.fileid ".
 		 "and  s.symname = ? and  r.release = ?");
 	$self->{indexes_insert} = $self->{dbh}->prepare
-		("insert into indexes values (?, ?, ?, ?, ?)");
+		("insert into indexes (symid, fileid, line, type, relsym) values (?, ?, ?, ?, ?)");
 
 	$self->{releases_select} = $self->{dbh}->prepare
 		("select * from releases where fileid = ? and  release = ?");
 	$self->{releases_insert} = $self->{dbh}->prepare
-		("insert into releases values (?, ?)");
+		("insert into releases (fileid, release) values (?, ?)");
 
 	$self->{status_get} = $self->{dbh}->prepare
 		("select status from status where fileid = ?");
 
 	$self->{status_insert} = $self->{dbh}->prepare
 #		("insert into status select ?, 0 except select fileid, 0 from status");
-		("insert into status values (?, ?)");
+		("insert into status (fileid, status) values (?, ?)");
 
 	$self->{status_update} = $self->{dbh}->prepare
 		("update status set status = ? where fileid = ? and status <= ?");
 
 	$self->{usage_insert} = $self->{dbh}->prepare
-		("insert into useage values (?, ?, ?)");
+		("insert into useage (fileid, line, symid) values (?, ?, ?)");
 	$self->{usage_select} = $self->{dbh}->prepare
 		("select f.filename, u.line ".
 		 "from symbols s, files f, releases r, useage u ".

[Lxr-commits] CVS: lxr/lib/LXR/Lang Java.pm,1.3,1.4 generic.conf,1.6,1.7

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

Update of /cvsroot/lxr/lxr/lib/LXR/Lang
In directory usw-pr-cvs1:/tmp/cvs-serv24731/lib/LXR/Lang

Modified Files:
	generic.conf 
Added Files:
	Java.pm 
Log Message:
Adds proper import/package hyperlinking for Java.
Fixes bug #447979

Also fixes problem with the example lxr.conf and the new tabwidth code



Index: generic.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/generic.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- generic.conf	2001/11/14 15:03:29	1.6
+++ generic.conf	2001/11/14 15:27:36	1.7
@@ -1,4 +1,4 @@
-# -*- mode: perl -*- 
+# -*- mode: perl, tab-width: 2 -*- 
 # Configure options for the generic language support
 
 {
@@ -79,12 +79,15 @@
 										 'throws', 'instanceof', 'super', 'this',
 										 'native', 'null'],
 
-						  'spec' => ['atom'	  => ('\\\\.',	''),
-									 'comment'  => ('/\*',		'\*/'),
-									 'comment'  => ('//',		"\$"),
-									 'string'	  => ('"',		'"'),
-									 'string'	  => ("'",		"'"),
-									 'include'  => ('import',	"\$")],
+						  'spec' => ['atom'	   => ('\\\\.',	''),
+									 'comment' => ('/\*',		'\*/'),
+									 'comment' => ('//',		"\$"),
+									 'string'  => ('"',		'"'),
+									 'string'  => ("'",		"'"),
+									 'include' => ('import',	"\$"),
+									 'include' => ('package', "\$"),
+									],
+						  
 						 },
 			   
 			   'Fortran' => {

[Lxr-commits] CVS: lxr/templates lxr.conf,1.3,1.4

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

Update of /cvsroot/lxr/lxr/templates
In directory usw-pr-cvs1:/tmp/cvs-serv24731/templates

Modified Files:
	lxr.conf 
Log Message:
Adds proper import/package hyperlinking for Java.
Fixes bug #447979

Also fixes problem with the example lxr.conf and the new tabwidth code


Index: lxr.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lxr.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lxr.conf	2001/10/16 20:25:32	1.3
+++ lxr.conf	2001/11/14 15:27:36	1.4
@@ -72,19 +72,20 @@
   'graphicfile' => '(?i)\.(gif|jpg|jpeg|pjpg|pjpeg|xbm|png)$',
 
   # How to map files to languages
-  # format is name, regex, module
-  'filetype' => [
+  # Note that the string for the key and the first entry in the
+  # array MUST match
+  'filetype' => {
 				 # Format is
-				 # Language name, filepatten regexp, module to envoke
+				 # Language name, filepatten regexp, module to invoke, tabwidth
 				 # Note that to have another language supported by Generic.pm,
 				 # you must ensure that:
 				 # a) exuberant ctags supports it
 				 # b) generic.conf is updated to specify information about the language
 				 # c) the name of the language given here matches the entry in generic.conf
-				 ['C', '\.c$' #'
-				  , 'LXR::Lang::Generic'],
-				 ['C++', '\.C$|((?i)\.c\+\+$|\.cc$|\.cpp$|\.cxx$|\.h$|\.hh$|\.hpp$|\.hxx$|\.h\+\+$)' #'
-				  , 'LXR::Lang::Generic'],
+				 'C' => ['C', '\.c$' #'
+				  , 'LXR::Lang::Generic', '8'],
+				 'C++' => ['C++', '\.C$|((?i)\.c\+\+$|\.cc$|\.cpp$|\.cxx$|\.h$|\.hh$|\.hpp$|\.hxx$|\.h\+\+$)' #'
+				  , 'LXR::Lang::Generic', '8'],
 
 # 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
@@ -96,20 +97,20 @@
 # 				  , 'LXR::Lang::Generic'],
 # 				 ['Fortran', '(?i)\.f$|\.for$|\.ftn$|\.f77$|\.f90$|\.f95$'   #'
 # 				  , 'LXR::Lang::Generic'],
-				 ['Java', '(?i)\.java$'   #'
-				  , 'LXR::Lang::Generic'],
+				 'Java' => ['Java', '(?i)\.java$'   #'
+				  , 'LXR::Lang::Java', '4'],
 # 				 ['Lisp', '(?i)\.cl$|\.clisp$|\.el$|\.l$|\.lisp$|\.lsp$|\.ml$'   #'
 # 				  , 'LXR::Lang::Generic'],
 # 				 ['Make', '(?i)\.mak$|makefile*' #'
 # 				  , 'LXR::Lang::Generic'],
 # 				 ['Pascal', '(?i)\.p$|\.pas$'   #'
 # 				  , 'LXR::Lang::Generic'],
-				 ['Perl', '(?i)\.pl$|\.pm$|\.perl$'   #'
-				  , 'LXR::Lang::Generic'],
- 				 ['php', '(?i)\.php$|\.php3$|\.phtml$'   #'
- 				  , 'LXR::Lang::Generic'],
-				 ['Python', '(?i)\.py$|\.python$'   #'
-				  , 'LXR::Lang::Generic'],
+				 'Perl' => ['Perl', '(?i)\.pl$|\.pm$|\.perl$'   #'
+				  , 'LXR::Lang::Generic', '4'],
+ 				 'php' => ['php', '(?i)\.php$|\.php3$|\.phtml$'   #'
+ 				  , 'LXR::Lang::Generic', '2'],
+				 'Python' => ['Python', '(?i)\.py$|\.python$'   #'
+				  , 'LXR::Lang::Generic', '4'],
 # 				 ['rexx', '(?i)\.cmd$|\.rexx$|\.rx$'   #'
 # 				  , 'LXR::Lang::Generic'],
 # 				 ['ruby', '(?i)\.rb$'   #'
@@ -122,7 +123,7 @@
 # 				  , 'LXR::Lang::Generic'],
 # 				 ['tcl', '(?i)\.tcl$|\.wish$'   #'
 # 				  , 'LXR::Lang::Generic'],
-				],
+				},
   
   # If dbname is a directory the db-file databases will be stored here
   # if a relational database is used the name is a dbi database specifier

[Lxr-commits] CVS: lxr/lib/LXR Common.pm,1.34,1.35 Lang.pm,1.23,1.24 SimpleParse.pm,1.13,1.14

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

Update of /cvsroot/lxr/lxr/lib/LXR
In directory usw-pr-cvs1:/tmp/cvs-serv17619/lib/LXR

Modified Files:
	Common.pm Lang.pm SimpleParse.pm 
Log Message:
Make tabwidth to use for display configurable on a per-language basis from
the lxr.conf file.
As before, this is still overridden by an emacs "tab-width" line.


Index: Common.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Common.pm,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Common.pm	2001/10/31 13:21:58	1.34
+++ Common.pm	2001/11/14 15:03:29	1.35
@@ -81,6 +81,7 @@
 sub fatal {
 	my $c = join(", line ", (caller)[0,2]);
 	print(STDERR "[",scalar(localtime),"] fatal: $c: $_[0]\n");
+	print(STDERR '[@INC ', join(" ", @INC), ' $0 ', $0, "\n");
 	print("<h4 align=\"center\"><i>** Fatal: $_[0]</i></h4>\n") if $wwwdebug;
 	exit(1);
 }
@@ -292,10 +293,11 @@
 	
 	my @itag = &idref(1, "fid", 1) =~ /^(.*=)1(\">)1(<\/a>)$/;
 	my $lang = new LXR::Lang($pathname, $release, @itag);
-
+	my $language = $lang->language;  # To get back to the key to lookup the tabwidth.
+	
 	# A source code file
 	if ($lang) {
-		&LXR::SimpleParse::init($fileh, $lang->parsespec);
+		&LXR::SimpleParse::init($fileh, $config->filetype->{$language}[3], $lang->parsespec);
 
 		my ($btype, $frag) = &LXR::SimpleParse::nextfrag;
 

Index: Lang.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Lang.pm	2001/09/27 16:12:20	1.23
+++ Lang.pm	2001/11/14 15:03:29	1.24
@@ -27,7 +27,7 @@
 	my ($self, $pathname, $release, @itag) = @_;
 	my ($lang, $type);
 
-    foreach $type ($config->filetype) {
+    foreach $type (values %{$config->filetype}) {
 		if ($pathname =~ /$$type[1]/) {
 			eval "require $$type[2]";
 			my $create = "new $$type[2]".'($pathname, $release, $$type[0])';

Index: SimpleParse.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/SimpleParse.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- SimpleParse.pm	2001/08/15 15:50:27	1.13
+++ SimpleParse.pm	2001/11/14 15:03:29	1.14
@@ -50,9 +50,11 @@
 	$split = "";
 	$open = "";
 	$tabwidth = 8;
-
-    ($fileh, @blksep) = @_;
+	my $tabhint;
 
+    ($fileh, $tabhint, @blksep) = @_;
+	$tabwidth = $tabhint || $tabwidth;
+		
     while (@_ = splice(@blksep,0,3)) {
 		push(@bodyid, $_[0]);
 		push(@open, $_[1]);

[Lxr-commits] CVS: lxr/lib/LXR/Lang Generic.pm,1.5,1.6 generic.conf,1.5,1.6

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

Update of /cvsroot/lxr/lxr/lib/LXR/Lang
In directory usw-pr-cvs1:/tmp/cvs-serv17619/lib/LXR/Lang

Modified Files:
	Generic.pm generic.conf 
Log Message:
Make tabwidth to use for display configurable on a per-language basis from
the lxr.conf file.
As before, this is still overridden by an emacs "tab-width" line.


Index: Generic.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Generic.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Generic.pm	2001/08/15 15:50:27	1.5
+++ Generic.pm	2001/11/14 15:03:29	1.6
@@ -243,7 +243,12 @@
   }
 
   if (defined $val && defined $$val{$item}) {
-	return wantarray ? @{$$val{$item}} : $$val{$item};
+	if (ref($$val{$item})) {
+	  return wantarray ? @{$$val{$item}} : $$val{$item};
+	}
+	else {
+	  return $$val{$item};
+	}
   } else {
 	return undef;
   }

Index: generic.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/generic.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- generic.conf	2001/09/27 15:59:09	1.5
+++ generic.conf	2001/11/14 15:03:29	1.6
@@ -64,7 +64,7 @@
 								  'comment',  '//',		    "\$",
 								  'string',   '"',		    '"',
 								  'string',   "'",		    "'",
-								  'include',  '#\s*include',	"\$"],
+									'include',  '#\s*include',	"\$"],
 						},
 		
 			   'Java' => {

[Lxr-commits] CVS: lxr/lib/LXR Common.pm,1.33,1.34

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

Update of /cvsroot/lxr/lxr/lib/LXR
In directory usw-pr-cvs1:/tmp/cvs-serv25748

Modified Files:
	Common.pm 
Log Message:
Quick temporary fix for bug 476695


Index: Common.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Common.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Common.pm	2001/10/16 20:38:37	1.33
+++ Common.pm	2001/10/31 13:21:58	1.34
@@ -66,7 +66,7 @@
 			   'u' => 'union names',
 			   'v' => 'variable definition',
 			   'x' => 'extern or forward variable declaration',
-			   'i' => 'documentation entry');
+			   'i' => 'interface');
 
 $tmpcounter = 23;
 

[Lxr-commits] CVS: lxr source,1.29,1.30

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

Update of /cvsroot/lxr/lxr
In directory usw-pr-cvs1:/tmp/cvs-serv23847

Modified Files:
	source 
Log Message:
Restored "use lib do..." line at start.  This appears to be working properly
and allows mod_perl to find the LXR files without any other setup


Index: source
===================================================================
RCS file: /cvsroot/lxr/lxr/source,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- source	2001/10/17 06:52:52	1.29
+++ source	2001/10/23 15:23:50	1.30
@@ -26,6 +26,7 @@
 $CVSID = '$Id$ ';
 
 use strict;
+use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" };
 
 use LXR::Common qw(:html);
 use Local;

[Lxr-commits] CVS: lxr/lib/LXR Tagger.pm,1.18,1.19

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

Update of /cvsroot/lxr/lxr/lib/LXR
In directory usw-pr-cvs1:/tmp/cvs-serv30842/lib/LXR

Modified Files:
	Tagger.pm 
Log Message:
Remove obsolete code


Index: Tagger.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Tagger.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Tagger.pm	2001/08/15 15:50:27	1.18
+++ Tagger.pm	2001/10/23 14:30:18	1.19
@@ -92,45 +92,4 @@
 	$revision = undef;
   }
 
-
-
-# Ctags
-package LXR::Tagger::ctags;
-
-# Excuberant ctags
-package LXR::Tagger::ectags;
-
-#  			open(TMP, "> /tmp/lxrref");
-#  			print(TMP $files->getfile($pathname, $release));
-#  			close(TMP);
-			
-#  				|| die "Can't run ctags";
-#  #		open(CTAGS, "ctags-3.2/ctags --excmd=number --sort=no --lang=c++ --c-types=cdefgmnpstuvx -f - ".$$files{'rootpath'}.$release.$pathname." |");
-#  			while (<CTAGS>) {
-#  				chomp;
-#  				@_ = split(/\t/, $_);
-#  				$_[2] =~ s/;\"$//;
-				
-#  				$index->index($_[0], $release, $pathname, $_[2], $_[3]);
-				
-#  				if ($_[4] eq '') {
-#  				}
-#  				elsif ($_[4] =~ /^file:/) {
-#  				}
-#  				elsif ($_[4] =~ /^struct:(.*)/) {
-#  					$index->relate($_[0], $release, $1, 'struct member');
-#  				}
-#  				elsif ($_[4] =~ /^union:(.*)/) {
-#  					$index->relate($_[0], $release, $1, 'union member');
-#  				}
-#  				elsif ($_[4] =~ /^class:(.*)/) {
-#  					$index->relate($_[0], $release, $1, 'class member');
-#  				}
-#  				else {
-#  					print(STDERR "** Unknown : $_\n");
-#  				}
-#  			}
-#  			close(CTAGS);
-
-
 1;

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

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

Update of /cvsroot/lxr/lxr/templates
In directory usw-pr-cvs1:/tmp/cvs-serv19411/templates

Modified Files:
	html-tail.html 
Log Message:
Updated valid HTML logo to point to W3C's validator and the HTML 4.01 logo


Index: html-tail.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-tail.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- html-tail.html	2001/08/04 18:54:15	1.1
+++ html-tail.html	2001/10/23 14:05:16	1.2
@@ -11,16 +11,16 @@
   <tr>
     <td align=left>
       This page was automatically generated by the 
-      <a href="blurb.html">LXR engine</a>.
+      <a href="http://lxr.sf.net">LXR engine</a>.
       <address>
-        <a href="mailto:lx...@li...">
-          Arne Georg Gleditsch and Per Kristian Gjermshus</a>
+        <a href="mailto:lxr...@li...">
+          The LXR team</a>
       </address>
     </td>
     <td align=right>
-      <a href="http://ugweb.cs.ualberta.ca/~gerald/validate/?url=$thisurl">
-        <img src="valid_html3.2.gif" border=0
-           alt="HTML 3.2 Checked!">
+      <a href="http://validator.w3.org/check/referer">
+        <img src="http://www.w3c.org/Icons/valid-html401.png" border=0
+           alt="Valid HTML 4.01" height="31" width="88">
       </a>
     </td>
   </tr>

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

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

Update of /cvsroot/lxr/lxr/lib/LXR/Index
In directory usw-pr-cvs1:/tmp/cvs-serv5019

Modified Files:
	Mysql.pm 
Log Message:
Fix typo in if() expression


Index: Mysql.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Mysql.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Mysql.pm	2001/10/16 20:25:32	1.9
+++ Mysql.pm	2001/10/17 23:52:42	1.10
@@ -32,7 +32,7 @@
 	my ($self, $dbname) = @_;
 
 	$self = bless({}, $self);
-	if(defined($config->{dbpass}) {
+	if(defined($config->{dbpass})) {
 		$self->{dbh} = DBI->connect($dbname, $config->{dbuser}, 
 									$config->{dbpass})
 			|| fatal "Can't open connection to database\n";

[Lxr-commits] CVS: lxr source,1.28,1.29

[Per K. G. <pe...@us...>]

Update of /cvsroot/lxr/lxr
In directory usw-pr-cvs1:/tmp/cvs-serv10960

Modified Files:
	source 
Log Message:
Fix accidentially added libpath.


Index: source
===================================================================
RCS file: /cvsroot/lxr/lxr/source,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- source	2001/10/16 20:38:37	1.28
+++ source	2001/10/17 06:52:52	1.29
@@ -27,7 +27,6 @@
 
 use strict;
 
-use lib '/var/www/lxr/lib';
 use LXR::Common qw(:html);
 use Local;
 

Re: [Lxr-commits] CVS: lxr diff,1.7,1.8 find,1.5,1.6 ident,1.10,1.11 search,1.6,1.7 source,1.27,1.28

[Jens-Uwe M. <ju...@he...>]

On Tue, Oct 16, 2001 at 01:38:39PM -0700, Per Kristian Gjermshus wrote:
> diff -u -d -r1.27 -r1.28
> --- source	2001/09/27 16:12:20	1.27
> +++ source	2001/10/16 20:38:37	1.28
> @@ -27,6 +27,7 @@
>  
>  use strict;
>  
> +use lib '/var/www/lxr/lib';
>  use LXR::Common qw(:html);
>  use Local;

I suspect the above change was checked in accidently?

-- 
Jens-Uwe Mager

HELIOS Software GmbH
Steinriede 3
30827 Garbsen
Germany

Phone:		+49 5131 709320
FAX:		+49 5131 709325
Internet:	ju...@he...

[Lxr-commits] CVS: lxr/lib/LXR Common.pm,1.32,1.33

[Per K. G. <pe...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR
In directory usw-pr-cvs1:/tmp/cvs-serv20906/lib/LXR

Modified Files:
	Common.pm 
Log Message:
Clean up after httpinit


Index: Common.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Common.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Common.pm	2001/09/27 16:12:20	1.32
+++ Common.pm	2001/10/16 20:38:37	1.33
@@ -38,7 +38,8 @@
 				 &warning &fatal &abortall &fflush &urlargs &fileref
 				 &idref &incref &htmlquote &freetextmarkup &markupfile
 				 &markupstring &httpinit &makeheader &makefooter
-				 &expandtemplate);
+				 &expandtemplate &httpclean);
+
 %EXPORT_TAGS = ('html' => [ @EXPORT_OK ]);
 
 
@@ -534,6 +535,12 @@
 	$pathname = fixpaths($HTTP->{'path_info'} || $HTTP->{'param'}->{'file'});
 
 	printhttp;
+}
+
+sub httpclean {
+	$config = undef;
+	$files = undef;
+	$index = undef;
 }
 
 

[Lxr-commits] CVS: lxr diff,1.7,1.8 find,1.5,1.6 ident,1.10,1.11 search,1.6,1.7 source,1.27,1.28

[Per K. G. <pe...@us...>]

Update of /cvsroot/lxr/lxr
In directory usw-pr-cvs1:/tmp/cvs-serv20906

Modified Files:
	diff find ident search source 
Log Message:
Clean up after httpinit


Index: diff
===================================================================
RCS file: /cvsroot/lxr/lxr/diff,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- diff	2001/09/27 16:12:20	1.7
+++ diff	2001/10/16 20:38:37	1.8
@@ -205,4 +205,6 @@
 printdiff($$HTTP{'param'}{'diffvar'}, $$HTTP{'param'}{'diffval'});
 makefooter('diff');
 
+httpclean;
+
 

Index: find
===================================================================
RCS file: /cvsroot/lxr/lxr/find,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- find	2001/09/27 16:12:20	1.5
+++ find	2001/10/16 20:38:37	1.6
@@ -76,3 +76,5 @@
 &find;
 &makefooter('find');
 
+httpclean;
+

Index: ident
===================================================================
RCS file: /cvsroot/lxr/lxr/ident,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ident	2001/09/27 16:12:20	1.10
+++ ident	2001/10/16 20:38:37	1.11
@@ -196,4 +196,5 @@
 makeheader('ident');
 printident;
 makefooter('ident');
+httpclean;
 

Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- search	2001/09/27 16:12:20	1.6
+++ search	2001/10/16 20:38:37	1.7
@@ -116,11 +116,13 @@
     }
 }
 
-&httpinit;
+httpinit;
 $searchtext = $HTTP->{'param'}->{'string'};
 
 &makeheader('search');
 &search;
 &makefooter('search');
+
+httpclean;
 
 

Index: source
===================================================================
RCS file: /cvsroot/lxr/lxr/source,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- source	2001/09/27 16:12:20	1.27
+++ source	2001/10/16 20:38:37	1.28
@@ -27,6 +27,7 @@
 
 use strict;
 
+use lib '/var/www/lxr/lib';
 use LXR::Common qw(:html);
 use Local;
 
@@ -301,3 +302,5 @@
     printfile(0);
     makefooter($type);
 }
+
+httpclean;

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

[Per K. G. <pe...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR/Index
In directory usw-pr-cvs1:/tmp/cvs-serv16465/lib/LXR/Index

Modified Files:
	Mysql.pm 
Log Message:
Database password and user can now be specified in lxr.conf


Index: Mysql.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Mysql.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Mysql.pm	2001/08/15 15:50:27	1.8
+++ Mysql.pm	2001/10/16 20:25:32	1.9
@@ -32,7 +32,14 @@
 	my ($self, $dbname) = @_;
 
 	$self = bless({}, $self);
-	$self->{dbh} = DBI->connect($dbname, "lxr") || fatal "Can't open connection to database\n";
+	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})
+			|| fatal "Can't open connection to database\n";
+	}
 
 	%files = ();
 	%symcache = ();
@@ -262,7 +269,7 @@
 }
 
 sub DESTROY {
-  my ($self) = @_;
+	my ($self) = @_;
 	$self->{files_select} = undef;
 	$self->{files_insert} = undef;
 	$self->{symbols_byname} = undef;

[Lxr-commits] CVS: lxr/templates lxr.conf,1.2,1.3

[Per K. G. <pe...@us...>]

Update of /cvsroot/lxr/lxr/templates
In directory usw-pr-cvs1:/tmp/cvs-serv16465/templates

Modified Files:
	lxr.conf 
Log Message:
Database password and user can now be specified in lxr.conf


Index: lxr.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lxr.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lxr.conf	2001/09/27 16:12:21	1.2
+++ lxr.conf	2001/10/16 20:25:32	1.3
@@ -127,5 +127,8 @@
   # If dbname is a directory the db-file databases will be stored here
   # if a relational database is used the name is a dbi database specifier
   'dbname'		=> 'dbi:mysql:dbname=lxr',
+# Used with the mysql backend
+#  'dbpass'		=> 'foo',
+#  'dbuser'		=> 'lxr'
   #     'dbname'		=> 'src/db',
 })

[Lxr-commits] CVS: lxr CREDITS.txt,1.1,1.2

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

Update of /cvsroot/lxr/lxr
In directory usw-pr-cvs1:/tmp/cvs-serv2598

Modified Files:
	CREDITS.txt 
Log Message:
Credit the right person :-)


Index: CREDITS.txt
===================================================================
RCS file: /cvsroot/lxr/lxr/CREDITS.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CREDITS.txt	2001/09/27 15:02:26	1.1
+++ CREDITS.txt	2001/09/28 14:31:38	1.2
@@ -15,7 +15,7 @@
 Principal Developers
 --------------------
 
-Peder O. Klingenberg <pe...@kl...>
+Peder O. Klingenberg <pe...@kl...>
 
 Contributors
 ------------
@@ -30,4 +30,4 @@
  
    http://sf.net/projects/lxr
  
-Last updated: $Date$
\ No newline at end of file
+Last updated: $Date$

[Lxr-commits] CVS: lxr/templates html-head.html,1.2,1.3

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

Update of /cvsroot/lxr/lxr/templates
In directory usw-pr-cvs1:/tmp/cvs-serv32699

Modified Files:
	html-head.html 
Log Message:
Fix HTML to be 4.01 Transitional compliant


Index: html-head.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-head.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- html-head.html	2001/09/27 16:12:21	1.2
+++ html-head.html	2001/09/28 14:22:14	1.3
@@ -1,9 +1,9 @@
-<!doctype html public \"-//W3C//DTD HTML 3.2//EN\">
+<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <title>$title</title>
-<base href=$baseurl>
-<link href="$stylesheet" rel="STYLESHEET" type="text/css"/>
+<base href="$baseurl" >
+<link href="$stylesheet" rel="STYLESHEET" type="text/css">
 </head>
 
 <body>

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

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

Update of /cvsroot/lxr/lxr/templates
In directory usw-pr-cvs1:/tmp/cvs-serv25395

Added Files:
	lxr.css 
Log Message:
Adding missing file for CSS support


--- NEW FILE: lxr.css ---
/****************************************/
/* general style to be inherited */
/****************************************/
body {
  color: #000000;
  background-color: white;
}

/* general link behavior */
a {
  text-decoration: none;
}

a:hover {
  text-decoration: underline;
}

a:visited {
}

/* the main page title etc. */
.main {
  color: #000066;
  font-size: 24pt;
  font-weight: bold;
}

/* banner - displayed file/folder path */
.banner {
  font-size: 18pt;
  color: #339966;
}

/****************************************/
/* menus, "variables" */
/****************************************/
a.modes, a.varlink {
  text-decoration: none; 
  color: blue;
}

a.modes:visited, a.varlink:visited {
  color: blue;
}

a.modes:hover, a.varlink:hover {
  background-color: #ddffcc;
  text-decoration: none;
}

/* currently selected mode/variable */
.modes-sel, .var-sel { /* selected one */
  font-style: italic;
  font-weight: bold;
}

/****************************************/
/* directory view */
/****************************************/

/* link to file or folder in the source view */
a.dirfile {
}

a.dirfolder {
}

/* directory listing header */
.dirheader {
  background-color: #669966;
  color: #000066;
}

/* "odd" lines (three at once) */
.dirrow1 {
  background-color: #ffffff;
}

/* "even" lines (three at once) */
.dirrow2 {
  background-color: #eeeeee;
}

/****************************************/
/* file view */
/****************************************/

/* link - the line number - underlined by default */
a.fline {
  text-decoration: underline;
}

/* link to other site (http, ftp and mailto) */
a.offshore {
}

/* link to the include file */
a.include {
  color: #669966;
}

/* link - identifier search */
.fid {
  color: #669966;
}

/* general file font etc. */
pre.file {
}

/* comments */
.comment {
  color: #000066;
}

/* strings */
.string {
  color: #000066;
}

/****************************************/
/* indent. search result */
/****************************************/

/* link to "member of" */
.search-member {
  color: #669966;
}

/* link to the file with declaration */
.search-decl {
}

/* link to the file with reference */
.search-ref {
}

/* identifier searched (in header) */
.search-ident {
  font-size: 18pt;
  font-weight: bold;
  color: #000066;
}

/* declaration list block */
.search-ul {
  display: block;
  margin-top: 10pt;
  margin-bottom: 10pt;
}

/* indented items (declaration list) */
.search-li1 {
  display: list-item;
  margin-left: 50pt;
}

/* indented (but not so much) items (ref. list) */
.search-li2 {
  display: list-item;
  margin-left: 20pt;
}

/****************************************/
/* diff view */
/****************************************/

/* reference to the file (in header) */
.diff-fref {
}

/* marks like '!!', '<<' etc. */
.diff-mark {
  color: red;
}

Re: [Lxr-commits] CVS: lxr CREDITS.txt,NONE,1.1

[<pe...@kl...>]

Malcolm Box <mb...@us...> writes:

> Peder O. Klingenberg <pe...@kl...>
                                      ^
klingenberg.no, actually :)

...Peder...
-- 
Cogito ergo panta rei.