Thread: [Lxr-commits] CVS: lxr ident, 1.23, 1.24 find, 1.25, 1.26 initdb-oracle.sql, 1.5, 1.6 search, 1.32,
Brought to you by:
ajlittoz
Update of /cvsroot/lxr/lxr In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3821 Modified Files: ident find initdb-oracle.sql search Local.pm diff initdb-postgres genxref initdb-mysql source Log Message: Feature 1691378 (Rearchitect the DB backends) Part X * Renamed lxr_release.rel -> releaseid for Mysql * Renamed lxr_release.release -> releaseid for Oracle and Postgres * Renamed $release -> $releaseid generally Index: ident =================================================================== RCS file: /cvsroot/lxr/lxr/ident,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- ident 25 Apr 2009 20:40:24 -0000 1.23 +++ ident 10 May 2009 11:54:29 -0000 1.24 @@ -49,7 +49,7 @@ my $templ = shift; my $ret = ''; - my @refs = $index->symdeclarations($identifier, $release); + my @refs = $index->symdeclarations($identifier, $releaseid); my $file_hits = 0; my $last_file; @@ -86,7 +86,7 @@ my $templ = shift; my $ret = ''; - my @uses = $index->symreferences($identifier, $release); + my @uses = $index->symreferences($identifier, $releaseid); my $file_hits = 0; my $last_file; foreach my $ref (sort { $$a[0] cmp $$b[0] } @uses) { Index: find =================================================================== RCS file: /cvsroot/lxr/lxr/find,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- find 8 Apr 2009 20:49:19 -0000 1.25 +++ find 10 May 2009 11:54:29 -0000 1.26 @@ -66,7 +66,7 @@ my @ret; if ($searchtext ne "") { - my $sourceroot = $config->sourceroot . '/' . $release . '/'; + my $sourceroot = $config->sourceroot . '/' . $releaseid . '/'; while (my $file = <$FILELISTING>) { chomp $file; $file =~ s/^$sourceroot//; @@ -113,21 +113,21 @@ my $FILELISTING; if ($config->swishdir and $config->swishbin) { - unless ($FILELISTING = new IO::File($config->swishdir . "/$release.filenames")) { + unless ($FILELISTING = new IO::File($config->swishdir . "/$releaseid.filenames")) { &warning( - "Version '$release' has not been indexed and is unavailable for searching<br>Could not open " + "Version '$releaseid' has not been indexed and is unavailable for searching<br>Could not open " . $config->swishdir - . "/$release.filenames."); + . "/$releaseid.filenames."); return; } } elsif ($config->glimpsedir and $config->glimpsebin) { unless ($FILELISTING = - new IO::File($config->glimpsedir . "/" . $release . "/.glimpse_filenames")) + new IO::File($config->glimpsedir . "/" . $releaseid . "/.glimpse_filenames")) { &warning( - "Version '$release' has not been indexed and is unavailable for searching<br>Could not open " + "Version '$releaseid' has not been indexed and is unavailable for searching<br>Could not open " . $config->glimpsedir - . "/$release/.glimpse_filenames."); + . "/$releaseid/.glimpse_filenames."); return; } } else { Index: initdb-oracle.sql =================================================================== RCS file: /cvsroot/lxr/lxr/initdb-oracle.sql,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- initdb-oracle.sql 19 Apr 2009 09:16:55 -0000 1.5 +++ initdb-oracle.sql 10 May 2009 11:54:29 -0000 1.6 @@ -90,8 +90,8 @@ create table lxr_releases ( fileid number, - release varchar2(250), - constraint pk_lxr_releases primary key (fileid,release), + releaseid varchar2(250), + constraint pk_lxr_releases primary key (fileid,releaseid), constraint fk_lxr_releases_fileid foreign key (fileid) references lxr_files(fileid) ); Index: search =================================================================== RCS file: /cvsroot/lxr/lxr/search,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- search 21 Apr 2009 19:12:25 -0000 1.32 +++ search 10 May 2009 11:54:29 -0000 1.33 @@ -81,7 +81,7 @@ unless (open(GLIMPSE, "-|")) { open(STDERR, ">&STDOUT"); $! = ''; - exec($config->glimpsebin, "-i", "-H" , $config->glimpsedir . "/" . $release, + exec($config->glimpsebin, "-i", "-H" , $config->glimpsedir . "/" . $releaseid, '-y', '-n', $searchtext); print("Glimpse subprocess died unexpextedly: $!\n"); exit; @@ -107,7 +107,7 @@ if ($retval == 0) { my @ret; - my $sourceroot = $config->sourceroot . '/' . $release . '/'; + my $sourceroot = $config->sourceroot . '/' . $releaseid . '/'; my $i = 0; foreach my $glimpseline (@glimpselines) { last if ($i > $maxhits); @@ -141,10 +141,10 @@ sub swishsearch { my ($searchtext, $filetext, $advanced, $casesensitive) = @_; - my $swishIndex = $config->swishdir . "/" . $release . ".index"; + my $swishIndex = $config->swishdir . "/" . $releaseid . ".index"; if (!-e $swishIndex) { print "<p align='center'><i>"; - print "Version '$release' has not been indexed and is unavailable for searching."; + print "Version '$releaseid' has not been indexed and is unavailable for searching."; print "</i></p>"; return; } @@ -252,21 +252,21 @@ } elsif ($filetext ne "") { my $FILELISTING; if ($config->swishdir and $config->swishbin) { - unless ($FILELISTING = new IO::File($config->swishdir . "/$release.filenames")) { + unless ($FILELISTING = new IO::File($config->swishdir . "/$releaseid.filenames")) { &warning( - "Version '$release' has not been indexed and is unavailable for searching<br>Could not open " + "Version '$releaseid' has not been indexed and is unavailable for searching<br>Could not open " . $config->swishdir - . "/$release.filenames."); + . "/$releaseid.filenames."); return; } } elsif ($config->glimpsedir and $config->glimpsebin) { unless ($FILELISTING = - new IO::File($config->glimpsedir . "/" . $release . "/.glimpse_filenames")) + new IO::File($config->glimpsedir . "/" . $releaseid . "/.glimpse_filenames")) { &warning( - "Version '$release' has not been indexed and is unavailable for searching<br>Could not open " + "Version '$releaseid' has not been indexed and is unavailable for searching<br>Could not open " . $config->glimpsedir - . "/$release/.glimpse_filenames."); + . "/$releaseid/.glimpse_filenames."); return; } } else { @@ -275,7 +275,7 @@ ); return; } - my $sourceroot = $config->sourceroot . '/' . $release . '/'; + my $sourceroot = $config->sourceroot . '/' . $releaseid . '/'; while (<$FILELISTING>) { chomp; s/^$sourceroot//; Index: Local.pm =================================================================== RCS file: /cvsroot/lxr/lxr/Local.pm,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Local.pm 21 Jul 2004 20:44:30 -0000 1.20 +++ Local.pm 10 May 2009 11:54:29 -0000 1.21 @@ -74,7 +74,7 @@ sub fdescexpand { my $filename = shift; my $dir = shift; - my $release = shift; + my $releaseid = shift; my $linecount = 0; my $copy = ""; local $desc = ""; @@ -91,7 +91,7 @@ return ("\ \;"); } - if ($fh = $files->getfilehandle($dir . $filename, $release)) { + if ($fh = $files->getfilehandle($dir . $filename, $releaseid)) { while (<$fh>) { $desc = $desc . $_; if ($linecount++ > 60) { @@ -280,13 +280,13 @@ # In Mozilla, if the directory has a README file look in it for lines # like the ones used in source code: "directoryname --- A short description" sub descexpand { - my ($templ, $node, $dir, $release) = @_; - if ($files->isdir($dir . $node, $release)) { + my ($templ, $node, $dir, $releaseid) = @_; + if ($files->isdir($dir . $node, $releaseid)) { return LXR::Common::expandtemplate($templ, - ('desctext' => sub { return dirdesc($dir . $node, $release); })); + ('desctext' => sub { return dirdesc($dir . $node, $releaseid); })); } else { return LXR::Common::expandtemplate($templ, - ('desctext' => sub { return fdescexpand($node, $dir, $release); })); + ('desctext' => sub { return fdescexpand($node, $dir, $releaseid); })); } } @@ -299,21 +299,21 @@ # possible make this work for randomly formatted files rather than # inventing strict rules which create gobbeldygook when they're broken. sub dirdesc { - my ($path, $release) = @_; - if ($files->isfile($path . "README.txt", $release)) { - descreadme($path . "README.txt", $release); - } elsif ($files->isfile($path . "README", $release)) { - descreadme($path . "README", $release); - } elsif ($files->isfile($path . "README.html", $release)) { - descreadmehtml($path . "README.html", $release); + my ($path, $releaseid) = @_; + if ($files->isfile($path . "README.txt", $releaseid)) { + descreadme($path . "README.txt", $releaseid); + } elsif ($files->isfile($path . "README", $releaseid)) { + descreadme($path . "README", $releaseid); + } elsif ($files->isfile($path . "README.html", $releaseid)) { + descreadmehtml($path . "README.html", $releaseid); } } sub descreadmehtml { - my ($file, $release) = @_; + my ($file, $releaseid) = @_; my $string = ""; - return if !($desc = $files->getfilehandle($file, $release)); + return if !($desc = $files->getfilehandle($file, $releaseid)); # undef $/; $string = <$desc>; @@ -346,7 +346,7 @@ } sub descreadme { - my ($file, $release) = @_; + my ($file, $releaseid) = @_; my $string = ""; @@ -359,7 +359,7 @@ my $minlines = 5; # Too small. Go back and add another paragraph. my $chopto = 10; # Truncate long READMEs to this length - return if !($desc = $files->getfilehandle($file, $release)); + return if !($desc = $files->getfilehandle($file, $releaseid)); # undef $/; $string = <$desc>; Index: diff =================================================================== RCS file: /cvsroot/lxr/lxr/diff,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- diff 8 Apr 2009 20:49:19 -0000 1.17 +++ diff 10 May 2009 11:54:29 -0000 1.18 @@ -84,7 +84,7 @@ my $origval = $config->variable($diffvar); my $origname = $pathname; - my $origtemp = $files->tmpfile($origname, $release); + my $origtemp = $files->tmpfile($origname, $releaseid); $config->variable($diffvar, $diffval); my $diffname = $config->mappath($pathname); Index: initdb-postgres =================================================================== RCS file: /cvsroot/lxr/lxr/initdb-postgres,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- initdb-postgres 6 May 2009 22:34:07 -0000 1.8 +++ initdb-postgres 10 May 2009 11:54:29 -0000 1.9 @@ -47,8 +47,8 @@ create table lxr_releases (fileid int references lxr_files, - release varchar, - primary key (fileid,release) + releaseid varchar, + primary key (fileid,releaseid) ); create table lxr_usage Index: genxref =================================================================== RCS file: /cvsroot/lxr/lxr/genxref,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- genxref 9 May 2009 21:57:34 -0000 1.42 +++ genxref 10 May 2009 11:54:29 -0000 1.43 @@ -98,46 +98,46 @@ $index->DESTROY(); sub genindex { - my ($pathname, $release) = @_; + my ($pathname, $releaseid) = @_; - print(STDERR "*** $pathname $release \n"); + print(STDERR "*** $pathname $releaseid \n"); if ($pathname =~ m|/$|) { - map { genindex($pathname . $_, $release) } $files->getdir($pathname, $release); + map { genindex($pathname . $_, $releaseid) } $files->getdir($pathname, $releaseid); } else { - &LXR::Tagger::processfile($pathname, $release, $config, $files, $index) + &LXR::Tagger::processfile($pathname, $releaseid, $config, $files, $index) unless exists $binaryfiles{$pathname}; } } sub genrefs { - my ($pathname, $release) = @_; + my ($pathname, $releaseid) = @_; - print(STDERR "### $pathname $release \n"); + print(STDERR "### $pathname $releaseid \n"); if ($pathname =~ m|/$|) { - map { genrefs($pathname . $_, $release) } $files->getdir($pathname, $release); + map { genrefs($pathname . $_, $releaseid) } $files->getdir($pathname, $releaseid); } else { - &LXR::Tagger::processrefs($pathname, $release, $config, $files, $index) + &LXR::Tagger::processrefs($pathname, $releaseid, $config, $files, $index) unless exists $binaryfiles{$pathname}; } } sub feedswish { - my ($pathname, $release, $swish, $filelist) = @_; + my ($pathname, $releaseid, $swish, $filelist) = @_; - print(STDERR "&&& $pathname $release \n"); + print(STDERR "&&& $pathname $releaseid \n"); if ($pathname =~ m|/$|) { - map { feedswish($pathname . $_, $release, $swish, $filelist) } - $files->getdir($pathname, $release); + map { feedswish($pathname . $_, $releaseid, $swish, $filelist) } + $files->getdir($pathname, $releaseid); } else { print $filelist "$pathname\n"; - my $fh = $files->getfilehandle($pathname, $release); - if ($files->getfilesize($pathname, $release) > 0 + my $fh = $files->getfilehandle($pathname, $releaseid); + if ($files->getfilesize($pathname, $releaseid) > 0 && $filetype->checktype_filehandle($fh) =~ m%(text|message)/%) { - my $contents = $files->getfile($pathname, $release); + my $contents = $files->getfile($pathname, $releaseid); $swish->print( "Path-Name: $pathname\n", "Content-Length: " . length($contents) . "\n", @@ -152,20 +152,20 @@ } sub gensearch { - my ($release) = @_; + my ($releaseid) = @_; my $string; if ($config->glimpsedir and $config->glimpseindex) { - $string = $config->glimpsedir . "/" . $release; + $string = $config->glimpsedir . "/" . $releaseid; mkdir $string; system("chmod 755 $string"); # TODO - fix Unix specific call? my $glimpse = new IO::Handle; my $pid = open($glimpse, "|-"); if ($pid == 0) { exec($config->glimpseindex, "-n", "-o", "-H", - $config->glimpsedir . "/$release", - $config->sourceroot . "/" . $release + $config->glimpsedir . "/$releaseid", + $config->sourceroot . "/" . $releaseid ); print(STDERR "Couldn't exec " . $config->glimpseindex . ": $!\n"); kill(9, $$); @@ -173,15 +173,15 @@ $glimpse->close(); # Need to chmod the glimpse files so everybody can read them. - $string = $config->glimpsedir . "/" . $release . "/.glimpse\*"; + $string = $config->glimpsedir . "/" . $releaseid . "/.glimpse\*"; system("chmod 644 $string"); } if ($config->swishdir and $config->swishbin) { my $swish = new IO::Handle; die $config->swishdir . " does not exist" unless -d $config->swishdir; - my $filelist = new IO::File $config->swishdir . "/$release.filenames", "w" - or die "can't open $release.filenames for writing"; + my $filelist = new IO::File $config->swishdir . "/$releaseid.filenames", "w" + or die "can't open $releaseid.filenames for writing"; # execute swish, as a pipe we can write to @@ -190,11 +190,11 @@ . $config->swishbin . " -S prog -i stdin -v 1 -c swish-e.conf -f " . $config->swishdir . "/" - . $release + . $releaseid . ".index") or die "Couldn't exec " . $config->swishbin . ": $!\n"; - feedswish("/", $release, $swish, $filelist); + feedswish("/", $releaseid, $swish, $filelist); $swish->close(); $filelist->close(); Index: initdb-mysql =================================================================== RCS file: /cvsroot/lxr/lxr/initdb-mysql,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- initdb-mysql 9 May 2009 15:39:00 -0000 1.13 +++ initdb-mysql 10 May 2009 11:54:29 -0000 1.14 @@ -34,8 +34,8 @@ create table lxr_releases (fileid int not null references lxr_files, - rel char(255) binary not null, - primary key (fileid,rel) + releaseid char(255) binary not null, + primary key (fileid,releaseid) ); create table lxr_usage Index: source =================================================================== RCS file: /cvsroot/lxr/lxr/source,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- source 8 Apr 2009 20:49:19 -0000 1.46 +++ source 10 May 2009 11:54:29 -0000 1.47 @@ -89,7 +89,7 @@ sub filesize { my ($templ, $node, $dir) = @_; - my $s = $files->getfilesize($dir . $node, $release); + my $s = $files->getfilesize($dir . $node, $releaseid); my $str; if ($s < 1 << 10) { @@ -117,7 +117,7 @@ my ($templ, $node, $dir) = @_; my $current_time = time; - my $file_time = $files->getfiletime($dir . $node, $release); + my $file_time = $files->getfiletime($dir . $node, $releaseid); return '-' unless defined($file_time); @@ -148,7 +148,7 @@ my @nodes; my $node; - @nodes = $files->getdir($dir, $release); + @nodes = $files->getdir($dir, $releaseid); unless (@nodes) { print( "<p align=\"center\">\n<i>The directory " . $dir . " does not exist.</i>\n"); @@ -176,7 +176,7 @@ 'bgcolor' => sub { bgcolor(@_, $line++) }, 'css' => sub { rowclass(@_, $line++) }, 'description' => - sub { descexpand(@_, $node, $dir, $release) } + sub { descexpand(@_, $node, $dir, $releaseid) } ) ); } else { @@ -193,12 +193,12 @@ 'description' => sub { ( $files->isa('LXR::Files::CVS') - && $files->toreal($dir . $node, $release) =~ + && $files->toreal($dir . $node, $releaseid) =~ m|/Attic/| ? "<i>In Attic</i> " : "" ) - . descexpand(@_, $node, $dir, $release); + . descexpand(@_, $node, $dir, $releaseid); } ) ); @@ -224,7 +224,7 @@ } # print the description of the current directory - print dirdesc($dir, $release); + print dirdesc($dir, $releaseid); # print the listing itself print(expandtemplate($templ, ('files' => sub { direxpand(@_, $dir) }))); @@ -236,7 +236,7 @@ if ($pathname =~ m|/$|) { printdir($pathname); } else { - my $fileh = $files->getfilehandle($pathname, $release); + my $fileh = $files->getfilehandle($pathname, $releaseid); if ($fileh) { if ($raw) { @@ -251,7 +251,7 @@ else { if ($config->cvswebprefix) { my $revtarget = ""; - $revtarget = "#rev$release" if lc($release) ne "head"; + $revtarget = "#rev$releaseid" if lc($releaseid) ne "head"; print "<a href='" . $config->cvswebprefix . $pathname @@ -259,7 +259,7 @@ . $revtarget . "'>View CVS Log</a>"; } - my @ann = $files->getannotations($pathname, $release); + my @ann = $files->getannotations($pathname, $releaseid); if (@ann) { my ($a, $b); |