[interchange-cvs] interchange - jon modified lib/Vend/Scan.pm
interchange-core@interchange.redhat.com
interchange-core@interchange.redhat.com
Wed Nov 21 13:25:01 2001
User: jon
Date: 2001-11-21 18:24:00 GMT
Modified: lib/Vend Tag: STABLE_4_8-branch Scan.pm
Log:
Merge from 4.9 the error logging when search is rejected because of
NoSearch directive.
Revision Changes Path
No revision
No revision
2.0.2.2 +6 -4 interchange/lib/Vend/Scan.pm
rev 2.0.2.2, prev_rev 2.0.2.1
Index: Scan.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Scan.pm,v
retrieving revision 2.0.2.1
retrieving revision 2.0.2.2
diff -u -u -r2.0.2.1 -r2.0.2.2
--- Scan.pm 2001/11/17 02:22:55 2.0.2.1
+++ Scan.pm 2001/11/21 18:24:00 2.0.2.2
@@ -1,6 +1,6 @@
# Vend::Scan - Prepare searches for Interchange
#
-# $Id: Scan.pm,v 2.0.2.1 2001/11/17 02:22:55 mheins Exp $
+# $Id: Scan.pm,v 2.0.2.2 2001/11/21 18:24:00 jon Exp $
#
# Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
#
@@ -29,7 +29,7 @@
perform_search
);
-$VERSION = substr(q$Revision: 2.0.2.1 $, 10);
+$VERSION = substr(q$Revision: 2.0.2.2 $, 10);
use strict;
use Vend::Util;
@@ -896,8 +896,10 @@
$_ = $Vend::Cfg->{Database}{$_}{'file'}
if defined $Vend::Cfg->{Database}{$_};
}
- $ok &&= $_ !~ /$Vend::Cfg->{NoSearch}/
- if $Vend::Cfg->{NoSearch};
+ if ($ok and $Vend::Cfg->{NoSearch} and /$Vend::Cfg->{NoSearch}/) {
+ ::logError("Search of '%s' denied by NoSearch directive", $_);
+ $ok = 0;
+ }
push @$passed, $_ if $ok;
}
return $passed if @$passed;