[Lxr-commits] CVS: lxr/templates html-ident.html,1.1,1.2 lxr.conf,1.4,1.5

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

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

Modified Files:
	html-ident.html lxr.conf 
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: html-ident.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-ident.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- html-ident.html	2001/09/27 16:12:21	1.1
+++ html-ident.html	2001/11/18 03:31:34	1.2
@@ -18,7 +18,7 @@
 <table>    
 <tr><td colspan='2'><b>Declarations:</b></td></tr>
 $refs{<tr>
-  <td>$fileref</td><td>$rel</td>
+  <td>$fileref</td><td>$type</td><td>$rel</td>
 </tr>}
 </table>
 

Index: lxr.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lxr.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lxr.conf	2001/11/14 15:27:36	1.4
+++ lxr.conf	2001/11/18 03:31:34	1.5
@@ -76,7 +76,8 @@
   # array MUST match
   'filetype' => {
 				 # Format is
-				 # Language name, filepatten regexp, module to invoke, tabwidth
+				 # Language name, filepatten regexp, module to invoke,
+                 # (optional )tabwidth
 				 # Note that to have another language supported by Generic.pm,
 				 # you must ensure that:
 				 # a) exuberant ctags supports it
@@ -100,9 +101,10 @@
 				 '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'],
+ # 				  , 'LXR::Lang::Generic'],
+                  # No tabwidth specified here as an example
+ 				 'Make' => ['Make', '(?i)\.mak$|makefile*' #'
+							, 'LXR::Lang::Generic'],
 # 				 ['Pascal', '(?i)\.p$|\.pas$'   #'
 # 				  , 'LXR::Lang::Generic'],
 				 'Perl' => ['Perl', '(?i)\.pl$|\.pm$|\.perl$'   #'