[Lxr-commits] CVS: lxr genxref,1.26,1.27 search,1.10,1.11
Brought to you by:
ajlittoz
|
From: Malcolm B. <mb...@us...> - 2002-07-29 01:17:35
|
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;
}
|