lxr-commits — Don't use, CVS commits

[Lxr-commits] CVS: lxr/templates html-head.html,1.6,1.7

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

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

Modified Files:
	html-head.html 
Log Message:
remove broken image and link

Index: html-head.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-head.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- html-head.html	22 Mar 2003 01:19:05 -0000	1.6
+++ html-head.html	28 Jun 2004 13:52:20 -0000	1.7
@@ -10,14 +10,12 @@
 <table width='100%' border='0' cellpadding='0' cellspacing='0'>
   <tr>
     <td rowspan='3'>
-      <img src="pengmini.gif"
-           alt="Penguin" border="0" width="67" height="92" align="middle">
     </td>
     <td>
       <table width='100%' border='0' cellpadding='0' cellspacing='0'>
         <tr>
           <td align='center'>
-            <a href="blurb.html" class="main">The LXR Cross Referencer</a>
+            <h1>The LXR Cross Referencer</h1>
           </td>
         </tr>
         <tr>

[Lxr-commits] CVS: lxr source,1.32,1.33

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

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

Modified Files:
	source 
Log Message:
use apache-provided icons

Index: source
===================================================================
RCS file: /cvsroot/lxr/lxr/source,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- source	29 Jul 2002 01:23:03 -0000	1.32
+++ source	28 Jun 2004 13:48:29 -0000	1.33
@@ -2,6 +2,7 @@
 # $Id$
 
 # source --	Present sourcecode as html, complete with references
+#  the '/icons' images are available in any standard Apache installation
 #
 #	Arne Georg Gleditsch <ar...@if...>
 #	Per Kristian Gjermshus <pe...@if...>
@@ -36,10 +37,9 @@
     my $img;
 
     if ($node eq '../') {
-	$img = "/icons/back.gif";
+        $img = "/icons/back.gif";
     } else {
-#      $img = "/icons/folder.gif";
-	$img = "internal-gopher-menu";
+        $img = "/icons/folder.gif";
     }
 
     return fileref("<img align=\"bottom\" border=\"0\" src=\"$img\" alt=\"folder\">", "",
@@ -63,15 +63,18 @@
     my $img;
 
     if ($node =~ /^.*\.[ch]$/) {
-#      $img = "/icons/c.gif";
-	$img = "internal-gopher-text";
+        $img = "/icons/c.gif";
     } elsif ($node =~ /^.*\.(cpp|cc|java)$/) {
-	# TODO: Find a nice icon for c++ files (KDE?)
-#      $img = "/icons/c.gif";
-	$img = "internal-gopher-text";
-    } else {		
-	#      $img = "/icons/text.gif";
-	$img = "internal-gopher-unknown";
+        # TODO: Find a nice icon for c++ files (KDE?)
+        $img = "/icons/c.gif";
+    } elsif ($node =~ /^.*\.(txt)$/) {
+        $img = "/icons/text.gif";
+    } elsif ($node =~ /^.*\.(jar|war|ear|zip|tar|gz|tgz|cab)$/) {
+        $img = "/icons/compressed.gif";
+    } elsif ($node =~ /^.*\.(jpg|jpeg|gif|bmp|png)$/) {
+        $img = "/icons/image2.gif";
+    } else {
+        $img = "/icons/generic.gif";
     }
     return fileref("<img align=\"bottom\" border=\"0\" src=\"$img\" alt=\"\">",
                    "", $dir.$node);

[Lxr-commits] CVS: lxr find,1.9,1.10 genxref,1.27,1.28

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

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

Modified Files:
	find genxref 
Log Message:
support filename searchs for swish-e; ignore binary files (swish-e only) for full-text indexing; simpler forking/piping to feed swish-e indexer (works in Solaris now)

Index: find
===================================================================
RCS file: /cvsroot/lxr/lxr/find,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- find	5 Jun 2003 16:55:05 -0000	1.9
+++ find	28 Jun 2004 13:17:17 -0000	1.10
@@ -53,10 +53,18 @@
 
 
     if ($searchtext ne "") {
-	unless (open(FILELLISTING,$config->glimpsedir."/".$release."/.glimpse_filenames")) {
-	    &warning("Could not open ".$config->glimpsedir."/$release/.glimpse_filenames.");
-	    return;
-	}
+    if ($config->swishdir and $config->swishindex) {
+        unless (open(FILELLISTING,$config->swishdir."/$release.filenames")) {
+            &warning("Could not open ".$config->swishdir."/$release.filenames.");
+            return;
+        }
+    }
+    if ($config->glimpsedir and $config->glimpseindex) {
+        unless (open(FILELLISTING,$config->glimpsedir."/".$release."/.glimpse_filenames")) {
+            &warning("Could not open ".$config->glimpsedir."/$release/.glimpse_filenames.");
+            return;
+        }
+    }
 	print("<hr>\n");
 	$sourceroot = $config->sourceroot;
 	while($file = <FILELLISTING>) {

Index: genxref
===================================================================
RCS file: /cvsroot/lxr/lxr/genxref,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- genxref	29 Jul 2002 01:17:32 -0000	1.27
+++ genxref	28 Jun 2004 13:17:17 -0000	1.28
@@ -20,6 +20,7 @@
 use Fcntl;
 use Getopt::Long;
 use IO::Handle;
+use File::MMagic;
 
 use LXR::Files;
 use LXR::Index;
@@ -70,6 +71,8 @@
 $index = new LXR::Index($config->dbname, O_RDWR|O_CREAT);
 die "Can't create Index ".$config->dbname if !defined($index);
 
+our $filetype = new File::MMagic();
+
 my @versions;
 
 if ($option{'allversions'} || !$option{'version'}) {
@@ -116,22 +119,25 @@
 }
 
 sub feedswish {
-	my ($pathname, $release, $swish) = @_;
+	my ($pathname, $release, $swish, $filelist) = @_;
 
     print(STDERR "&&& $pathname $release \n");
     
     if ($pathname =~ m|/$|) {
 	map {
-	    feedswish($pathname.$_, $release, $swish)
+	    feedswish($pathname.$_, $release, $swish, $filelist)
 	    } $files->getdir($pathname, $release);
     } else {
-		my $contents = $files->getfile($pathname, $release);
-		$swish->print("Path-Name: $pathname\n",
-					  "Content-Length: ".length($contents)."\n",
-					  "Document-Type: TXT\n",
-					  "\n",
-					  $contents)
-			if length($contents) > 0;
+		print $filelist "$pathname\n";
+        my $contents = $files->getfile($pathname, $release);
+        if ($filetype->checktype_contents($contents) =~ m%(text|message)/%) {
+            $swish->print("Path-Name: $pathname\n",
+                          "Content-Length: ".length($contents)."\n",
+                          "Document-Type: TXT\n",
+                          "\n",
+                          $contents)
+                if length($contents) > 0;
+        }
     }
 }
 
@@ -162,16 +168,17 @@
 	}
 
 	if ($config->swishdir and $config->swishindex) {
-		my $swish = new IO::Handle;
-		my $pid = open($swish, "|-");
-		if ($pid == 0) {
-			exec($config->swishindex,
-				 "-S", "prog", "-i", "/bin/cat", "-v", "1",
-				 "-f", $config->swishdir."/".$release.".index");
-			print(STDERR "Couldn't exec ".$config->swishindex.": $!\n");
-			kill(9, $$);
-		}
-		feedswish("/", $release, $swish);
-		$swish->close();
+        my $swish = new IO::Handle;
+        my $filelist = new IO::File $config->swishdir."/$release.filenames", "w" or die "can't open $release.filenames for writing";
+        
+        # execute swish, as a pipe we can write to
+        
+        open($swish, "| " . $config->swishindex . " -S prog -i stdin -v 1 -f " . $config->swishdir."/".$release.".index")
+             or die "Couldn't exec ".$config->swishindex.": $!\n";
+        
+        feedswish("/", $release, $swish, $filelist);
+        
+        $swish->close();
+        $filelist->close();
 	}
 }

[Lxr-commits] CVS: lxr .htaccess,1.4,1.5

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

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

Modified Files:
	.htaccess 
Log Message:
Force the type of the output to html to cope with occasional reports that the
output is served as text/plain, causing standards compliant browsers (Netscape, Mozilla etc) to display the markup

Fixes bug 749886 IE views ok, Netscape gets html code seen


Index: .htaccess
===================================================================
RCS file: /cvsroot/lxr/lxr/.htaccess,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .htaccess	28 Nov 2001 13:04:51 -0000	1.4
+++ .htaccess	21 Apr 2004 23:09:19 -0000	1.5
@@ -14,4 +14,5 @@
 SetHandler perl-script
 PerlHandler Apache::Registry
 PerlSetEnv PERL5LIB lib
+ForceType text/html
 </Files>

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

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

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

Modified Files:
	Tagger.pm 
Log Message:
Fix bug where a file that fails to index is marked as indexed for future runs.
Now file is only marked as indexed/referenced after a successful completion of 
the pass.

Fixes bug 676739 incomplete information if run is aborted


Index: Tagger.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Tagger.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Tagger.pm	23 Oct 2001 14:30:18 -0000	1.19
+++ Tagger.pm	21 Apr 2004 22:52:08 -0000	1.20
@@ -49,6 +49,7 @@
 		my $path = $files->tmpfile($pathname, $release);
 		
 		$lang->indexfile($pathname, $path, $fileid, $index, $config);
+		$index->setindexed($fileid);
 		unlink($path);
 	  } else {
 		print(STDERR "$pathname was already indexed\n");
@@ -82,6 +83,7 @@
 		my $path = $files->tmpfile($pathname, $release);
 		
 		$lang->referencefile($pathname, $path, $fileid, $index, $config);
+		$index->setreferenced($fileid);
 		unlink($path);
 	  } else {
 		print STDERR "$pathname was already referenced\n";

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

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

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

Modified Files:
	Mysql.pm 
Log Message:
Fix bug where a file that fails to index is marked as indexed for future runs.
Now file is only marked as indexed/referenced after a successful completion of 
the pass.

Fixes bug 676739 incomplete information if run is aborted


Index: Mysql.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Mysql.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Mysql.pm	18 Nov 2001 03:31:34 -0000	1.12
+++ Mysql.pm	21 Apr 2004 22:52:11 -0000	1.13
@@ -234,8 +234,8 @@
 	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);
@@ -247,16 +247,32 @@
 	if(!defined($status)) {
 		$self->{status_insert}->execute($fileid+0, 0);
 	}
-	return $self->{status_update}->execute(1, $fileid, 0) > 0;
+	
+	return $status == 0;
 }
 
+sub setindexed {
+	my ($self, $fileid) = @_;
+	$self->{status_update}->execute(1, $fileid, 0);
+	}
+
 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 {
+ 	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. 

[Lxr-commits] CVS: lxr INSTALL,1.9,1.10

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

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1:/tmp/cvs-serv20253

Modified Files:
	INSTALL 
Log Message:
Fix bug [ 735124 ] rcs also needed

Document the fact that cvs and rcs are needed.


Index: INSTALL
===================================================================
RCS file: /cvsroot/lxr/lxr/INSTALL,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- INSTALL	22 Mar 2003 00:24:29 -0000	1.9
+++ INSTALL	5 Jun 2003 18:18:46 -0000	1.10
@@ -22,6 +22,8 @@
    database you're using.  If you don't already have these, they can be
    installed via CPAN.  See http://dbi.perl.org/index.html for more info.
 
+6) If using the CVS support, you will need cvs and rcs installed as well.
+
 Installing the database
 -----------------------
 You will need to create a database for lxr, and possibly create a user

[Lxr-commits] CVS: lxr find,1.8,1.9

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

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1:/tmp/cvs-serv11875

Modified Files:
	find 
Log Message:
Fix bug 703803 	search script glimpsedir path construction spotty.

Change the find path to $glimpsedir/$release to match search. 


Index: find
===================================================================
RCS file: /cvsroot/lxr/lxr/find,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- find	18 Mar 2002 14:55:43 -0000	1.8
+++ find	5 Jun 2003 16:55:05 -0000	1.9
@@ -53,8 +53,8 @@
 
 
     if ($searchtext ne "") {
-	unless (open(FILELLISTING,$config->glimpsedir."/.glimpse_filenames")) {
-	    &warning("Could not open .glimpse_filenames.");
+	unless (open(FILELLISTING,$config->glimpsedir."/".$release."/.glimpse_filenames")) {
+	    &warning("Could not open ".$config->glimpsedir."/$release/.glimpse_filenames.");
 	    return;
 	}
 	print("<hr>\n");

[Lxr-commits] CVS: lxr/lib/LXR Config.pm,1.26,1.27

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

Update of /cvsroot/lxr/lxr/lib/LXR
In directory sc8-pr-cvs1:/tmp/cvs-serv30165/lib/LXR

Modified Files:
	Config.pm 
Log Message:
Apply patch [ 608981 ] Support baseurl_aliases in lxr.conf from surazal.

Now the lxr.conf file can contain baseurl_aliases sections which allows one
configuration to be accessed at multiple urls.


Index: Config.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Config.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Config.pm	26 Feb 2002 15:59:32 -0000	1.26
+++ Config.pm	5 Jun 2003 15:39:15 -0000	1.27
@@ -84,13 +84,26 @@
     die($@) if $@;
 
     my $config;
-    foreach $config (@config) {
+	if (scalar(@config) > 0) {
+		%$self = (%$self, %{$config[0]});
+	}
+    CANDIDATE: foreach $config (@config) {
 		if ($config->{baseurl}) {
-			my $root = quotemeta($config->{baseurl});
-			next unless $url =~ /^$root/;
+			my @aliases;
+			if ($config->{baseurl_aliases}) {
+				@aliases = @{$config->{baseurl_aliases}};
+			}
+			my $root = $config->{baseurl};
+			push @aliases, $root;
+			foreach my $rt (@aliases) {
+				my $r = quotemeta($rt);
+				if ($url =~ /^$r/) {
+					$config->{baseurl} = $rt;
+					%$self = (%$self, %$config);
+					last CANDIDATE;
+				}
+			}
 		}
-		
-		%$self = (%$self, %$config);
     }
 
 	die "Can't find config for $url\n" if !defined $$self{baseurl};

[Lxr-commits] CVS: lxr/templates lxr.conf,1.12,1.13

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

Update of /cvsroot/lxr/lxr/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv31658/templates

Modified Files:
	lxr.conf 
Log Message:
Example entry for new baseurl_aliases entry


Index: lxr.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lxr.conf,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- lxr.conf	29 Jul 2002 01:17:32 -0000	1.12
+++ lxr.conf	5 Jun 2003 15:41:36 -0000	1.13
@@ -36,7 +36,10 @@
      # Configuration for http://192.168.1.3/lxr.
      # baseurl is used to select configuration block.
 
-     'baseurl'		=> 'http://192.168.1.3/lxr',  # Put your URL here
+  'baseurl'		=> 'http://192.168.1.3/lxr',  # Put your URL here
+  # baseurl_aliases allows other URLs to be used to reach the site
+  # comment this out if you do not want any aliases
+  'baseurl_aliases' => [ 'http://localhost/lxr', 'http://mydomain/lxr'],
      'virtroot'		=> '/lxr',                    # The bit after the / above
      
      'variables' => {

[Lxr-commits] CVS: lxr/lib/LXR/Files CVS.pm,1.17,1.18

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

Update of /cvsroot/lxr/lxr/lib/LXR/Files
In directory sc8-pr-cvs1:/tmp/cvs-serv9370

Modified Files:
	CVS.pm 
Log Message:
Apply patch 594351 - fix potential security flaws in CVS file opening.



Index: CVS.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/CVS.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- CVS.pm	3 Feb 2002 08:22:08 -0000	1.17
+++ CVS.pm	2 May 2003 23:04:16 -0000	1.18
@@ -156,10 +156,10 @@
 	my $rev = $self->filerev($filename, $release);
 	return undef unless defined($rev);
 
-	$fileh = new FileHandle("co -q -p$rev ".
-							$self->toreal($filename, $release).
-							" |"); # FIXME: Exploitable?
-	die("Error execting \"co\", rcs not installed?") unless $fileh;
+    open($fileh, "-|", "co -q -p$rev ".
+            $self->cleanstring($self->toreal($filename, $release)));
+
+	die("Error executing \"co\"; rcs not installed?") unless $fileh;
 	return $fileh;
 }
 
@@ -175,10 +175,10 @@
 	my $rev2 = $self->filerev($filename, $release2);
 	return undef unless defined($rev2);
 
-	$fileh = new FileHandle("rcsdiff -q -a -n -r$rev1 -r$rev2 ".
-							$self->toreal($filename, $release1).
-							" |"); # FIXME: Exploitable?
-	die("Error execting \"rcsdiff\", rcs not installed?") unless $fileh;
+    open($fileh, "-|", "rcsdiff -q -a -n -r$rev1 -r$rev2 ".
+            $self->cleanstring($self->toreal($filename, $release1)));
+
+	die("Error executing \"rcsdiff\"; rcs not installed?") unless $fileh;
 	return $fileh->getlines;
 }
 
@@ -273,6 +273,25 @@
 
 	return undef;
 }
+
+
+sub cleanstring {
+    my ($self, $in) = @_;
+
+    my $out = '';
+
+    for (split('',$in)) {
+        s/[|&!`;$%<>[:cntrl:]]// ||   # drop these in particular
+          /[\w\/,.-_+=]/ ||           # keep these intact
+          s/([ '"\x20-\x7E])/\\$1/ || # escape these out
+          s/.//;                      # drop everything else
+
+        $out .= $_;
+    }
+
+    return $out;
+}
+
 
 sub isdir {
 	my ($self, $pathname, $release) = @_;

[Lxr-commits] CVS: lxr initdb-mysql,1.8,1.9

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

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1:/tmp/cvs-serv7177

Modified Files:
	initdb-mysql 
Log Message:
Fix bad SQL syntax


Index: initdb-mysql
===================================================================
RCS file: /cvsroot/lxr/lxr/initdb-mysql,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- initdb-mysql	29 Jul 2002 01:06:02 -0000	1.8
+++ initdb-mysql	2 May 2003 22:58:34 -0000	1.9
@@ -1,7 +1,7 @@
 /* Read this into mysql with "\. initdb-mysql" when logged in as root
    to delete the old lxr database and create a new */ 
 
-drop if exists database lxr; 
+drop database if exists lxr; 
 create database lxr; 
 use lxr;
 

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

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

Update of /cvsroot/lxr/lxr/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv14053

Modified Files:
	html-head.html html-tail.html 
Log Message:
Applied patch 629763: Tiny fix in default HTML templates.

Close a <td> and remove redundant whitespace in link


Index: html-head.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-head.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- html-head.html	18 Mar 2002 14:55:43 -0000	1.5
+++ html-head.html	22 Mar 2003 01:19:05 -0000	1.6
@@ -24,7 +24,7 @@
           <td align="center">$banner</td>
         </tr>
       </table>
-    <td>
+    </td>
     <td align='right'>
       $modes{
       [&nbsp;$modelink&nbsp;]<br>}

Index: html-tail.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-tail.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- html-tail.html	18 Mar 2002 14:55:43 -0000	1.3
+++ html-tail.html	22 Mar 2003 01:19:05 -0000	1.4
@@ -13,8 +13,7 @@
       This page was automatically generated by the 
       <a href="http://lxr.sf.net/">LXR engine</a>.
       <address>
-        <a href="mailto:lxr...@li...">
-          The LXR team</a>
+        <a href="mailto:lxr...@li...">The LXR team</a>
       </address>
     </td>
     <td align="right">

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

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

Update of /cvsroot/lxr/lxr/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv11919

Modified Files:
	html-ident.html 
Log Message:
Applied patch 589546: HTML fix in the indent view.

Remove duplicate References section from the template, as references are
now generated by the html-ident-refs.html template.


Index: html-ident.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-ident.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- html-ident.html	18 Mar 2002 14:55:43 -0000	1.3
+++ html-ident.html	22 Mar 2003 01:16:09 -0000	1.4
@@ -22,10 +22,3 @@
 </tr>}
 </table>
 
-<p>
-<table>
-<tr><td colspan='2'><b>References:</b></td></tr>
-$uses{<tr>
-  <td width='30'> &nbsp; </td><td>$fileref</td>
-</tr>}
-</table>

[Lxr-commits] CVS: lxr/lib/LXR SimpleParse.pm,1.14,1.15

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

Update of /cvsroot/lxr/lxr/lib/LXR
In directory sc8-pr-cvs1:/tmp/cvs-serv7644/lib/LXR

Modified Files:
	SimpleParse.pm 
Log Message:
Apply patch 629550: tabwidth=0 breaks genxref.  Make sure the tabwidth read
from a vi modeline is never 0.


Index: SimpleParse.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/SimpleParse.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- SimpleParse.pm	14 Nov 2001 15:03:29 -0000	1.14
+++ SimpleParse.pm	22 Mar 2003 01:00:58 -0000	1.15
@@ -100,7 +100,8 @@
 			
 			if ($. <= 2 &&
 				$line =~ /^.*-[*]-.*?[ \t;]tab-width:[ \t]*([0-9]+).*-[*]-/) {
-				$tabwidth = $1;
+				# make sure there really is a non-zero tabwidth
+				if ($1) { $tabwidth = $1; }
 			}
 			
 #			&untabify($line, $tabwidth); # We inline this for performance.

[Lxr-commits] CVS: lxr INSTALL,1.8,1.9

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

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1:/tmp/cvs-serv17840

Modified Files:
	INSTALL 
Log Message:
Fix bug 700771: Install dependencies not doced.  Added details on the 
DBD and DBI drivers required.


Index: INSTALL
===================================================================
RCS file: /cvsroot/lxr/lxr/INSTALL,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- INSTALL	29 Jul 2002 01:03:41 -0000	1.8
+++ INSTALL	22 Mar 2003 00:24:29 -0000	1.9
@@ -18,6 +18,10 @@
    Swish-e is fully GPL'ed, while Glimpse is only free for
    non-commercial use.
 
+5) The Perl database driver interface DBI and the relevant DBD driver for the
+   database you're using.  If you don't already have these, they can be
+   installed via CPAN.  See http://dbi.perl.org/index.html for more info.
+
 Installing the database
 -----------------------
 You will need to create a database for lxr, and possibly create a user

[Lxr-commits] CVS: lxr/tests lxr.conf,1.1,1.1.2.1

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

Update of /cvsroot/lxr/lxr/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv28106/tests

Modified Files:
      Tag: rolling-cleanup
	lxr.conf 
Log Message:
This branch is for experimental work on making LXR able to cope with an 
evolving source base.  The aim is that re-indexing the same file will remove 
previous entries created for that file, keeping the database clean.:wq



Index: lxr.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/lxr.conf,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- lxr.conf	4 Mar 2002 15:11:27 -0000	1.1
+++ lxr.conf	21 Mar 2003 23:54:41 -0000	1.1.2.1
@@ -97,7 +97,7 @@
   # For mysql, the format is dbi:mysql:dbname=<name>
   # for Postgres, it is dbi:Pg:dbname=<name>
   # for Oracle, it is dbi:Oracle:host=localhost;sid=DEVMMS;port=1521
-  'dbname'		=> 'dbi:mysql:dbname=lxr',
+  'dbname'		=> 'dbi:mysql:dbname=lxrtest',
 
   # If you need to specify the username or password for the database connection,
   # uncomment the following two lines

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

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

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

Modified Files:
      Tag: rolling-cleanup
	generic.conf 
Log Message:
This branch is for experimental work on making LXR able to cope with an 
evolving source base.  The aim is that re-indexing the same file will remove 
previous entries created for that file, keeping the database clean.:wq



Index: generic.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/generic.conf,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- generic.conf	26 Feb 2002 15:56:23 -0000	1.10
+++ generic.conf	21 Mar 2003 23:54:41 -0000	1.10.2.1
@@ -162,8 +162,9 @@
 						  'reserved' => [
 										 'sub',
 										],
-						  'spec' => ['atom'		=> ('\$\W?',	''),
-									 'atom'		=> ('\\\\.',	''),
+							'spec' => [
+								#							 'atom'		=> ('\$\W?',	''),
+#									 'atom'		=> ('\\\\.',	''),
 									 'include'	=> ('\buse\s+',	';'),
 									 'include'	=> ('\brequire\s+',	';'),
 									 'string'	=> ('"',		'"'),

[Lxr-commits] CVS: lxr/lib/LXR/Index Mysql.pm,1.12,1.12.2.1 Postgres.pm,1.10,1.10.2.1

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

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

Modified Files:
      Tag: rolling-cleanup
	Mysql.pm Postgres.pm 
Log Message:
This branch is for experimental work on making LXR able to cope with an 
evolving source base.  The aim is that re-indexing the same file will remove 
previous entries created for that file, keeping the database clean.:wq



Index: Mysql.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Mysql.pm,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- Mysql.pm	18 Nov 2001 03:31:34 -0000	1.12
+++ Mysql.pm	21 Mar 2003 23:54:41 -0000	1.12.2.1
@@ -59,17 +59,23 @@
 		("delete from symbols where symname = ?");
 
 	$self->{indexes_select} = $self->{dbh}->prepare
-		("select f.filename, i.line, d.declaration, i.relsym ".
+		("select f.filename, i.line, d.declaration, sb.symname ".
 		 "from symbols s, indexes i, files f, releases r, 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 = ? ".
+		 "and i.relsym = sb.symbid");
 	$self->{indexes_insert} = $self->{dbh}->prepare
 		("insert into indexes (symid, fileid, line, langid, type, relsym) values (?, ?, ?, ?, ?, ?)");
 
 	$self->{releases_select} = $self->{dbh}->prepare
-		("select * from releases where fileid = ? and  release = ?");
+	  ("select * from releases where fileid = ? and  release = ?");
+	$self->{file_release_select} = $self->{dbh}->prepare
+	  ("select f.fileid from files f, releases r where f.fileid = r.fileid ".
+	   "and f.filename = ? and r.release =?");
+	$self->{release_remove} = $self->{dbh}->prepare
+	  ("delete from releases where fileid = ? and release = ?");
 	$self->{releases_insert} = $self->{dbh}->prepare
 		("insert into releases (fileid, release) values (?, ?)");
 
@@ -124,19 +130,13 @@
 
 sub getindex {
 	my ($self, $symname, $release) = @_;
-	my ($rows, @ret);
+	my ($rows, $ret);
 
 	$rows = $self->{indexes_select}->execute("$symname", "$release");
-
-	while ($rows-- > 0) {
-		push(@ret, [ $self->{indexes_select}->fetchrow_array ]);
-	}
-
+	$ret = $self->{indexes_select}->fetchall_arrayref ;
 	$self->{indexes_select}->finish();
 
-	map { $$_[3] &&= $self->symname($$_[3]) } @ret;
-
-	return @ret;
+	return @$ret;
 }
 
 sub getreference {
@@ -174,8 +174,10 @@
 }
 
 # Indicate that this filerevision is part of this release
+# If there is already a matching filename for this release, then remove
+# that fileid
 sub release {
-	my ($self, $fileid, $release) = @_;
+	my ($self, $fileid, $release, $pathname) = @_;
 
 	my $rows = $self->{releases_select}->execute($fileid+0, $release);
 	$self->{releases_select}->finish();
@@ -184,6 +186,23 @@
 		$self->{releases_insert}->execute($fileid, $release);
 		$self->{releases_insert}->finish();
 	}
+
+	# Now check for any duplicate entries and remove
+	# this is much harder in Mysql than Postgres thanks to the lack
+	# of subselects. Roll on Mysql 4!
+
+	$rows = $self->{file_release_select}->execute($pathname, $release, $fileid);
+	if ($rows > 0) {
+		for
+	}
+	my $all = $self->{file_release_select}->fetchall_arrayref;
+	
+	foreach my $row (@$all) {
+		$self->{release_remove}->excute{$$row[0], $release);
+	}
+	$self->{file_release_select}->finish();
+	
+
 }
 
 sub symid {

Index: Postgres.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Postgres.pm,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- Postgres.pm	23 Jan 2002 15:48:52 -0000	1.10
+++ Postgres.pm	21 Mar 2003 23:54:41 -0000	1.10.2.1
@@ -25,12 +25,12 @@
 use LXR::Common;
 
 use vars qw($dbh $transactions %files %symcache $commitlimit
-			$files_select $filenum_nextval $files_insert
-			$symbols_byname $symbols_byid $symnum_nextval
-			$symbols_remove $symbols_insert $indexes_select $indexes_insert
-			$releases_select $releases_insert $status_insert
-			$status_update $usage_insert $usage_select $decl_select
-		    $declid_nextnum $decl_insert);
+			$files_select $filenum_nextval $files_insert $files_remove
+			$symbols_byname $symbols_byid $symnum_nextval $symbols_remove
+			$symbols_insert $indexes_select $indexes_insert $indexes_remove
+			$releases_select $releases_insert $releases_remove $status_insert
+			$status_update $status_remove $usage_insert $usage_select
+			$usage_remove $decl_select $declid_nextnum $decl_insert);
 
 
 sub new {
@@ -53,7 +53,10 @@
 	$filenum_nextval = $dbh->prepare
 		("select nextval('filenum')");
 	$files_insert = $dbh->prepare
-		("insert into files values (?, ?, ?)");
+	  ("insert into files values (?, ?, ?)");
+	$files_remove = $dbh->prepare
+	  ("delete from files where fileid not in".
+	   " (select fileid from releases)");
 
 	$symbols_byname = $dbh->prepare
 		("select symid from symbols where symname = ?");
@@ -64,11 +67,13 @@
 	$symbols_insert = $dbh->prepare
 		("insert into symbols values (?, ?)");
 	$symbols_remove = $dbh->prepare
-		("delete from symbols where symname = ?");
+	  ("delete from symbols where symid not in".
+	   " (select symid from indexes)");
 
 	$indexes_select = $dbh->prepare
-		("select f.filename, i.line, d.declaration, i.relsym ".
-		 "from symbols s, indexes i, files f, releases r, declarations d ".
+	  ("select f.filename, i.line, d.declaration, sb.symname ".
+		 "from symbols s, files f, releases r, declarations d, ".
+		 "indexes i left join symbols sb on i.relsym = sb.symid ".
 		 "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 ".
@@ -77,10 +82,18 @@
 	  ("insert into indexes (symid, fileid, line, langid, type, relsym) ".
 	   "values (?, ?, ?, ?, ?, ?)");
 
+	$indexes_remove = $dbh->prepare
+	  ("delete from indexes  where fileid not in".
+	   " (select fileid from releases)");
+
 	$releases_select = $dbh->prepare
 		("select * from releases where fileid = ? and release = ?");
 	$releases_insert = $dbh->prepare
-		("insert into releases values (?, ?)");
+	  ("insert into releases values (?, ?)");
+	$releases_remove = $dbh->prepare
+	  ("delete from releases where fileid in ".
+	   "(select f.fileid from files f, releases r where f.fileid = r.fileid ".
+	   "and f.filename = ? and r.release = ? and f.fileid <> ?)");
 
 	$status_insert = $dbh->prepare
 #		("insert into status select ?, 0 except select fileid, 0 from status");
@@ -88,7 +101,10 @@
 		 "(select * from status where fileid = ?)");
 
 	$status_update = $dbh->prepare
-		("update status set status = ? where fileid = ? and status <= ?");
+	  ("update status set status = ? where fileid = ? and status <= ?");
+	$status_remove = $dbh->prepare
+	  ("delete from status where fileid not in".
+	   " (select fileid from releases)");
 
 	$usage_insert = $dbh->prepare
 		("insert into usage values (?, ?, ?)");
@@ -99,6 +115,9 @@
 		 "and f.fileid = u.fileid ".
 		 "and f.fileid = r.fileid and ".
 		 "s.symname = ? and r.release = ?");
+	$usage_remove = $dbh->prepare
+	  ("delete from usage where fileid not in".
+	   " (select fileid from releases)");
 
 	$declid_nextnum = $dbh->prepare
 	  ("select nextval('declnum')");
@@ -145,19 +164,13 @@
 
 sub getindex {
 	my ($self, $symname, $release) = @_;
-	my ($rows, @ret);
+	my ($rows, $ret);
 
 	$rows = $indexes_select->execute("$symname", "$release");
-
-	while ($rows-- > 0) {
-		push(@ret, [ $indexes_select->fetchrow_array ]);
-	}
-
+	$ret = $indexes_select->fetchall_arrayref;
 	$indexes_select->finish();
 
-	map { $$_[3] &&= $self->symname($$_[3]) } @ret;
-
-	return @ret;
+	return @$ret;
 }
 
 sub getreference {
@@ -206,20 +219,29 @@
 	return $fileid;
 }
 
-# Indicate that this filerevision is part of this release
+# Indicate that this filerevision is part of this release If there is
+#  an existing file of this name in the release, remove it from the
+#  release, along with all associated data.
 sub release {
-	my ($self, $fileid, $release) = @_;
-
+	my ($self, $fileid, $release, $pathname) = @_;
 
 	$releases_select->execute($fileid+0, $release);
 	my $firstrow = $releases_select->fetchrow_array();
-
-
-#	$releases_select->finish();
+	$releases_select->finish();
 
 	unless ($firstrow) {
 		$releases_insert->execute($fileid+0, $release);
 	}
+
+	my $rows=$releases_remove->execute($pathname, $release, $fileid);
+	if ($rows > 0) {
+		print "Removed $rows\n";
+		# Something was zapped, so clean up
+		# The referential integrity will clean up from these two deletes
+		$rows=$files_remove->execute;
+		$rows=$indexes_remove->execute;
+	}
+	
 	commit_if_limit();
 }
 
@@ -304,6 +326,7 @@
 	$files_select= undef;
 	$filenum_nextval= undef;
 	$files_insert = undef;
+	$files_remove = undef;
 	$symbols_byname= undef;
 	$symbols_byid= undef;
 	$symnum_nextval = undef;
@@ -311,12 +334,16 @@
 	$symbols_insert= undef;
 	$indexes_select= undef;
 	$indexes_insert = undef;
+	$indexes_remove = undef;
 	$releases_select= undef;
 	$releases_insert= undef;
+	$releases_remove = undef;
 	$status_insert = undef;
 	$status_update= undef;
+	$status_remove = undef;
 	$usage_insert= undef;
 	$usage_select= undef;
+	$usage_remove = undef;
 	$decl_select = undef;
 	$declid_nextnum= undef;
 	$decl_insert = undef;

[Lxr-commits] CVS: lxr/templates html-ident.html,1.2,1.2.2.1

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

Update of /cvsroot/lxr/lxr/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv28106/templates

Modified Files:
      Tag: rolling-cleanup
	html-ident.html 
Log Message:
This branch is for experimental work on making LXR able to cope with an 
evolving source base.  The aim is that re-indexing the same file will remove 
previous entries created for that file, keeping the database clean.:wq



Index: html-ident.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-ident.html,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- html-ident.html	18 Nov 2001 03:31:34 -0000	1.2
+++ html-ident.html	21 Mar 2003 23:54:41 -0000	1.2.2.1
@@ -22,10 +22,3 @@
 </tr>}
 </table>
 
-<p>
-<table>
-<tr><td colspan='2'><b>References:</b></td></tr>
-$uses{<tr>
-  <td width='30'> &nbsp; </td><td>$fileref</td>
-</tr>}
-</table>

[Lxr-commits] CVS: lxr initdb-postgres,1.5,1.5.2.1

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

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1:/tmp/cvs-serv28106

Modified Files:
      Tag: rolling-cleanup
	initdb-postgres 
Log Message:
This branch is for experimental work on making LXR able to cope with an 
evolving source base.  The aim is that re-indexing the same file will remove 
previous entries created for that file, keeping the database clean.:wq



Index: initdb-postgres
===================================================================
RCS file: /cvsroot/lxr/lxr/initdb-postgres,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- initdb-postgres	28 Nov 2001 12:59:02 -0000	1.5
+++ initdb-postgres	21 Mar 2003 23:54:41 -0000	1.5.2.1
@@ -39,7 +39,7 @@
 
 create table indexes (
 	symid		int		references symbols,
-	fileid		int		references files,
+	fileid		int		references files(fileid) on delete cascade,
 	line		int,
 	langid		smallint not null,
 	type		smallint not null,
@@ -54,13 +54,13 @@
 );
 
 create table usage
-	(fileid		int		references files,
+	(fileid		int		references files(fileid) on delete cascade,
 	line		int,
-	symid		int		references symbols
+	symid		int		references symbols(symid) on delete cascade
 );
 
 create table status
-	(fileid		int		references files,
+	(fileid		int		references files(fileid) on delete cascade,
 	status		smallint,
 	primary key	(fileid)
 );

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

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

Update of /cvsroot/lxr/lxr/lib/LXR
In directory sc8-pr-cvs1:/tmp/cvs-serv28106/lib/LXR

Modified Files:
      Tag: rolling-cleanup
	Tagger.pm 
Log Message:
This branch is for experimental work on making LXR able to cope with an 
evolving source base.  The aim is that re-indexing the same file will remove 
previous entries created for that file, keeping the database clean.:wq



Index: Tagger.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Tagger.pm,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -d -r1.19 -r1.19.2.1
--- Tagger.pm	23 Oct 2001 14:30:18 -0000	1.19
+++ Tagger.pm	21 Mar 2003 23:54:41 -0000	1.19.2.1
@@ -40,7 +40,7 @@
 	if ($index) {
 	  my $fileid = $index->fileid($pathname, $revision);
 	  
-	  $index->release($fileid, $release);
+	  $index->release($fileid, $release, $pathname);
 	  
 	  if ($index->toindex($fileid)) {
 		$index->empty_cache();

[Lxr-commits] CVS: lxr source,1.31,1.32

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

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

Modified Files:
	source 
Log Message:
Apply patch [ 455555 ] date/time ISO8601.  This makes source display
times in ISO format.


Index: source
===================================================================
RCS file: /cvsroot/lxr/lxr/source,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- source	18 Mar 2002 14:55:43 -0000	1.31
+++ source	29 Jul 2002 01:23:03 -0000	1.32
@@ -110,24 +110,12 @@
     my $file_time = $files->getfiletime($dir.$node, $release);
 
     return '-' unless defined($file_time);
-    
+
     my @t = gmtime($file_time);
-    
-    my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun",
-		  "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
     my ($sec, $min, $hour, $mday, $mon, $year) = @t;
-    $year += 1900;
-    $mon = $months[$mon];
-    
-    my $one_hour = (60 * 60);
-    my $six_months = $one_hour * 24 * int(365/2);
-    
-    if ($file_time <= ($current_time - $six_months) ||
-	$file_time >= ($current_time + $one_hour)) {
-	return sprintf("%s %2d  %04d", $mon, $mday, $year);
-    } else {
-	return sprintf("%s %2d %02d:%02d", $mon, $mday, $hour, $min);
-    }
+    return sprintf("%04d-%02d-%02d %02d:%02d:%02d",
+				   $year + 1900,
+				   $mon + 1, $mday, $hour, $min, $sec);
 }
 
 sub bgcolor {

[Lxr-commits] CVS: lxr/templates lxr.conf,1.11,1.12

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

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

Modified Files:
	lxr.conf 
Log Message:
Applied patch [ 571608 ] Adding Glimpse Indexing into genxref from andrewbeck.

Also updated to use 'glimpsedir' to store the glimpse database files - example
now in lxr.conf



Index: lxr.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lxr.conf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- lxr.conf	7 Mar 2002 15:44:32 -0000	1.11
+++ lxr.conf	29 Jul 2002 01:17:32 -0000	1.12
@@ -9,11 +9,17 @@
   # Define this OR the swish-e variables depending which search engine you want to use.
   'glimpsebin'	=> '/info/lxr/bin/glimpse',
 
+  # Where to store the glimpse index files
+  'glimpsedir' => 'somewhere',
+
   # Location of SWISH-E indexer binary
   'swishindex' => '/usr/local/bin/swish-e',
 
   # Location of SWISH-E search binary
   'swishsearch' => '/usr/local/bin/swish-e',
+
+  # Where to store the swish index files
+  'swishdir' => 'somewhere',
 
   # Path to Exuberant Ctags executable
   'ectagsbin'	=> '/usr/bin/ctags',

[Lxr-commits] CVS: lxr genxref,1.26,1.27 search,1.10,1.11

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

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

Modified Files:
	genxref search 
Log Message:
Applied patch [ 571608 ] Adding Glimpse Indexing into genxref from andrewbeck.

Also updated to use 'glimpsedir' to store the glimpse database files - example
now in lxr.conf



Index: genxref
===================================================================
RCS file: /cvsroot/lxr/lxr/genxref,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- genxref	18 Mar 2002 14:18:19 -0000	1.26
+++ genxref	29 Jul 2002 01:17:32 -0000	1.27
@@ -137,6 +137,29 @@
 
 sub gensearch {
 	my ($release) = @_;
+	my $string;
+
+	if ($config->glimpsebin and $config->glimpseindex) {
+		# Make sure the directory that the glimpse results go into
+		# already exists as glimpse won't work if the directory does
+		# not exist
+		$string = $config->glimpsedir."/".$release;
+		mkdir $string;
+		system("chmod 755 $string");
+		my $glimpse = new IO::Handle;
+		my $pid = open($glimpse, "|-");
+		if ($pid == 0) {
+			exec($config->glimpseindex,
+				 "-n", "-o", "-H", $config->glimpsedir."/$release",
+				 $config->sourceroot."/".$release);
+			print(STDERR "Couldn't exec ".$config->glimpseindex.": $!\n");
+			kill(9, $$);
+		}
+		$glimpse->close();
+		# Need to chmod the glimpse files so everybody can read them.
+		$string = $config->glimpsedir."/".$release."/.glimpse\*";
+		system("chmod 644 $string");
+	}
 
 	if ($config->swishdir and $config->swishindex) {
 		my $swish = new IO::Handle;

Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- search	18 Mar 2002 14:55:43 -0000	1.10
+++ search	29 Jul 2002 01:17:32 -0000	1.11
@@ -40,7 +40,7 @@
     unless (open(GLIMPSE, "-|")) {
 	open(STDERR, ">&STDOUT");
 	$!='';
-	exec($config->glimpsebin,"-i","-H".$config->glimpsedir,'-y','-n',$searchtext);
+	exec($config->glimpsebin,"-i","-H".$config->glimpsedir."/".$release,'-y','-n',$searchtext);
 	print("Glimpse subprocess died unexpextedly: $!\n");
 	exit;
     }