[Lxr-commits] CVS: lxr/lib/LXR Files.pm, 1.12, 1.13 Index.pm, 1.15, 1.16 Lang.pm, 1.35, 1.36 Tagger
Brought to you by:
ajlittoz
Menu
▾
▴
[Lxr-commits] CVS: lxr/lib/LXR Files.pm, 1.12, 1.13 Index.pm, 1.15, 1.16 Lang.pm, 1.35, 1.36 Tagger.pm, 1.24, 1.25 Common.pm, 1.61, 1.62
|
From: AdrianIssott <adr...@us...> - 2009-05-10 11:54:37
|
Update of /cvsroot/lxr/lxr/lib/LXR In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3821/lib/LXR Modified Files: Files.pm Index.pm Lang.pm Tagger.pm Common.pm 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: Files.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Files.pm,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Files.pm 21 Apr 2009 20:03:04 -0000 1.12 +++ Files.pm 10 May 2009 11:54:29 -0000 1.13 @@ -53,21 +53,21 @@ # sub getdir { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; my @dircontents; warn __PACKAGE__."::getdir not implemented. Parameters @_"; return @dircontents; } sub getfile { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; warn __PACKAGE__."::getfile not implemented. Parameters @_"; my $filecontents; return $filecontents; } sub getannotations { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; warn __PACKAGE__."::getannotations not implemented. Parameters @_"; my @annotations; return @annotations; @@ -81,49 +81,49 @@ } sub filerev { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; warn __PACKAGE__."::filerev not implemented. Parameters @_"; my $filerev; return $filerev; } sub getfilehandle { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; warn __PACKAGE__."::getfilehandle not implemented. Parameters @_"; my $fh; return $fh; } sub getfilesize { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; warn __PACKAGE__."::getfilesize not implemented. Parameters @_"; my $filesize; return $filesize; } sub getfiletime { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; warn __PACKAGE__."::getfiletime not implemented. Parameters @_"; my $modificationTimeInSecondsSinceEpoch; return $modificationTimeInSecondsSinceEpoch; } sub getindex { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; warn __PACKAGE__."::getindex not implemented. Parameters @_"; my %index; return %index; } sub isdir { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; warn __PACKAGE__."::isdir not implemented. Parameters: @_"; my $boolean; return $boolean; } sub isfile { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; warn __PACKAGE__."::isfile not implemented. Parameters: @_"; my $boolean; return $boolean; @@ -131,7 +131,7 @@ # FIXME: This function really sucks and should be removed :) sub tmpfile { - my ($self, $filename, $release) = @_; + my ($self, $filename, $releaseid) = @_; warn __PACKAGE__."::tmpfile not implemented. Parameters: @_"; my $pathToATmpCopyOfTheFile; return $pathToATmpCopyOfTheFile; @@ -140,7 +140,7 @@ # FIXME: this function should probably not exist, since it doesn't make sense for # all file access methods sub toreal { - my ($self, $pathname, $release) = @_; + my ($self, $pathname, $releaseid) = @_; warn "toreal called - obsolete"; my $path; return $path; Index: Index.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Index.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Index.pm 9 May 2009 15:39:00 -0000 1.15 +++ Index.pm 10 May 2009 11:54:29 -0000 1.16 @@ -44,15 +44,15 @@ # sub fileid { - my ($self, $filename, $revision) = @_; # CAUTION: $revision is not $release! + my ($self, $filename, $revision) = @_; # CAUTION: $revision is not $releaseid! my $fileid; warn __PACKAGE__."::fileid not implemented. Parameters @_"; return $fileid; } -# Indicate that the file referred to by $fileid is part of $release +# Indicate that the file referred to by $fileid is part of $releaseid sub setfilerelease { - my ($self, $fileid, $release) = @_; + my ($self, $fileid, $releaseid) = @_; warn __PACKAGE__."::setfilerelease not implemented. Parameters @_"; return; } @@ -91,7 +91,7 @@ } sub symdeclarations { - my ($self, $symname, $release) = @_; + my ($self, $symname, $releaseid) = @_; my @indexes; warn __PACKAGE__."::symdeclarations not implemented. Parameters @_"; return @indexes; @@ -104,7 +104,7 @@ } sub symreferences { - my ($self, $symname, $release) = @_; + my ($self, $symname, $releaseid) = @_; my @references; warn __PACKAGE__."::symreferences not implemented. Parameters @_"; return @references; @@ -117,7 +117,7 @@ } sub issymbol { - my ($self, $symname, $release) = @_; + my ($self, $symname, $releaseid) = @_; my $symbolfoundboolean; warn __PACKAGE__."::issymbol not implemented. Parameters @_"; return $symbolfoundboolean; @@ -154,7 +154,7 @@ } sub purge { - my ($self, $release) = @_; + my ($self, $releaseid) = @_; warn __PACKAGE__."::purge not implemented. Parameters @_"; return; } Index: Lang.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang.pm,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- Lang.pm 21 Apr 2009 20:03:04 -0000 1.35 +++ Lang.pm 10 May 2009 11:54:29 -0000 1.36 @@ -24,14 +24,14 @@ use LXR::Common; sub new { - my ($self, $pathname, $release, @itag) = @_; + my ($self, $pathname, $releaseid, @itag) = @_; my ($lang, $type); foreach $type (values %{ $config->filetype }) { if ($pathname =~ /$$type[1]/) { eval "require $$type[2]"; die "Unable to load $$type[2] Lang class, $@" if $@; - my $create = "new $$type[2]" . '($pathname, $release, $$type[0])'; + my $create = "new $$type[2]" . '($pathname, $releaseid, $$type[0])'; $lang = eval($create); die "Unable to create $$type[2] Lang object, $@" unless defined $lang; last; @@ -41,7 +41,7 @@ if (!defined $lang) { # Try to see if it's a script - my $fh = $files->getfilehandle($pathname, $release); + my $fh = $files->getfilehandle($pathname, $releaseid); return undef if !defined $fh; $fh->getline =~ /^\#!\s*(\S+)/s; @@ -55,7 +55,7 @@ die "Unable to load $filetype{$inter{$patt}}[2] Lang class, $@" if $@; my $create = "new " . $filetype{ $inter{$patt} }[2] - . '($pathname, $release, $filetype{$inter{$patt}}[0])'; + . '($pathname, $releaseid, $filetype{$inter{$patt}}[0])'; $lang = eval($create); last if defined $lang; die "Unable to create $filetype{$inter{$patt}}[2] Lang object, $@"; Index: Tagger.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Tagger.pm,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Tagger.pm 6 May 2009 22:37:50 -0000 1.24 +++ Tagger.pm 10 May 2009 11:54:29 -0000 1.25 @@ -25,28 +25,28 @@ use LXR::Lang; sub processfile { - my ($pathname, $release, $config, $files, $index) = @_; + my ($pathname, $releaseid, $config, $files, $index) = @_; - my $lang = new LXR::Lang($pathname, $release); + my $lang = new LXR::Lang($pathname, $releaseid); return unless $lang; - my $revision = $files->filerev($pathname, $release); + my $revision = $files->filerev($pathname, $releaseid); return unless $revision; - print(STDERR "--- $pathname $release $revision\n"); + print(STDERR "--- $pathname $releaseid $revision\n"); if ($index) { my $fileid = $index->fileid($pathname, $revision); - $index->setfilerelease($fileid, $release); + $index->setfilerelease($fileid, $releaseid); if (!$index->fileindexed($fileid)) { $index->emptycache(); print(STDERR "--- $pathname $fileid\n"); - my $path = $files->tmpfile($pathname, $release); + my $path = $files->tmpfile($pathname, $releaseid); $lang->indexfile($pathname, $path, $fileid, $index, $config); $index->setfileindexed($fileid); @@ -62,17 +62,17 @@ } sub processrefs { - my ($pathname, $release, $config, $files, $index) = @_; + my ($pathname, $releaseid, $config, $files, $index) = @_; - my $lang = new LXR::Lang($pathname, $release); + my $lang = new LXR::Lang($pathname, $releaseid); return unless $lang; - my $revision = $files->filerev($pathname, $release); + my $revision = $files->filerev($pathname, $releaseid); return unless $revision; - print(STDERR "--- $pathname $release $revision\n"); + print(STDERR "--- $pathname $releaseid $revision\n"); if ($index) { my $fileid = $index->fileid($pathname, $revision); @@ -81,7 +81,7 @@ $index->emptycache(); print(STDERR "--- $pathname $fileid\n"); - my $path = $files->tmpfile($pathname, $release); + my $path = $files->tmpfile($pathname, $releaseid); $lang->referencefile($pathname, $path, $fileid, $index, $config); $index->setfilereferenced($fileid); Index: Common.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Common.pm,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- Common.pm 9 May 2009 21:57:34 -0000 1.61 +++ Common.pm 10 May 2009 11:54:29 -0000 1.62 @@ -27,13 +27,13 @@ require Exporter; use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS - $files $index $config $pathname $identifier $release + $files $index $config $pathname $identifier $releaseid $HTTP $wwwdebug $tmpcounter); @ISA = qw(Exporter); @EXPORT = qw($files $index $config &fatal); -@EXPORT_OK = qw($files $index $config $pathname $identifier $release +@EXPORT_OK = qw($files $index $config $pathname $identifier $releaseid $HTTP &warning &fatal &abortall &fflush &urlargs &fileref &idref &incref &htmlquote &freetextmarkup &markupfile @@ -156,7 +156,7 @@ foreach $dir (@paths) { $dir =~ s/\/+$//; $path = $config->mappath($dir . "/" . $file); - return &fileref($name, $css, $path) if $files->isfile($path, $release); + return &fileref($name, $css, $path) if $files->isfile($path, $releaseid); } @@ -265,7 +265,7 @@ $ltag[3] .= " "; my @itag = &idref(1, "fid", 1) =~ /^(.*=)1(\">)1(<\/a>)$/; - my $lang = new LXR::Lang($pathname, $release, @itag); + my $lang = new LXR::Lang($pathname, $releaseid, @itag); # A source code file if ($lang) { @@ -376,7 +376,7 @@ while ($node =~ s|/[^/]+/\.\./|/|g) { } $node =~ s|/\.\./|/|g; - $node .= '/' if $files->isdir($node, $release); + $node .= '/' if $files->isdir($node, $releaseid); $node =~ s|//+|/|g; return $node; @@ -395,7 +395,7 @@ # Todo: check lxr.conf. - my $time = $files->getfiletime($pathname, $release); + my $time = $files->getfiletime($pathname, $releaseid); my $time2 = (stat($config->confpath))[9]; $time = $time2 if !defined $time or $time2 > $time; @@ -504,8 +504,8 @@ delete $HTTP->{'param'}->{$_}; } - $release = clean_release($config->variable('v')); - $config->variable('v', $release); # put back into config obj + $releaseid = clean_release($config->variable('v')); + $config->variable('v', $releaseid); # put back into config obj $HTTP->{'param'}->{'file'} = clean_path($HTTP->{'param'}->{'file'}); $pathname = fixpaths($HTTP->{'path_info'} || $HTTP->{'param'}->{'file'}); @@ -514,15 +514,15 @@ } sub clean_release { - my $release = shift; + my $releaseid = shift; my @rels= $config->varrange('v'); my %test; @test{@rels} = undef; - if(!exists $test{$release}) { - $release = $config->vardefault('v'); + if(!exists $test{$releaseid}) { + $releaseid = $config->vardefault('v'); } - return $release; + return $releaseid; } sub clean_identifier { |
