[interchange-cvs] interchange - jon modified lib/Vend/Scan.pm
interchange-core@interchange.redhat.com
interchange-core@interchange.redhat.com
Wed Nov 21 13:22:01 2001
User: jon
Date: 2001-11-21 18:21:34 GMT
Modified: lib/Vend Scan.pm
Log:
Clean up logic on NoSearch logging.
Revision Changes Path
2.3 +5 -9 interchange/lib/Vend/Scan.pm
rev 2.3, prev_rev 2.2
Index: Scan.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Scan.pm,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -u -r2.2 -r2.3
--- Scan.pm 2001/11/20 04:20:53 2.2
+++ Scan.pm 2001/11/21 18:21:34 2.3
@@ -1,6 +1,6 @@
# Vend::Scan - Prepare searches for Interchange
#
-# $Id: Scan.pm,v 2.2 2001/11/20 04:20:53 mheins Exp $
+# $Id: Scan.pm,v 2.3 2001/11/21 18:21:34 jon Exp $
#
# Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
#
@@ -29,7 +29,7 @@
perform_search
);
-$VERSION = substr(q$Revision: 2.2 $, 10);
+$VERSION = substr(q$Revision: 2.3 $, 10);
use strict;
use Vend::Util;
@@ -896,13 +896,9 @@
$_ = $Vend::Cfg->{Database}{$_}{file}
if defined $Vend::Cfg->{Database}{$_};
}
- if ($ok and $Vend::Cfg->{NoSearch}) {
- if (/$Vend::Cfg->{NoSearch}/) {
- ::logError("Search of '%s' denied by NoSearch directive", $_);
- $ok = 0;
- } else {
- $ok = 1;
- }
+ if ($ok and $Vend::Cfg->{NoSearch} and /$Vend::Cfg->{NoSearch}/) {
+ ::logError("Search of '%s' denied by NoSearch directive", $_);
+ $ok = 0;
}
push @$passed, $_ if $ok;
}