[Lxr-commits] CVS: lxr Local.pm,1.19,1.20 diff,1.12,1.13 find,1.22,1.23 genxref,1.35,1.36 ident,1.19
Brought to you by:
ajlittoz
Menu
▾
▴
[Lxr-commits] CVS: lxr Local.pm,1.19,1.20 diff,1.12,1.13 find,1.22,1.23 genxref,1.35,1.36 ident,1.19,1.20 search,1.23,1.24 source,1.42,1.43
|
From: Dave B. <bro...@us...> - 2004-07-21 20:44:41
|
Update of /cvsroot/lxr/lxr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25090 Modified Files: Local.pm diff find genxref ident search source Log Message: perltidy with options: -ce -pt=2 -nolq -nsfs Index: Local.pm =================================================================== RCS file: /cvsroot/lxr/lxr/Local.pm,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Local.pm 19 Jul 2004 19:50:20 -0000 1.19 +++ Local.pm 21 Jul 2004 20:44:30 -0000 1.20 @@ -83,18 +83,18 @@ #ignore files that aren't source code if ( !( - ( $filename =~ /\.c$/ ) | ( $filename =~ /\.h$/ ) | ( $filename =~ /\.cc$/ ) | - ( $filename =~ /\.cp$/ ) | ( $filename =~ /\.cpp$/ ) | ( $filename =~ /\.java$/ ) + ($filename =~ /\.c$/) | ($filename =~ /\.h$/) | ($filename =~ /\.cc$/) | + ($filename =~ /\.cp$/) | ($filename =~ /\.cpp$/) | ($filename =~ /\.java$/) ) ) { return ("\ \;"); } - if ( $fh = $files->getfilehandle( $dir . $filename, $release ) ) { + if ($fh = $files->getfilehandle($dir . $filename, $release)) { while (<$fh>) { $desc = $desc . $_; - if ( $linecount++ > 60 ) { + if ($linecount++ > 60) { last; } } @@ -102,12 +102,12 @@ } # sanity check: if there's no description then stop - if ( !( $desc =~ /\w/ ) ) { + if (!($desc =~ /\w/)) { return ("\ \;"); } # if a java file, only consider class-level javadoc comments - if ( $filename =~ /\.java$/ ) { + if ($filename =~ /\.java$/) { # last /** ... */ before 'public class' or 'public interface' @@ -119,7 +119,7 @@ # last comment start before declaration pos $desc = 0; $commentStart = -1; - while ( $desc =~ m#/\*\*#g ) { + while ($desc =~ m#/\*\*#g) { last if $declPos < pos $desc; $commentStart = pos $desc; } @@ -129,7 +129,7 @@ pos $desc = $commentStart; $desc =~ m#\*/#g; $commentEnd = pos $desc; - $desc = substr( $desc, $commentStart + 3, $commentEnd - $commentStart - 5 ); + $desc = substr($desc, $commentStart + 3, $commentEnd - $commentStart - 5); return "\ \;" if !$desc; @@ -145,8 +145,8 @@ $desc =~ s#<[/\w]+(\s*\w+=[\w]*\s*)*>##g; # no quotes on attributes # strip off some CVS keyword lines - foreach $keyword ( 'Workfile', 'Revision', 'Modtime', 'Author', 'Id', 'Date', 'Source', - 'RCSfile' ) + foreach $keyword ('Workfile', 'Revision', 'Modtime', 'Author', 'Id', 'Date', 'Source', + 'RCSfile') { $desc =~ s/^\s*\$$keyword[\$:].*$//mg; } @@ -160,13 +160,13 @@ # descriptions before we go to the trouble of looking for # one in the first comment. The whitespace between the # delimeter and the description may include a newline. - if ( ( $desc =~ s/(?:.*?$filename\s*?- ?-*\s*)([^\n]*)(?:.*)/$1/sgi ) - || ( $desc =~ s/(?:.*?$filename\s*?:\s*)([^\n]*)(?:.*)/$1/sgi ) - || ( $desc =~ s/(?:.*?Description:\s*)([^\n]*)(?:.*)/$1/sgi ) ) + if ( ($desc =~ s/(?:.*?$filename\s*?- ?-*\s*)([^\n]*)(?:.*)/$1/sgi) + || ($desc =~ s/(?:.*?$filename\s*?:\s*)([^\n]*)(?:.*)/$1/sgi) + || ($desc =~ s/(?:.*?Description:\s*)([^\n]*)(?:.*)/$1/sgi)) { # if the description is non-empty then clean it up and return it - if ( $desc =~ /\w/ ) { + if ($desc =~ /\w/) { #strip trailing asterisks and "*/" $desc =~ s#\*/?\s*$##; @@ -180,13 +180,13 @@ $desc =~ s#[^\w]*##ms; #htmlify the comments making links to symbols and files - $desc = markupstring( $desc, $Path->{'virt'} ); + $desc = markupstring($desc, $Path->{'virt'}); return ($desc); } } # if java and the <filename><seperator> check above didn't work, just dump the whole javadoc - if ( $filename =~ /\.java$/ ) { + if ($filename =~ /\.java$/) { return $desc; } @@ -216,7 +216,7 @@ $desc =~ s#\n\s*/\*+[\s\*]+\*/\n#\n#sg; # Don't bother to continue if there aren't any comments here - if ( !( $desc =~ m#/\*# ) ) { + if (!($desc =~ m#/\*#)) { return (" "); } @@ -253,18 +253,18 @@ # If the description is too long then just use the first sentence # this will fail if no period was used. - if ( length($desc) > 200 ) { + if (length($desc) > 200) { $desc =~ s#([^\.]+\.)\s.*#$1#s; } # If the description is still too long then assume it will look # like gobbeldygook and give up - if ( length($desc) > 200 ) { + if (length($desc) > 200) { return (" "); } # htmlify the comments, making links to symbols and files - $desc = markupstring( $desc, $Path->{'virt'} ); + $desc = markupstring($desc, $Path->{'virt'}); if ($desc) { return ($desc); @@ -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 ) ) { - return LXR::Common::expandtemplate( $templ, - ( 'desctext' => sub { return dirdesc( $dir . $node, $release ); } ) ); + my ($templ, $node, $dir, $release) = @_; + if ($files->isdir($dir . $node, $release)) { + return LXR::Common::expandtemplate($templ, + ('desctext' => sub { return dirdesc($dir . $node, $release); })); } else { - return LXR::Common::expandtemplate( $templ, - ( 'desctext' => sub { return fdescexpand( $node, $dir, $release ); } ) ); + return LXR::Common::expandtemplate($templ, + ('desctext' => sub { return fdescexpand($node, $dir, $release); })); } } @@ -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, $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); } } sub descreadmehtml { - my ( $file, $release ) = @_; + my ($file, $release) = @_; my $string = ""; - return if !( $desc = $files->getfilehandle( $file, $release ) ); + return if !($desc = $files->getfilehandle($file, $release)); # undef $/; $string = <$desc>; @@ -322,31 +322,31 @@ close($desc); # if the README is 0 length then give up - if ( !$string ) { + if (!$string) { return; } # check if there's a short desc nested inside the long desc. If not, do # a non-greedy search for a long desc. assume there are no other stray # spans within the description. - if ( $string =~ -/<span class=["']?lxrlongdesc['"]?>(.*?<span class=["']?lxrshortdesc['"]?>.*?<\/span>.*?)<\/span>/is + if ($string =~ + /<span class=["']?lxrlongdesc['"]?>(.*?<span class=["']?lxrshortdesc['"]?>.*?<\/span>.*?)<\/span>/is ) { $long = $1; - if ( !( $long =~ /<span.*?\<span/is ) ) { - return ( $long . "<p>\nSEE ALSO: <a href=\"README.html\">README</a></p>\n" ); + if (!($long =~ /<span.*?\<span/is)) { + return ($long . "<p>\nSEE ALSO: <a href=\"README.html\">README</a></p>\n"); } - } elsif ( $string =~ /<span class=["']?lxrlongdesc['"]?>(.*?)<\/span>/is ) { + } elsif ($string =~ /<span class=["']?lxrlongdesc['"]?>(.*?)<\/span>/is) { $long = $1; - if ( !( $long =~ /\<span/is ) ) { - return ( $long . "<p>\nSEE ALSO: <a href=\"README.html\">README</a></p>\n" ); + if (!($long =~ /\<span/is)) { + return ($long . "<p>\nSEE ALSO: <a href=\"README.html\">README</a></p>\n"); } } } sub descreadme { - my ( $file, $release ) = @_; + my ($file, $release) = @_; 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, $release)); # undef $/; $string = <$desc>; @@ -368,7 +368,7 @@ close($desc); # if the README is 0 length then give up - if ( !$string ) { + if (!$string) { return; } @@ -396,8 +396,8 @@ # If the file is small there's not much use splitting it up. # Just print it all - if ( $count <= $maxlines ) { - $string = markupstring( $string, $Path->{'virt'} ); + if ($count <= $maxlines) { + $string = markupstring($string, $Path->{'virt'}); $string = convertwhitespace($string); return ($string); } else { @@ -407,7 +407,7 @@ # one paragraph. $n = 6; $temp = $string; - while ( ( $count > $chopto ) && ( $n-- > 1 ) ) { + while (($count > $chopto) && ($n-- > 1)) { $string =~ s/^((?:(?:[\S\t ]*?\n)+?[\t ]*\n){$n}?)(.*)/$1/s; $_ = $string; $string =~ s/\s*\n$//gs; @@ -417,7 +417,7 @@ # if we have too few lines then back up and grab another paragraph $_ = $string; $count = tr/\n//; - if ( $count < $minlines ) { + if ($count < $minlines) { $n = $n + 1; $temp =~ s/^((?:(?:[\S\t ]*?\n)+?[\t ]*\n){$n}?)(.*)/$1/s; $string = $temp; @@ -425,7 +425,7 @@ # if we have more than $maxlines then truncate to $chopto # and add an elipsis. - if ( $count > $maxlines ) { + if ($count > $maxlines) { $string =~ s/^((?:[\S \t]*\n){$chopto}?)(.*)/$1/s; chomp($string); $string = $string . "\n..."; @@ -434,13 +434,13 @@ # since not all of the README is displayed here, # add a link to it. chomp($string); - if ( $string =~ /SEE ALSO/ ) { + if ($string =~ /SEE ALSO/) { $string = $string . ", README"; } else { $string = $string . "\n\nSEE ALSO: README"; } - $string = markupstring( $string, $Path->{'virt'} ); + $string = markupstring($string, $Path->{'virt'}); $string = convertwhitespace($string); # strip blank lines at beginning and end of file again Index: diff =================================================================== RCS file: /cvsroot/lxr/lxr/diff,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- diff 19 Jul 2004 19:50:20 -0000 1.12 +++ diff 21 Jul 2004 20:44:30 -0000 1.13 @@ -32,17 +32,17 @@ use Local; sub htmlsub { - my ( $s, $l ) = @_; - my @s = split( /(<[^>]*>|&[\#\w\d]+;?)/, $s ); + my ($s, $l) = @_; + my @s = split(/(<[^>]*>|&[\#\w\d]+;?)/, $s); $s = ''; while (@s) { - my $f = substr( shift(@s), 0, $l ); + my $f = substr(shift(@s), 0, $l); $l -= length($f); $s .= $f; $f = shift(@s); - if ( $f =~ /^&/ ) { - if ( $l > 0 ) { + if ($f =~ /^&/) { + if ($l > 0) { $s .= $f; $l--; } @@ -55,12 +55,12 @@ } sub printdiff { - my ( $diffvar, $diffval ) = @_; + my ($diffvar, $diffval) = @_; unless ($diffvar) { my @vars; - foreach ( $config->allvariables ) { - push( @vars, $config->vardescription($_) ); + foreach ($config->allvariables) { + push(@vars, $config->vardescription($_)); } $vars[ $#vars - 1 ] .= " or " . pop(@vars) if $#vars > 0; @@ -69,34 +69,33 @@ "<p align=\"center\">\n", "Please indicate the version of the file you wish to\n", "compare to by clicking on the appropriate\n", - join( ", ", @vars ), - " button.\n", - "</p>\n" + join(", ", @vars), + " button.\n", "</p>\n" ); return; } - if ( $pathname =~ m|/$| ) { + if ($pathname =~ m|/$|) { print("<h3 align=\"center\">Diff not yet supported for directories.</h3>\n"); return; } my $origval = $config->variable($diffvar); my $origname = $pathname; - my $origtemp = $files->tmpfile( $origname, $release ); + my $origtemp = $files->tmpfile($origname, $release); - $config->variable( $diffvar, $diffval ); + $config->variable($diffvar, $diffval); my $diffname = $config->mappath($pathname); - my $difftemp = $files->tmpfile( $diffname, $config->variable('v') ); + my $difftemp = $files->tmpfile($diffname, $config->variable('v')); - $config->variable( $diffvar, $origval ); + $config->variable($diffvar, $origval); - unless ( defined($origtemp) ) { + unless (defined($origtemp)) { unlink($difftemp); print("*** $origname does not exist ***\n"); return; } - unless ( defined($difftemp) ) { + unless (defined($difftemp)) { unlink($origtemp); print("*** $diffname does not exist ***\n"); return; @@ -104,24 +103,24 @@ fflush; $ENV{'PATH'} = '/bin:/usr/local/bin:/usr/bin:/usr/sbin'; - unless ( open( DIFF, "-|" ) ) { - open( STDERR, ">&STDOUT" ); - exec( 'diff', '-U0', $origtemp, $difftemp ); + unless (open(DIFF, "-|")) { + open(STDERR, ">&STDOUT"); + exec('diff', '-U0', $origtemp, $difftemp); print "*** Diff subprocess died unexpextedly: $!\n"; exit; } - my ( $os, $ol, $ns, $nl, $ms, $ml, $bo, $ofs, $dir, %orig, %new, %chg ); + my ($os, $ol, $ns, $nl, $ms, $ml, $bo, $ofs, $dir, %orig, %new, %chg); while (<DIFF>) { - if ( ( $os, $ol, $ns, $nl ) = /@@ -(\d+)(?:,(\d+)|) \+(\d+)(?:,(\d+)|) @@/ ) { + if (($os, $ol, $ns, $nl) = /@@ -(\d+)(?:,(\d+)|) \+(\d+)(?:,(\d+)|) @@/) { $os++ if $ol eq '0'; $ns++ if $nl eq '0'; $ol = 1 unless defined($ol); $nl = 1 unless defined($nl); $bo = $os + $ofs; - if ( $ol < $nl ) { + if ($ol < $nl) { $ofs += $nl - $ol; $dir = '>>'; @@ -134,10 +133,10 @@ $ml = $nl; $new{ $ns + $nl } = $ms; } - foreach ( 0 .. $ml - 1 ) { + foreach (0 .. $ml - 1) { $chg{ $bo + $_ } = '!!'; } - foreach ( 0 .. $ms - 1 ) { + foreach (0 .. $ms - 1) { $chg{ $bo + $ml + $_ } = $dir; } @@ -164,20 +163,20 @@ my $origh = new FileHandle($origtemp); my $orig = ''; - markupfile( $origh, sub { $orig .= shift }, 1 ); + markupfile($origh, sub { $orig .= shift }, 1); my $len = $. + $ofs; $origh->close; - $config->variable( $diffvar, $diffval ); + $config->variable($diffvar, $diffval); $pathname = $diffname; my $diffh = new FileHandle($difftemp); my $new = ''; - markupfile( $diffh, sub { $new .= shift } ); + markupfile($diffh, sub { $new .= shift }); $diffh->close; - $config->variable( $diffvar, $origval ); + $config->variable($diffvar, $origval); $pathname = $origname; my $i; @@ -186,16 +185,16 @@ $i = 1; $new =~ s/^/"\n" x ($new{$i++})/mge; - my @orig = split( /\n/, $orig ); - my @new = split( /\n/, $new ); + my @orig = split(/\n/, $orig); + my @new = split(/\n/, $new); print("<pre class=\"file\">\n"); - foreach $i ( 0 .. $len ) { - my $o = htmlsub( $orig[$i], 50 ); + foreach $i (0 .. $len) { + my $o = htmlsub($orig[$i], 50); my $n = $new[$i]; my $diffmark = - $chg{ $i + 1 } ? ( "<span class=\"diff-mark\">" . $chg{ $i + 1 } . "</span>" ) : " "; + $chg{ $i + 1 } ? ("<span class=\"diff-mark\">" . $chg{ $i + 1 } . "</span>") : " "; #print("$o <span class=\"diff-mark\">", # ($chg{$i+1} || " "), "</span> $n\n"); @@ -203,13 +202,13 @@ } print("</pre>"); - unlink( $origtemp, $difftemp ); + unlink($origtemp, $difftemp); } httpinit; makeheader('diff'); -printdiff( $$HTTP{'param'}{'diffvar'}, $$HTTP{'param'}{'diffval'} ); +printdiff($$HTTP{'param'}{'diffvar'}, $$HTTP{'param'}{'diffval'}); makefooter('diff'); httpclean; Index: find =================================================================== RCS file: /cvsroot/lxr/lxr/find,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- find 19 Jul 2004 20:03:31 -0000 1.22 +++ find 21 Jul 2004 20:44:30 -0000 1.23 @@ -35,8 +35,8 @@ my $templ = shift; my $ret = ''; - foreach ( $config->allvariables ) { - if ( $config->variable($_) ne $config->vardefault($_) ) { + foreach ($config->allvariables) { + if ($config->variable($_) ne $config->vardefault($_)) { $ret .= expandtemplate( $templ, ( @@ -55,35 +55,34 @@ my $ret = ''; foreach (@results) { - $ret .= - expandtemplate( $templ, ( fileref => sub { fileref( "$_", "find-file", "/$_" ) } ) ); + $ret .= expandtemplate($templ, (fileref => sub { fileref("$_", "find-file", "/$_") })); } return $ret; } sub dofind { - my ( $searchtext, $FILELISTING, $advanced, $casesensitive ) = @_; + my ($searchtext, $FILELISTING, $advanced, $casesensitive) = @_; my @ret; - if ( $searchtext ne "" ) { + if ($searchtext ne "") { my $sourceroot = $config->sourceroot . '/' . $release . '/'; - while ( my $file = <$FILELISTING> ) { + while (my $file = <$FILELISTING>) { chomp $file; $file =~ s/^$sourceroot//; if ($advanced) { if ($casesensitive) { - if ( $file =~ /$searchtext/ ) { + if ($file =~ /$searchtext/) { push @ret, $file; } - } elsif ( $file =~ /$searchtext/i ) { + } elsif ($file =~ /$searchtext/i) { push @ret, $file; } } else { if ($casesensitive) { - if ( index( $file, $searchtext ) != -1 ) { + if (index($file, $searchtext) != -1) { push @ret, $file; } - } elsif ( index( lc($file), lc($searchtext) ) != -1 ) { + } elsif (index(lc($file), lc($searchtext)) != -1) { push @ret, $file; } } @@ -95,9 +94,9 @@ sub find { my $templ; - if ( $config->htmlfind ) { - unless ( open( TEMPL, $config->htmlfind ) ) { - warning( "Template " . $config->htmlfind . " does not exist." ); + if ($config->htmlfind) { + unless (open(TEMPL, $config->htmlfind)) { + warning("Template " . $config->htmlfind . " does not exist."); } else { local ($/) = undef; $templ = <TEMPL>; @@ -112,32 +111,32 @@ my $casesensitive = $HTTP->{'param'}->{'casesensitive'}; my $FILELISTING; - if ( $config->swishdir and $config->swishbin ) { - unless ( $FILELISTING = new IO::File( $config->swishdir . "/$release.filenames" ) ) { + if ($config->swishdir and $config->swishbin) { + unless ($FILELISTING = new IO::File($config->swishdir . "/$release.filenames")) { &warning( -"Version '$release' has not been indexed and is unavailable for searching<br>Could not open " + "Version '$release' has not been indexed and is unavailable for searching<br>Could not open " . $config->swishdir - . "/$release.filenames." ); + . "/$release.filenames."); return; } - } elsif ( $config->glimpsedir and $config->glimpsebin ) { - unless ( $FILELISTING = - new IO::File( $config->glimpsedir . "/" . $release . "/.glimpse_filenames" ) ) + } elsif ($config->glimpsedir and $config->glimpsebin) { + unless ($FILELISTING = + new IO::File($config->glimpsedir . "/" . $release . "/.glimpse_filenames")) { &warning( -"Version '$release' has not been indexed and is unavailable for searching<br>Could not open " + "Version '$release' has not been indexed and is unavailable for searching<br>Could not open " . $config->glimpsedir - . "/$release/.glimpse_filenames." ); + . "/$release/.glimpse_filenames."); return; } } else { warning( -"Freetext search engine required for file search, and no freetext search engine is configured" + "Freetext search engine required for file search, and no freetext search engine is configured" ); return; } - my @results = dofind( $searchtext, $FILELISTING, $advanced, $casesensitive ); + my @results = dofind($searchtext, $FILELISTING, $advanced, $casesensitive); close($FILELISTING); print expandtemplate( @@ -148,7 +147,7 @@ searchtext => sub { return $searchtext }, searchtext_escaped => sub { $_ = $searchtext; s/\"/"/g; return $_; }, casesensitivechecked => sub { return $casesensitive ? "checked" : "" }, - results => sub { printresults( @_, @results ) }, + results => sub { printresults(@_, @results) }, resultcount => sub { return scalar @results }, ) ); Index: genxref =================================================================== RCS file: /cvsroot/lxr/lxr/genxref,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- genxref 19 Jul 2004 20:03:31 -0000 1.35 +++ genxref 21 Jul 2004 20:44:30 -0000 1.36 @@ -29,9 +29,9 @@ use LXR::Common; my %option; -GetOptions( \%option, "help!", "url=s", "version=s", "allurls!", "allversions!", "reindexall!" ); +GetOptions(\%option, "help!", "url=s", "version=s", "allurls!", "allversions!", "reindexall!"); -if ( $option{'help'} ) { +if ($option{'help'}) { # this may not be the best way to implement this, but at least it's something print <<END_HELP; @@ -63,14 +63,14 @@ die("URL must be specified. Try \"genxref --help\".\n") unless $option{'url'}; -$config = new LXR::Config( $option{'url'} ); +$config = new LXR::Config($option{'url'}); die("No matching configuration") unless $config->sourceroot; -$files = new LXR::Files( $config->sourceroot ); +$files = new LXR::Files($config->sourceroot); die "Can't create file access object " . $config->sourceroot if !defined($files); -$index = new LXR::Index( $config->dbname, O_RDWR | O_CREAT ); +$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(); @@ -78,10 +78,10 @@ my @versions; -if ( $option{'allversions'} || !$option{'version'} ) { +if ($option{'allversions'} || !$option{'version'}) { @versions = $config->varrange('v'); die -"Option --allversions cannot be used because no versions found automatically. Use --version=VERSION or fix lxr.conf.\n" + "Option --allversions cannot be used because no versions found automatically. Use --version=VERSION or fix lxr.conf.\n" if scalar @versions <= 0; } else { @versions = $option{'version'}; @@ -90,49 +90,49 @@ foreach my $version (@versions) { $index->purge($version) if $option{'reindexall'}; gensearch($version); - genindex( '/', $version ); - genrefs( '/', $version ); + genindex('/', $version); + genrefs('/', $version); } sub genindex { - my ( $pathname, $release ) = @_; + my ($pathname, $release) = @_; - print( STDERR "*** $pathname $release \n" ); + print(STDERR "*** $pathname $release \n"); - if ( $pathname =~ m|/$| ) { - map { genindex( $pathname . $_, $release ) } $files->getdir( $pathname, $release ); + if ($pathname =~ m|/$|) { + map { genindex($pathname . $_, $release) } $files->getdir($pathname, $release); } else { - &LXR::Tagger::processfile( $pathname, $release, $config, $files, $index ) + &LXR::Tagger::processfile($pathname, $release, $config, $files, $index) unless exists $binaryfiles{$pathname}; } } sub genrefs { - my ( $pathname, $release ) = @_; + my ($pathname, $release) = @_; - print( STDERR "### $pathname $release \n" ); + print(STDERR "### $pathname $release \n"); - if ( $pathname =~ m|/$| ) { - map { genrefs( $pathname . $_, $release ) } $files->getdir( $pathname, $release ); + if ($pathname =~ m|/$|) { + map { genrefs($pathname . $_, $release) } $files->getdir($pathname, $release); } else { - &LXR::Tagger::processrefs( $pathname, $release, $config, $files, $index ) + &LXR::Tagger::processrefs($pathname, $release, $config, $files, $index) unless exists $binaryfiles{$pathname}; } } sub feedswish { - my ( $pathname, $release, $swish, $filelist ) = @_; + my ($pathname, $release, $swish, $filelist) = @_; - print( STDERR "&&& $pathname $release \n" ); + print(STDERR "&&& $pathname $release \n"); - if ( $pathname =~ m|/$| ) { - map { feedswish( $pathname . $_, $release, $swish, $filelist ) } - $files->getdir( $pathname, $release ); + if ($pathname =~ m|/$|) { + map { feedswish($pathname . $_, $release, $swish, $filelist) } + $files->getdir($pathname, $release); } else { print $filelist "$pathname\n"; - my $contents = $files->getfile( $pathname, $release ); - if ( $filetype->checktype_contents($contents) =~ m%(text|message)/% - and length($contents) > 0 ) + my $contents = $files->getfile($pathname, $release); + if ($filetype->checktype_contents($contents) =~ m%(text|message)/% + and length($contents) > 0) { $swish->print( "Path-Name: $pathname\n", @@ -150,7 +150,7 @@ my ($release) = @_; my $string; - if ( $config->glimpsedir and $config->glimpseindex ) { + if ($config->glimpsedir and $config->glimpseindex) { # Make sure the directory that the glimpse results go into # already exists as glimpse won't work if the directory does @@ -161,14 +161,14 @@ mkdir $string; system("chmod 755 $string"); my $glimpse = new IO::Handle; - my $pid = open( $glimpse, "|-" ); - if ( $pid == 0 ) { - exec( $config->glimpseindex, "-n", "-o", "-H", + 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, $$ ); + print(STDERR "Couldn't exec " . $config->glimpseindex . ": $!\n"); + kill(9, $$); } $glimpse->close(); @@ -177,7 +177,7 @@ system("chmod 644 $string"); } - if ( $config->swishdir and $config->swishbin ) { + 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" @@ -185,16 +185,16 @@ # execute swish, as a pipe we can write to - open( $swish, + open($swish, "| " . $config->swishbin . " -S prog -i stdin -v 1 -c swish-e.conf -f " . $config->swishdir . "/" . $release - . ".index" ) + . ".index") or die "Couldn't exec " . $config->swishbin . ": $!\n"; - feedswish( "/", $release, $swish, $filelist ); + feedswish("/", $release, $swish, $filelist); $swish->close(); $filelist->close(); Index: ident =================================================================== RCS file: /cvsroot/lxr/lxr/ident,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ident 19 Jul 2004 19:50:20 -0000 1.19 +++ ident 21 Jul 2004 20:44:30 -0000 1.20 @@ -36,8 +36,8 @@ sub varinputs { my $ret = ''; - foreach ( $config->allvariables ) { - if ( $config->variable($_) ne $config->vardefault($_) ) { + foreach ($config->allvariables) { + if ($config->variable($_) ne $config->vardefault($_)) { $ret .= "<input type=\"hidden\" name=\"$_\" value=\"" . $config->variable($_) . "\">\n"; } } @@ -48,17 +48,17 @@ my $templ = shift; my $ret = ''; - my @refs = $index->getindex( $identifier, $release ); + my @refs = $index->getindex($identifier, $release); my $file_hits = 0; my $last_file; my $def; foreach my $def (@refs) { - my ( $file, $line, $type, $rel ) = @$def; + my ($file, $line, $type, $rel) = @$def; $file_hits++ if $file ne $last_file; $last_file = $file; - $rel &&= "(member of " . idref( $rel, "search-member", $rel ) . ")"; + $rel &&= "(member of " . idref($rel, "search-member", $rel) . ")"; $ret .= expandtemplate( $templ, ( @@ -67,7 +67,7 @@ type => sub { $type }, rel => sub { $rel }, fileref => sub { - fileref( "$file, line $line", "search-decl", $file, $line ); + fileref("$file, line $line", "search-decl", $file, $line); } ) ); @@ -85,11 +85,11 @@ my $templ = shift; my $ret = ''; - my @uses = $index->getreference( $identifier, $release ); + my @uses = $index->getreference($identifier, $release); my $file_hits = 0; my $last_file; - foreach my $ref ( sort { $$a[0] cmp $$b[0] } @uses ) { - my ( $file, $line ) = @$ref; + foreach my $ref (sort { $$a[0] cmp $$b[0] } @uses) { + my ($file, $line) = @$ref; $file_hits++ if $file ne $last_file; $last_file = $file; $ret .= expandtemplate( @@ -98,7 +98,7 @@ file => sub { $file }, line => sub { $line }, fileref => sub { - fileref( "$file, line $line", "search-ref", $file, $line ); + fileref("$file, line $line", "search-ref", $file, $line); } ) ); @@ -109,12 +109,12 @@ sub printident { my $dir = shift; - my ( $templ, $templ_refs ); + my ($templ, $templ_refs); #$templ = "<ul>\n\$files{\n<li>\$iconlink \$namelink\n}</ul>\n"; - if ( $config->htmlident ) { - unless ( open( TEMPL, $config->htmlident ) ) { - warning( "Template " . $config->htmlident . " does not exist." ); + if ($config->htmlident) { + unless (open(TEMPL, $config->htmlident)) { + warning("Template " . $config->htmlident . " does not exist."); } else { local ($/) = undef; $templ = <TEMPL>; @@ -124,9 +124,9 @@ die "Ident template not configured"; } - if ( $config->htmlident_refs ) { - unless ( open( TEMPL, $config->htmlident_refs ) ) { - warning( "Template " . $config->htmlident_refs . " does not exist." ); + if ($config->htmlident_refs) { + unless (open(TEMPL, $config->htmlident_refs)) { + warning("Template " . $config->htmlident_refs . " does not exist."); } else { local ($/) = undef; $templ_refs = <TEMPL>; @@ -152,7 +152,7 @@ ) ); print $declare_hits; - print( expandtemplate( $templ_refs, ( uses => sub { usesexpand(@_) }, ) ) ); + print(expandtemplate($templ_refs, (uses => sub { usesexpand(@_) },))); print $reference_hits; } Index: search =================================================================== RCS file: /cvsroot/lxr/lxr/search,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- search 19 Jul 2004 20:03:31 -0000 1.23 +++ search 21 Jul 2004 20:44:30 -0000 1.24 @@ -37,8 +37,8 @@ my $templ = shift; my $ret = ''; - foreach ( $config->allvariables ) { - if ( $config->variable($_) ne $config->vardefault($_) ) { + foreach ($config->allvariables) { + if ($config->variable($_) ne $config->vardefault($_)) { $ret .= expandtemplate( $templ, ( @@ -55,11 +55,11 @@ my ($searchtext) = @_; $ENV{'PATH'} = '/bin:/usr/local/bin:/usr/bin:/usr/sbin'; - unless ( open( GLIMPSE, "-|" ) ) { - open( STDERR, ">&STDOUT" ); + unless (open(GLIMPSE, "-|")) { + open(STDERR, ">&STDOUT"); $! = ''; - exec( $config->glimpsebin, "-i", "-H" . $config->glimpsedir . "/" . $release, - '-y', '-n', $searchtext ); + exec($config->glimpsebin, "-i", "-H" . $config->glimpsedir . "/" . $release, + '-y', '-n', $searchtext); print("Glimpse subprocess died unexpextedly: $!\n"); exit; } @@ -68,8 +68,8 @@ my @glimpselines = (); while (<GLIMPSE>) { $numlines++; - push( @glimpselines, $_ ); - if ( $numlines > $maxhits ) { + push(@glimpselines, $_); + if ($numlines > $maxhits) { last; } } @@ -82,15 +82,15 @@ # inaccessible files. It seems this is not the case. # We will have to work around it for the time being. - if ( $retval == 0 ) { + if ($retval == 0) { my @ret; my $sourceroot = $config->sourceroot . '/' . $release . '/'; my $i = 0; foreach my $glimpseline (@glimpselines) { - last if ( $i > $maxhits ); + last if ($i > $maxhits); $glimpseline =~ s/$sourceroot//; - my ( $file, $line, $text ) = $glimpseline =~ /(.*?):\s*(\d+)\s*:(.*)/; + my ($file, $line, $text) = $glimpseline =~ /(.*?):\s*(\d+)\s*:(.*)/; $text =~ s/&/&/g; $text =~ s/</</g; $text =~ s/>/>/g; @@ -100,9 +100,9 @@ $i++; } return @ret; - } elsif ( $retval == 1 ) { + } elsif ($retval == 1) { my $glimpsebin = $config->glimpsebin; - my $glimpseresponse = join( "<br>", @glimpselines ); + my $glimpseresponse = join("<br>", @glimpselines); my $glimpseresponse =~ s/$glimpsebin/Reason/; my $glimpseresponse =~ s/glimpse: error in searching index//; print("<b>Search failed</b><br>\n$glimpseresponse"); @@ -116,20 +116,20 @@ sub swishsearch { my ($searchtext) = @_; - if ( !-e $config->swishdir . "/" . $release . ".index" ) { + if (!-e $config->swishdir . "/" . $release . ".index") { print -"<p align='center'><i>Version '$release' has not been indexed and is unavailable for searching.</i></p>"; + "<p align='center'><i>Version '$release' has not been indexed and is unavailable for searching.</i></p>"; return; } $ENV{'PATH'} = '/bin:/usr/local/bin:/usr/bin:/usr/sbin'; - unless ( open( SWISH, "-|" ) ) { - open( STDERR, ">&STDOUT" ); - exec( $config->swishbin, "-f", $config->swishdir . "/" . $release . ".index", - "-m", $maxhits, "-w", "'" . $searchtext . "'" ); + unless (open(SWISH, "-|")) { + open(STDERR, ">&STDOUT"); + exec($config->swishbin, "-f", $config->swishdir . "/" . $release . ".index", + "-m", $maxhits, "-w", "'" . $searchtext . "'"); - print( STDERR "Couldn't exec " . $config->swishbin . ": $!\n" ); - kill( 9, $$ ); + print(STDERR "Couldn't exec " . $config->swishbin . ": $!\n"); + kill(9, $$); } my @result = grep { not /^[\#\.]/ } <SWISH>; @@ -137,18 +137,17 @@ my $retval = $? >> 8; my @ret; - if ( $retval == 0 ) { + if ($retval == 0) { foreach my $hit (@result) { - if ( $hit =~ /^err:/ ) { - print $hit if $hit !~ /no results/; - next; - } - my ( $score, $file ) = $hit =~ /^(\d+) \/(.+) "(.+)" \d+/; + next if $hit =~ /^err:/; # skip; only 'no results' errors happen with return value 0 + my ($score, $file) = $hit =~ /^(\d+) \/(.+) "(.+)" \d+/; push @ret, [ $file, $score ]; } return @ret; } else { print("<b>Search failed</b><br>\n@result"); + print "<br><i>Tip: you may need to quote words that end with *</i>" + if join('', @result) =~ /Wildcard not allowed within a word/; return; } } @@ -163,7 +162,7 @@ # glimpse and swish-e provide different data for each result my (@params) = @$_; - if ( $config->glimpsebin ) { + if ($config->glimpsebin) { my $file = $params[0]; my $line = $params[1]; my $text = $params[2]; @@ -171,7 +170,7 @@ $templ, ( text => sub { return $text }, - fileref => sub { fileref( "$file, line $line", "find-file", "/$file", $line ) }, + fileref => sub { fileref("$file, line $line", "find-file", "/$file", $line) }, ) ); } else { @@ -181,7 +180,7 @@ $templ, ( score => sub { return $score }, - fileref => sub { fileref( "$file", "find-file", "/$file" ) }, + fileref => sub { fileref("$file", "find-file", "/$file") }, ) ); } @@ -192,9 +191,9 @@ sub search { my $templ; - if ( $config->htmlsearch ) { - unless ( open( TEMPL, $config->htmlsearch ) ) { - warning( "Template " . $config->htmlsearch . " does not exist." ); + if ($config->htmlsearch) { + unless (open(TEMPL, $config->htmlsearch)) { + warning("Template " . $config->htmlsearch . " does not exist."); } else { local ($/) = undef; $templ = <TEMPL>; @@ -207,10 +206,10 @@ my $searchtext = $HTTP->{'param'}->{'string'}; my @results; - if ( $searchtext ne "" ) { - if ( $config->glimpsebin ) { + if ($searchtext ne "") { + if ($config->glimpsebin) { @results = glimpsesearch($searchtext); - } elsif ( $config->swishbin and $config->swishdir ) { + } elsif ($config->swishbin and $config->swishdir) { @results = swishsearch($searchtext); } else { warning("No freetext search engine configured."); @@ -229,7 +228,7 @@ : ""; }, - results => sub { printresults( @_, @results ) }, + results => sub { printresults(@_, @results) }, resultcount => sub { return scalar @results }, ) ); Index: source =================================================================== RCS file: /cvsroot/lxr/lxr/source,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- source 19 Jul 2004 19:50:20 -0000 1.42 +++ source 21 Jul 2004 20:44:30 -0000 1.43 @@ -33,68 +33,68 @@ use Local; sub diricon { - my ( $templ, $node, $dir ) = @_; + my ($templ, $node, $dir) = @_; my $img; - if ( $node eq '../' ) { + if ($node eq '../') { $img = "/icons/back.gif"; } else { $img = "/icons/folder.gif"; } - return fileref( "<img align=\"bottom\" border=\"0\" src=\"$img\" alt=\"folder\">", "", - $dir . $node ); + return fileref("<img align=\"bottom\" border=\"0\" src=\"$img\" alt=\"folder\">", "", + $dir . $node); } sub dirname { - my ( $templ, $node, $dir ) = @_; + my ($templ, $node, $dir) = @_; - if ( $node eq '../' ) { - return fileref( "Parent directory", "dirfolder", $dir . $node ); + if ($node eq '../') { + return fileref("Parent directory", "dirfolder", $dir . $node); } else { - return fileref( $node, "dirfolder", $dir . $node ); + return fileref($node, "dirfolder", $dir . $node); } } sub fileicon { - my ( $templ, $node, $dir ) = @_; + my ($templ, $node, $dir) = @_; my $img; - if ( $node =~ /^.*\.[ch]$/ ) { + if ($node =~ /^.*\.[ch]$/) { $img = "/icons/c.gif"; - } elsif ( $node =~ /^.*\.(cpp|cc|java)$/ ) { + } elsif ($node =~ /^.*\.(cpp|cc|java)$/) { # TODO: Find a nice icon for c++ files (KDE?) $img = "/icons/c.gif"; - } elsif ( $node =~ /^.*\.(txt)$/ ) { + } elsif ($node =~ /^.*\.(txt)$/) { $img = "/icons/text.gif"; - } elsif ( $node =~ /^.*\.(jar|war|ear|zip|tar|gz|tgz|cab)$/ ) { + } elsif ($node =~ /^.*\.(jar|war|ear|zip|tar|gz|tgz|cab)$/) { $img = "/icons/compressed.gif"; - } elsif ( $node =~ /^.*\.(jpg|jpeg|gif|bmp|png)$/ ) { + } 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 ); + return fileref("<img align=\"bottom\" border=\"0\" src=\"$img\" alt=\"\">", "", $dir . $node); } sub filename { - my ( $templ, $node, $dir ) = @_; - return fileref( $node, "dirfile", $dir . $node ); + my ($templ, $node, $dir) = @_; + return fileref($node, "dirfile", $dir . $node); } sub filesize { - my ( $templ, $node, $dir ) = @_; + my ($templ, $node, $dir) = @_; - my $s = $files->getfilesize( $dir . $node, $release ); + my $s = $files->getfilesize($dir . $node, $release); my $str; - if ( $s < 1 << 10 ) { + if ($s < 1 << 10) { $str = "$s"; } else { # if ($s < 1<<20) { - $str = ( $s >> 10 ) . "k"; + $str = ($s >> 10) . "k"; # } else { # $str = ($s>>20) . "M"; @@ -111,72 +111,72 @@ } sub modtime { - my ( $templ, $node, $dir ) = @_; + my ($templ, $node, $dir) = @_; my $current_time = time; - my $file_time = $files->getfiletime( $dir . $node, $release ); + my $file_time = $files->getfiletime($dir . $node, $release); return '-' unless defined($file_time); my @t = gmtime($file_time); - my ( $sec, $min, $hour, $mday, $mon, $year ) = @t; + my ($sec, $min, $hour, $mday, $mon, $year) = @t; return - sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $year + 1900, $mon + 1, $mday, $hour, $min, $sec ); + sprintf("%04d-%02d-%02d %02d:%02d:%02d", $year + 1900, $mon + 1, $mday, $hour, $min, $sec); } sub bgcolor { - my ( $templ, $line ) = @_; - return ( ( ( $line - 1 ) / 3 ) % 2 ) ? "#FFFFFF" : "#EEEEEE"; + my ($templ, $line) = @_; + return ((($line - 1) / 3) % 2) ? "#FFFFFF" : "#EEEEEE"; } sub rowclass { - my ( $templ, $line ) = @_; - return ( ( ( $line - 1 ) / 3 ) % 2 ) ? "dirrow2" : "dirrow1"; + my ($templ, $line) = @_; + return ((($line - 1) / 3) % 2) ? "dirrow2" : "dirrow1"; } sub direxpand { - my ( $templ, $dir ) = @_; + my ($templ, $dir) = @_; my $direx = ''; my $line = 1; my %index; my @nodes; my $node; - @nodes = $files->getdir( $dir, $release ); + @nodes = $files->getdir($dir, $release); unless (@nodes) { print( "<p align=\"center\">\n<i>The directory " - . $files->toreal( $dir, $release ) - . " does not exist.</i>\n" ); + . $files->toreal($dir, $release) + . " does not exist.</i>\n"); print( -"\<p align=\"center\">\n<i>This directory might exist in other versions, try 'Show attic files' or select a different Version.</i>\n" + "\<p align=\"center\">\n<i>This directory might exist in other versions, try 'Show attic files' or select a different Version.</i>\n" ) if $files->isa("LXR::Files::CVS") and !$HTTP->{'param'}->{'showattic'}; #FIXME what does this do? - if ( $files->toreal( $dir, $release ) =~ m#(.+[^/])[/]*$# ) { - if ( -e $1 ) { - warning( "Unable to open " . $files->toreal( $dir, $release ) ); + if ($files->toreal($dir, $release) =~ m#(.+[^/])[/]*$#) { + if (-e $1) { + warning("Unable to open " . $files->toreal($dir, $release)); } } return; } - unshift( @nodes, '../' ) unless $dir eq '/'; + unshift(@nodes, '../') unless $dir eq '/'; #CSS checked _PH_ foreach $node (@nodes) { - if ( $node =~ /\/$/ ) { + if ($node =~ /\/$/) { $direx .= expandtemplate( $templ, ( - 'iconlink' => sub { diricon( @_, $node, $dir ) }, - 'namelink' => sub { dirname( @_, $node, $dir ) }, + 'iconlink' => sub { diricon(@_, $node, $dir) }, + 'namelink' => sub { dirname(@_, $node, $dir) }, 'filesize' => sub { '-' }, - 'modtime' => sub { modtime( @_, $node, $dir ) }, - 'bgcolor' => sub { bgcolor( @_, $line++ ) }, - 'css' => sub { rowclass( @_, $line++ ) }, - 'description' => sub { descexpand( @_, $node, $dir, $release ) } + 'modtime' => sub { modtime(@_, $node, $dir) }, + 'bgcolor' => sub { bgcolor(@_, $line++) }, + 'css' => sub { rowclass(@_, $line++) }, + 'description' => sub { descexpand(@_, $node, $dir, $release) } ) ); } else { @@ -184,17 +184,19 @@ $direx .= expandtemplate( $templ, ( - 'iconlink' => sub { fileicon( @_, $node, $dir ) }, - 'namelink' => sub { filename( @_, $node, $dir ) }, - 'filesize' => sub { filesize( @_, $node, $dir ) }, - 'modtime' => sub { modtime( @_, $node, $dir ) }, - 'bgcolor' => sub { bgcolor( @_, $line++ ) }, - 'css' => sub { rowclass( @_, $line++ ) }, + 'iconlink' => sub { fileicon(@_, $node, $dir) }, + 'namelink' => sub { filename(@_, $node, $dir) }, + 'filesize' => sub { filesize(@_, $node, $dir) }, + 'modtime' => sub { modtime(@_, $node, $dir) }, + 'bgcolor' => sub { bgcolor(@_, $line++) }, + 'css' => sub { rowclass(@_, $line++) }, 'description' => sub { - ( $files->toreal( $dir . $node, $release ) =~ m|/Attic/| + ( + $files->toreal($dir . $node, $release) =~ m|/Attic/| ? "<i>In Attic</i> " - : "" ) - . descexpand( @_, $node, $dir, $release ); + : "" + ) + . descexpand(@_, $node, $dir, $release); } ) ); @@ -209,9 +211,9 @@ my $templ; $templ = "<ul>\n\$files{\n<li>\$iconlink \$namelink\n}</ul>\n"; - if ( $config->htmldir ) { - unless ( open( TEMPL, $config->htmldir ) ) { - warning( "Template " . $config->htmldir . " does not exist." ); + if ($config->htmldir) { + unless (open(TEMPL, $config->htmldir)) { + warning("Template " . $config->htmldir . " does not exist."); } else { local ($/) = undef; $templ = <TEMPL>; @@ -220,23 +222,23 @@ } # print the description of the current directory - print dirdesc( $dir, $release ); + print dirdesc($dir, $release); # print the listing itself - print( expandtemplate( $templ, ( 'files' => sub { direxpand( @_, $dir ) } ) ) ); + print(expandtemplate($templ, ('files' => sub { direxpand(@_, $dir) }))); } sub printfile { my $raw = shift; - if ( $pathname =~ m|/$| ) { + if ($pathname =~ m|/$|) { printdir($pathname); } else { - my $fileh = $files->getfilehandle( $pathname, $release ); + my $fileh = $files->getfilehandle($pathname, $release); if ($fileh) { if ($raw) { - print( $fileh->getlines ); + print($fileh->getlines ); } # elsif ($node =~ /README$/) { @@ -245,7 +247,7 @@ # "</pre>"); # } else { - if ( $config->cvswebprefix ) { + if ($config->cvswebprefix) { my $revtarget = ""; $revtarget = "#rev$release" if lc($release) ne "head"; print "<a href='" @@ -255,19 +257,19 @@ . $revtarget . "'>View CVS Log</a>"; } - my @ann = $files->getannotations( $pathname, $release ); + my @ann = $files->getannotations($pathname, $release); if (@ann) { - my ( $a, $b ); + my ($a, $b); foreach $a (@ann) { - if ( $a eq $b ) { + if ($a eq $b) { $a = ' ' x 16; next; } $b = $a; - $a .= ' ' x ( 6 - length($a) ) . $files->getauthor( $pathname, $a ); - $a .= ' ' x ( 16 - length($a) ); + $a .= ' ' x (6 - length($a)) . $files->getauthor($pathname, $a); + $a .= ' ' x (16 - length($a)); } } @@ -278,19 +280,19 @@ print $l; }; &$outfun("<pre class=\"file\">\n"); - markupfile( $fileh, $outfun ); + markupfile($fileh, $outfun); &$outfun("</pre>\n"); } } else { print("\<p align=\"center\">\n<i>The file $pathname does not exist.</i>\n"); print( -"\<p align=\"center\">\n<i>This file might exist in other versions, try 'Show attic files' or select a different Version.</i>\n" + "\<p align=\"center\">\n<i>This file might exist in other versions, try 'Show attic files' or select a different Version.</i>\n" ) if $files->isa("LXR::Files::CVS") and !$HTTP->{'param'}->{'showattic'}; - if ( -f $files->toreal( $pathname, $release ) ) { - warning( "Unable to open " . $files->toreal( $pathname, $release ) ); + if (-f $files->toreal($pathname, $release)) { + warning("Unable to open " . $files->toreal($pathname, $release)); } } } @@ -298,7 +300,7 @@ httpinit; -if ( $config->filter && $pathname !~ $config->filter ) { +if ($config->filter && $pathname !~ $config->filter) { makeheader('source'); print("\<p align=\"center\">\n<i>The file $pathname does not exist.</i>\n"); makefooter('source'); @@ -306,10 +308,10 @@ } # If the file is html then simply pump it out. -if ( $pathname =~ /\.(html)$/ || $HTTP->{'param'}->{'raw'} ) { +if ($pathname =~ /\.(html)$/ || $HTTP->{'param'}->{'raw'}) { printfile(1); } else { - my $type = ( $pathname !~ m|/$| ? 'source' : 'sourcedir' ); + my $type = ($pathname !~ m|/$| ? 'source' : 'sourcedir'); makeheader($type); printfile(0); |