readjusting ranking...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@733 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
index f7bf0f8..5313304 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
@@ -193,9 +193,7 @@ sub search_class_fts {
        }
 
        my $rank_calc = ", sum($rank + CASE WHEN f.value ILIKE ? THEN 1 ELSE 0 END)/count(m.source)";
-       my $rank_order = "ORDER BY 2 DESC";
-       $rank_calc = ',sum(CASE WHEN f.value ILIKE ? THEN 1 ELSE 0 END)/count(f.id)' if ($self->api_name =~ /unordered/o);
-       $rank_order = '' if ($self->api_name =~ /unordered/o);
+       $rank_calc = ', 1' if ($self->api_name =~ /unordered/o);
 
        my $select = <<"        SQL";
                SELECT  m.metarecord $rank_calc $visible_count
@@ -218,7 +216,9 @@ sub search_class_fts {
        $log->debug("Field Search SQL :: [$select]",DEBUG);
 
        my $string = '%'.join('%',$fts->words).'%';
-       my $recs = $class->db_Main->selectall_arrayref($select, {}, lc($string));
+       my $recs = ($self->api_name =~ /unordered/o) ? 
+                       $class->db_Main->selectall_arrayref($select) :
+                       $class->db_Main->selectall_arrayref($select, {}, lc($string));
        
        $log->debug("Search yielded ".scalar(@$recs)." results.",DEBUG);