[interchange-cvs] interchange - racke modified lib/Vend/Swish.pm

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Mon Apr 10 16:27:38 EDT 2006


User:      racke
Date:      2006-04-10 20:27:37 GMT
Modified:  lib/Vend Swish.pm
Log:
mitigate ambigious usage of mv_base_directory
not consistent for specifying configuration file

Revision  Changes    Path
1.8       +5 -5      interchange/lib/Vend/Swish.pm


rev 1.8, prev_rev 1.7
Index: Swish.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Swish.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Swish.pm	7 Apr 2006 13:53:23 -0000	1.7
+++ Swish.pm	10 Apr 2006 20:27:37 -0000	1.8
@@ -1,6 +1,6 @@
 # Vend::Swish - Search indexes with Swish-e
 #
-# $Id: Swish.pm,v 1.7 2006/04/07 13:53:23 racke Exp $
+# $Id: Swish.pm,v 1.8 2006/04/10 20:27:37 racke Exp $
 #
 # Adapted from Vend::Glimpse
 #
@@ -26,7 +26,7 @@
 require Vend::Search;
 @ISA = qw(Vend::Search);
 
-$VERSION = substr(q$Revision: 1.7 $, 10);
+$VERSION = substr(q$Revision: 1.8 $, 10);
 use strict;
 
 sub array {
@@ -66,7 +66,7 @@
 #::logDebug("initting Swish search, Swish=" . Vend::Util::uneval($Vend::Cfg->{Swish}));
 	$Vend::Cfg->{Swish} ||= {};
 	@{$s}{keys %Default} = (values %Default);
-	$s->{mv_base_directory}     = $Vend::Cfg->{Swish}{configfile} || undef,
+	$s->{mv_base_directory}     = undef,
 	$s->{mv_begin_string}       = [];
 	$s->{mv_all_chars}	        = [1];
 	$s->{mv_case}               = [];
@@ -169,8 +169,8 @@
 	push @cmd, "-c $s->{mv_base_directory}"
 			if $s->{mv_base_directory};
 
-	if(@{$s->{mv_search_file} || []} ) {
-		push @cmd, "-f " . join(" ", @{$s->{mv_search_file}} );
+	if (@searchfiles) {
+		push @cmd, "-f " . join(" ", @searchfiles);
 	}
 	
 	push @cmd, "-m $s->{mv_max_matches}" if $s->{mv_max_matches};








More information about the interchange-cvs mailing list