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

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2006-06-23 12:20:47 GMT
Modified:  lib/Vend Swish2.pm
Log:
apply mv_base_directory change from Swish.pm
ensure that mv_base_directory value is used

Revision  Changes    Path
1.2       +4 -4      interchange/lib/Vend/Swish2.pm


rev 1.2, prev_rev 1.1
Index: Swish2.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Swish2.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Swish2.pm	23 Jun 2006 10:26:02 -0000	1.1
+++ Swish2.pm	23 Jun 2006 12:20:46 -0000	1.2
@@ -1,6 +1,6 @@
 # Vend::Swish2 - Search indexes with Swish-e's new SWISH::API
 #
-# $Id: Swish2.pm,v 1.1 2006/06/23 10:26:02 racke Exp $
+# $Id: Swish2.pm,v 1.2 2006/06/23 12:20:46 racke Exp $
 #
 # Adapted from Vend::Swish by Brian Miller <brian at endpoint.com>
 #
@@ -26,7 +26,7 @@
 require Vend::Search;
 @ISA = qw(Vend::Search);
 
-$VERSION = substr(q$Revision: 1.1 $, 10);
+$VERSION = substr(q$Revision: 1.2 $, 10);
 use strict;
 
 use lib qw( /usr/local/lib/swish-e/perl );
@@ -93,7 +93,7 @@
 
     @{$s}{keys %Default} = (values %Default);
 
-    $s->{mv_base_directory}     =  undef,
+    $s->{mv_base_directory}     = $Vend::Cfg->{VendRoot},
     $s->{mv_begin_string}       = [];
     $s->{mv_all_chars}          = [1];
     $s->{mv_case}               = [];
@@ -124,7 +124,7 @@
         $_ = Vend::Util::catfile($s->{mv_base_directory}, $_)
             unless Vend::Util::file_name_is_absolute($_);
     }
-    my $from_index = join ' ', @{ $s->{'mv_search_file'} };
+    my $from_index = join ' ', @searchfiles;
     $s->{'swish_index'} = $from_index;
 
     unless ($_swish->{$from_index}) {