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

Author: ijabz
Date: 2013-10-03 19:08:13 +0000 (Thu, 03 Oct 2013)
New Revision: 13723

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/AreaIndex.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AreaIndexTest.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindAreaTest.java
Log:
SEARCH-322:Added searching * outputting disambugation comment for areas

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/AreaIndex.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/AreaIndex.java	2013-10-03 18:10:07 UTC (rev 13722)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/AreaIndex.java	2013-10-03 19:08:13 UTC (rev 13723)
@@ -258,11 +258,10 @@
 
         String comment = rs.getString("comment");
         doc.addFieldOrNoValue(AreaIndexField.COMMENT, comment);
-        /* TODO waiting on schema
         if (!Strings.isNullOrEmpty(comment)) {
             area.setDisambiguation(comment);
         }
-        */
+
         String type = rs.getString("type");
         doc.addFieldOrUnknown(AreaIndexField.TYPE, type);
         if (!Strings.isNullOrEmpty(type)) {

Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AreaIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AreaIndexTest.java	2013-10-03 18:10:07 UTC (rev 13722)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/AreaIndexTest.java	2013-10-03 19:08:13 UTC (rev 13723)
@@ -243,9 +243,7 @@
             assertEquals("aa95182f-df0a-3ad6-8bfb-4b63482cd276", area.getId());
             assertEquals("Afghanistan", area.getName());
             assertEquals("Afghanistan", area.getSortName());
-            /* TODO
-            assertEquals("A Country in Asia", area.getDisambuguation())
-             */
+            assertEquals("A Country in Asia", area.getDisambiguation());
             assertEquals("Country", area.getType());
             assertNotNull(area.getAliasList());
             assertEquals(1,area.getAliasList().getAlias().size());

Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindAreaTest.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindAreaTest.java	2013-10-03 18:10:07 UTC (rev 13722)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindAreaTest.java	2013-10-03 19:08:13 UTC (rev 13723)
@@ -53,6 +53,8 @@
             doc.addField(AreaIndexField.SORTNAME, "Afghanistan");
             area.setSortName("Afghanistan");
 
+            doc.addField(AreaIndexField.COMMENT, "A comment");
+            area.setDisambiguation("A comment");
 
             doc.addField(AreaIndexField.ALIAS, "Afghany");
             AliasList aliasList = of.createAliasList();
@@ -132,6 +134,16 @@
     }
 
     @Test
+    public void testFindAreaByComment() throws Exception {
+        Results res = ss.search("comment:\"a comment\"", 0, 10);
+        assertEquals(1, res.getTotalHits());
+        Result result = res.results.get(0);
+        MbDocument doc = result.getDoc();
+        assertEquals("ff571ff4-04cb-4b9c-8a1c-354c330f863c", doc.get(AreaIndexField.AREA_ID));
+        assertEquals("Afghanistan", doc.get(AreaIndexField.AREA));
+    }
+
+    @Test
     public void testFindAreaByName() throws Exception {
         Results res = ss.search("area:\"Afghanistan\"", 0, 10);
         assertEquals(1, res.getTotalHits());
@@ -324,8 +336,8 @@
         assertTrue(output.contains("<iso-3166-1-code-list><iso-3166-1-code>AF</iso-3166-1-code>"));
         assertTrue(output.contains("<iso-3166-2-code-list><iso-3166-2-code>North</iso-3166-2-code>"));
         assertTrue(output.contains("<iso-3166-3-code-list><iso-3166-3-code>Kabu</iso-3166-3-code>"));
+        assertTrue(output.contains("<disambiguation>A comment</disambiguation"));
 
-
     }
 
     @Test
@@ -369,6 +381,7 @@
         assertTrue(output.contains("\"iso-3166-1-code-list\":{\"iso-3166-1-code\":[\"AF\"]}"));
         assertTrue(output.contains("\"iso-3166-2-code-list\":{\"iso-3166-2-code\":[\"North\"]}"));
         assertTrue(output.contains("\"iso-3166-3-code-list\":{\"iso-3166-3-code\":[\"Kabu\"]}"));
+        assertTrue(output.contains("\"disambiguation\":\"A comment\","));
 
     }
 
@@ -399,6 +412,7 @@
         assertTrue(output.contains("\"iso-3166-1-codes\":[\"AF\"]"));
         assertTrue(output.contains("\"iso-3166-2-codes\":[\"North\"]"));
         assertTrue(output.contains("\"iso-3166-3-codes\":[\"Kabu\"]"));
+        assertTrue(output.contains("\"disambiguation\":\"A comment\","));
     }
 
     /**