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

Author: ijabz
Date: 2013-05-09 15:25:01 +0000 (Thu, 09 May 2013)
New Revision: 13683

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java
Log:
Fixed primaryType and status fields in release output

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java	2013-05-09 15:05:11 UTC (rev 13682)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ReleaseIndex.java	2013-05-09 15:25:01 UTC (rev 13683)
@@ -419,7 +419,7 @@
         ReleaseGroup rg = of.createReleaseGroup();
         release.setReleaseGroup(rg);
         if (primaryType!=null && !primaryType.isEmpty()){
-            release.getReleaseGroup().setType(primaryType);
+            release.getReleaseGroup().setPrimaryType(primaryType);
         }
 
         if (secondaryTypes.containsKey(id)) {
@@ -444,7 +444,7 @@
         String status = rs.getString("status");
         doc.addFieldOrUnknown(ReleaseIndexField.STATUS, status);
         if (status!=null && !status.isEmpty()) {
-            release.setStatus(type);
+            release.setStatus(status);
         }
 
         String barcode = rs.getString("barcode");

Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java	2013-05-09 15:05:11 UTC (rev 13682)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java	2013-05-09 15:25:01 UTC (rev 13683)
@@ -13,6 +13,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 public class ReleaseIndexTest extends AbstractIndexTest {
 
@@ -883,6 +884,9 @@
             assertEquals("c3b8dbc9-c1ff-4743-9015-8d762819134e", release.getId());
             assertEquals("Crocodiles (bonus disc)", release.getTitle());
             assertEquals("B00005NTQ7", release.getAsin());
+            assertEquals("Official", release.getStatus());
+            assertEquals("EP", release.getReleaseGroup().getPrimaryType());
+            assertEquals("EP", release.getReleaseGroup().getType());
             assertNotNull(release.getMediumList());
 
 
@@ -909,6 +913,7 @@
             assertEquals("c3b8dbc9-c1ff-4743-9015-8d762819134e", release.getId());
             assertEquals("Crocodiles (bonus disc)", release.getTitle());
             assertEquals("B00005NTQ7", release.getAsin());
+            assertNull(release.getStatus());
             assertNotNull(release.getMediumList());
             ReleaseEventList rel = release.getReleaseEventList();
             assertNotNull(rel);