X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fsearch.cgi;h=00d039357b1ca561a37c16809d25e0ed6b84c7fb;hb=HEAD;hp=b1f5e09f84724a8b3e38377db960073d275b7ce9;hpb=f492418a6fe1653c67d9f26428da65f1b584cee6;p=debbugs.git
diff --git a/cgi/search.cgi b/cgi/search.cgi
index b1f5e09..00d0393 100755
--- a/cgi/search.cgi
+++ b/cgi/search.cgi
@@ -11,6 +11,29 @@ BEGIN{
}
}
+# if we're running out of git, we want to use the git base directory as the
+# first INC directory. If you're not running out of git, don't do that.
+use File::Basename qw(dirname);
+use Cwd qw(abs_path);
+our $debbugs_dir;
+BEGIN {
+ $debbugs_dir =
+ abs_path(dirname(abs_path(__FILE__)) . '/../');
+ # clear the taint; we'll assume that the absolute path to __FILE__ is the
+ # right path if there's a .git directory there
+ ($debbugs_dir) = $debbugs_dir =~ /([[:print:]]+)/;
+ if (defined $debbugs_dir and
+ -d $debbugs_dir . '/.git/') {
+ } else {
+ undef $debbugs_dir;
+ }
+ # if the first directory in @INC is not an absolute directory, assume that
+ # someone has overridden us via -I.
+ if ($INC[0] !~ /^\//) {
+ }
+}
+use if defined $debbugs_dir, lib => $debbugs_dir.'/lib/';
+
use CGI::Simple;
@@ -198,11 +221,11 @@ for my $attribute (@{$cgi_var{attribute}}) {
}
print qq(\n);
$$attribute{value}='' if not defined $$attribute{value};
- print qq( \n);
+ print qq( \n);
$attr_num++;
}
-print qq( );
+print qq( );
# order
@@ -269,9 +292,9 @@ if (defined $nres) {
my $showseverity;
$showseverity = "Severity: $attr{severity};\n";
print <#${bugnum}: $attr{'@title'} @{[htmlize_packagelinks($attr{package})]}
-$showseverity
-Sent by: @{[encode_entities($attr{'@author'})]} at $attr{'@cdate'}
+
#${bugnum}: $attr{'@title'} @{[htmlize_packagelinks($attr{package})]}
+$showseverity
+Sent by: @{[encode_entities($attr{'@author'})]} at $attr{'@cdate'}
END
# Deal with the snippet
# make the things that match bits of the phrase bold, the rest normal.