[interchange-cvs] interchange - jon modified lib/Vend/Scan.pm

interchange-core@interchange.redhat.com interchange-core@interchange.redhat.com
Mon Oct 29 18:32:00 2001


User:      jon
Date:      2001-10-29 23:31:58 GMT
Modified:  lib/Vend Scan.pm
Log:
Log message if search is denied because of NoSearch directive.

Revision  Changes    Path
2.1       +10 -4     interchange/lib/Vend/Scan.pm


rev 2.1, prev_rev 2.0
Index: Scan.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Scan.pm,v
retrieving revision 2.0
retrieving revision 2.1
diff -u -u -r2.0 -r2.1
--- Scan.pm	2001/07/18 02:23:14	2.0
+++ Scan.pm	2001/10/29 23:31:57	2.1
@@ -1,6 +1,6 @@
 # Vend::Scan - Prepare searches for Interchange
 #
-# $Id: Scan.pm,v 2.0 2001/07/18 02:23:14 jon Exp $
+# $Id: Scan.pm,v 2.1 2001/10/29 23:31:57 jon Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -29,7 +29,7 @@
 			perform_search
 			);
 
-$VERSION = substr(q$Revision: 2.0 $, 10);
+$VERSION = substr(q$Revision: 2.1 $, 10);
 
 use strict;
 use Vend::Util;
@@ -896,8 +896,14 @@
 			$_ = $Vend::Cfg->{Database}{$_}{'file'}
 				if defined $Vend::Cfg->{Database}{$_}{'file'};
 		}
-		$ok &&= $_ !~ /$Vend::Cfg->{NoSearch}/
-			if $Vend::Cfg->{NoSearch};
+		if ($ok and $Vend::Cfg->{NoSearch}) {
+			if (/$Vend::Cfg->{NoSearch}/) {
+				::logError("Search of '%s' denied by NoSearch directive", $_);
+				$ok = 0;
+			} else {
+				$ok = 1;
+			}
+		}
 		push @$passed, $_ if $ok;
 	}
 	return $passed if @$passed;