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

Author: ijabz
Date: 2013-10-02 10:50:39 +0000 (Wed, 02 Oct 2013)
New Revision: 13712

Modified:
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/PlaceSearch.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindPlaceTest.java
Log:
Added address as search field for Places dismax search

Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/PlaceSearch.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/PlaceSearch.java	2013-10-02 10:49:37 UTC (rev 13711)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/PlaceSearch.java	2013-10-02 10:50:39 UTC (rev 13712)
@@ -19,6 +19,7 @@
     defaultFields = new ArrayList<String>();
     defaultFields.add(PlaceIndexField.PLACE.getName());
     defaultFields.add(PlaceIndexField.ALIAS.getName());
+    defaultFields.add(PlaceIndexField.ADDRESS.getName());
   }
 
   public PlaceSearch() throws Exception {

Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindPlaceTest.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindPlaceTest.java	2013-10-02 10:49:37 UTC (rev 13711)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindPlaceTest.java	2013-10-02 10:50:39 UTC (rev 13712)
@@ -214,6 +214,8 @@
         assertEquals("Afghanistan", doc.get(PlaceIndexField.PLACE));
     }
 
+
+
     @Test
     public void testFindPlaceByDismax2() throws Exception {
         Results res = sd.search("afghany", 0, 10);
@@ -225,6 +227,16 @@
     }
 
     @Test
+    public void testFindPlaceByDismax3() throws Exception {
+        Results res = sd.search("new", 0, 10);
+        assertEquals(1, res.getTotalHits());
+        Result result = res.results.get(0);
+        MbDocument doc = result.getDoc();
+        assertEquals("ff571ff4-04cb-4b9c-8a1c-354c330f863c", doc.get(PlaceIndexField.PLACE_ID));
+        assertEquals("Afghanistan", doc.get(PlaceIndexField.PLACE));
+    }
+
+    @Test
     public void testFindPlaceByLat() throws Exception {
         Results res = ss.search("lat:\\-180", 0, 10);
         assertEquals(1, res.getTotalHits());