Thread: [Lxr-commits] CVS: lxr/lib/LXR Common.pm,1.49,1.50
Brought to you by:
ajlittoz
From: Dave B. <bro...@us...> - 2004-07-26 20:47:52
|
Update of /cvsroot/lxr/lxr/lib/LXR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28509/lib/LXR Modified Files: Common.pm Log Message: combine file name search and freetext search Index: Common.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Common.pm,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- Common.pm 21 Jul 2004 20:44:30 -0000 1.49 +++ Common.pm 26 Jul 2004 20:47:43 -0000 1.50 @@ -599,13 +599,10 @@ return $config->sourcerootname . $pathname; } elsif ($who eq 'ident') { my $i = $HTTP->{'param'}->{'i'}; - return $config->sourcerootname . ' identfier search' . ($i ? ": $i" : ''); + return $config->sourcerootname . ' identifier search' . ($i ? ": $i" : ''); } elsif ($who eq 'search') { my $s = $HTTP->{'param'}->{'string'}; - return $config->sourcerootname . ' freetext search' . ($s ? ": $s" : ''); - } elsif ($who eq 'find') { - my $s = $HTTP->{'param'}->{'string'}; - return $config->sourcerootname . ' file search' . ($s ? ": $s" : ''); + return $config->sourcerootname . ' general search' . ($s ? ": $s" : ''); } } @@ -661,23 +658,13 @@ } if ($who eq 'search') { - push(@mlist, "<span class='modes-sel'>freetext search</span>"); + push(@mlist, "<span class='modes-sel'>general search</span>"); } else { push(@mlist, "<a class=\"modes\" " . "href=\"$config->{virtroot}/search" . urlargs - . "\">freetext search</a>"); - } - - if ($who eq 'find') { - push(@mlist, "<span class='modes-sel'>file search</span>"); - } else { - push(@mlist, - "<a class='modes' " - . "href=\"$config->{virtroot}/find" - . urlargs - . "\">file search</a>"); + . "\">general search</a>"); } foreach $mode (@mlist) { @@ -714,11 +701,6 @@ "<a class=\"varlink\" href=\"$config->{virtroot}/search" . &urlargs("$var=$val", "string=" . $HTTP->{'param'}->{'string'}) . "\">$val</a>"; - } elsif ($who eq 'find') { - $vallink = - "<a class=\"varlink\" href=\"$config->{virtroot}/find" - . &urlargs("$var=$val", "string=" . $HTTP->{'param'}->{'string'}) - . "\">$val</a>"; } } |