Merge lp:~felmas/mvhub/expand_synonyms into lp:mvhub

[Ferhat Elmas]

 Broken expand_synonyms method is fixed and one unit test is added for this method but since there is no data loaded for synonyms table (will be by the lp:~felmas/mvhub/structure_fix), I have used MV_CONFIG_FILE to tests pass.

=== modified file 'lib-mvhub/lib/MVHub/GuideSearch.pm'
--- lib-mvhub/lib/MVHub/GuideSearch.pm	2010-09-17 16:54:29 +0000
+++ lib-mvhub/lib/MVHub/GuideSearch.pm	2011-08-06 20:38:28 +0000
@@ -1,15 +1,14 @@
 
 package MVHub::GuideSearch;
 
-our ($VERSION) = '$Revision: 1552 $' =~ /([.\d]+)/;
-
 use strict;
 use warnings;
 
 use DBI;
+
+use MVHub::Common;
 use MVHub::Utils;
 use MVHub::Utils::DB;
-use MVHub::Common;
 
 sub agency_search {
     my $dbh    = shift;
@@ -250,15 +249,14 @@
     my $dbh               = shift;
     my $phrase_words_aref = shift;
 
-    my $word_list = '';
-    foreach (@$phrase_words_aref) { $word_list .= $dbh->quote($_) . ',' }
-    chop $word_list;
-
     my $sql = MVHub::Utils::DB::get_sql_select_statement(
         'SYNONYM_STEM_X_WORD_STEM');
 
-    my @synonyms = @{ $dbh->selectcol_arrayref( $sql, undef, $word_list ) };
+    $sql =~ s/\?/%s/;
+    $sql = sprintf( $sql, join ",", ('?') x @$phrase_words_aref );
 
+    my @synonyms
+        = @{ $dbh->selectcol_arrayref( $sql, undef, @$phrase_words_aref ) };
     @$phrase_words_aref
         = Set::Array->new( @synonyms, @$phrase_words_aref )->unique();
 

=== added directory 'lib-mvhub/t/GuideSearch'
=== added file 'lib-mvhub/t/GuideSearch/expand_synonyms.t'
--- lib-mvhub/t/GuideSearch/expand_synonyms.t	1970-01-01 00:00:00 +0000
+++ lib-mvhub/t/GuideSearch/expand_synonyms.t	2011-08-06 20:38:28 +0000
@@ -0,0 +1,23 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::Deep;
+use Test::More tests => 5;
+
+my @subs = qw ( expand_synonyms );
+
+use_ok( 'MVHub::GuideSearch', qw( expand_synonyms ) );
+can_ok( 'MVHub::GuideSearch', 'expand_synonyms' );
+
+use ok( 'MVHub::Utils::DB', qw( get_dbh ) );
+can_ok( 'MVHub::Utils::DB', 'get_dbh' );
+
+my $dbh    = MVHub::Utils::DB::get_dbh( $ENV{MV_CONFIG_FILE} );
+my @phrase = qw / search the kid /;
+my @result = qw / search the kid youth children child /;
+
+MVHub::GuideSearch::expand_synonyms( $dbh, \@phrase );
+
+cmp_deeply( \@phrase, bag(@result), 'phrase is correctly expanded' );