[mb-commits] r13623 - in search_server/trunk/index/src: main/java/org/musicbrainz/search/index test/java/org/musicbrainz/search/analysis

Author: ijabz
Date: 2013-02-26 09:01:07 +0000 (Tue, 26 Feb 2013)
New Revision: 13623

Added:
   search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/ArtistBoostTest.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/LabelBoostTest.java
Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistBoostDoc.java
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/LabelBoostDoc.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/CompareNormalizationFiltersTest.java
Log:
#SEARCH-243:Fixed Doc boosting and Tokenizer tests

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistBoostDoc.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistBoostDoc.java	2013-02-26 08:21:30 UTC (rev 13622)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistBoostDoc.java	2013-02-26 09:01:07 UTC (rev 13623)
@@ -29,6 +29,8 @@
 
 package org.musicbrainz.search.index;
 
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
 import org.apache.lucene.index.IndexableField;
 import org.musicbrainz.search.MbDocument;
 
@@ -65,12 +67,17 @@
     }
 
     public static void boost(String artistGuid, MbDocument doc) {
+
+        boost(artistGuid,doc.getLuceneDocument());
+    }
+
+    public static void boost(String artistGuid, Document doc) {
         if(artistGuIdSet.contains(artistGuid)) {
-            for(IndexableField field:doc.getLuceneDocument().getFields())
+            for(IndexableField indexablefield:doc.getFields())
             {
-                //TODO FIXME Doc Boost: field.boost()
+                Field field = (Field)indexablefield;
+                field.setBoost(ARTIST_DOC_BOOST);
             }
         }
     }
-
 }

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/LabelBoostDoc.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/LabelBoostDoc.java	2013-02-26 08:21:30 UTC (rev 13622)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/LabelBoostDoc.java	2013-02-26 09:01:07 UTC (rev 13623)
@@ -29,6 +29,8 @@
 
 package org.musicbrainz.search.index;
 
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
 import org.apache.lucene.index.IndexableField;
 import org.musicbrainz.search.MbDocument;
 
@@ -55,11 +57,18 @@
         labelGuIdSet.add("f9ada3ae-3081-44df-8581-ca27a3462b68"); //Sony BMG Music Entertainment
     }
 
+
     public static void boost(String labelGuid, MbDocument doc) {
+
+        boost(labelGuid,doc.getLuceneDocument());
+    }
+
+    public static void boost(String labelGuid, Document doc) {
         if(labelGuIdSet.contains(labelGuid)) {
-            for(IndexableField field:doc.getLuceneDocument().getFields())
+            for(IndexableField indexablefield:doc.getFields())
             {
-                //TODO FIXME Doc Boost: field.boost()
+                Field field = (Field)indexablefield;
+                field.setBoost(DOC_BOOST);
             }
         }
     }

Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/CompareNormalizationFiltersTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/CompareNormalizationFiltersTest.java	2013-02-26 08:21:30 UTC (rev 13622)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/analysis/CompareNormalizationFiltersTest.java	2013-02-26 09:01:07 UTC (rev 13623)
@@ -19,7 +19,6 @@
 public class CompareNormalizationFiltersTest {
 
     //FIXME Broken in 4.1
-    /*
     @Test
     public void testTokenization() throws IOException
     {
@@ -35,16 +34,12 @@
         }
         System.out.println(sb.toString());
         Tokenizer tokenizer = new WhitespaceTokenizer(LuceneVersion.LUCENE_VERSION,new StringReader(sb.toString()));
+        tokenizer.reset();
         while(tokenizer.incrementToken())
         {
-            System.out.println("inctoken");
-
         }
     }
-    */
 
-    //FIXME Broken in 4.1
-    /*
     @Test
     public void testFilters() throws IOException
     {
@@ -89,9 +84,14 @@
         CharTermAttribute term3 = result3.addAttribute(CharTermAttribute.class);
         CharTermAttribute term4 = result4.addAttribute(CharTermAttribute.class);
 
+        tokenizer0.reset();
+        result1.reset();
+        result2.reset();
+        result3.reset();
+        result4.reset();
+
         while(tokenizer0.incrementToken())
         {
-            System.out.println("inctoken");
             result1.incrementToken();
             result2.incrementToken();
             result3.incrementToken();
@@ -135,7 +135,6 @@
         System.out.println("ICU         Filter changed "+ changedByNFKC   + " chars");
         System.out.println("ASCIIICU    Filter changed "+ changedByASCIIAndNFKC   + " chars");
     }
-    */
 
     private void printAsHexAndValue(String term)
     {