[mb-commits] r13691 - 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-06-04 15:02:02 +0000 (Tue, 04 Jun 2013)
New Revision: 13691

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
   search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
Log:
SEARCH-299:Ouput trackids

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java	2013-05-20 12:11:03 UTC (rev 13690)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java	2013-06-04 15:02:02 UTC (rev 13691)
@@ -764,7 +764,8 @@
                     releaseList.getRelease().add(release);
 
                     ReleaseGroup rg = release.getReleaseGroup();
-                    doc.addNonEmptyField(RecordingIndexField.TRACK_ID, trackWrapper.getTrackGuid());
+                    String trackGuid = trackWrapper.getTrackGuid();
+                    doc.addNonEmptyField(RecordingIndexField.TRACK_ID, trackGuid);
                     String primaryType = rg.getPrimaryType();
                     doc.addFieldOrUnknown(RecordingIndexField.RELEASEGROUP_ID, rg.getId());
                     doc.addFieldOrUnknown(RecordingIndexField.RELEASE_PRIMARY_TYPE, primaryType);
@@ -789,6 +790,7 @@
                     doc.addNumericField(RecordingIndexField.TRACKNUM, trackWrapper.getTrackPosition());
                     doc.addFieldOrNoValue(RecordingIndexField.NUMBER, trackWrapper.getTrackNumber());
                     org.musicbrainz.mmd2.Medium.TrackList.Track track = of.createMediumTrackListTrack();
+                    track.setId(trackGuid);
                     track.setTitle(trackWrapper.getTrackName());
                     track.setLength(BigInteger.valueOf(trackWrapper.getDuration()));
                     track.setNumber(trackWrapper.getTrackNumber());

Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java	2013-05-20 12:11:03 UTC (rev 13690)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java	2013-06-04 15:02:02 UTC (rev 13691)
@@ -902,6 +902,7 @@
             assertEquals("Do It Cleans", track.getTitle());
             assertNull(track.getPosition());  //We dont currently output this, but perhaps should
             assertEquals("A4", track.getNumber());
+            assertEquals("c3b8dbc9-c1ff-4743-9015-8d762819134e",track.getId());
 
         }
         ir.close();

Modified: search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java
===================================================================
--- search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java	2013-05-20 12:11:03 UTC (rev 13690)
+++ search_server/trunk/servlet/src/test/java/org/musicbrainz/search/servlet/FindRecordingTest.java	2013-06-04 15:02:02 UTC (rev 13691)
@@ -140,6 +140,7 @@
             trackList.setOffset(BigInteger.valueOf(4));
             track.setNumber("A4");
             track.setLength(BigInteger.valueOf(233000));
+            track.setId("c3b8dbc9-c1ff-4743-9015-8d762819134e");
             ml.setTrackCount(BigInteger.valueOf(10));
             doc.addField(RecordingIndexField.RELEASE_STATUS, "Official");
             doc.addField(RecordingIndexField.RELEASE_DATE, "1970-01-01");
@@ -543,7 +544,7 @@
         assertTrue(output.contains("<track-count>10</track-count>"));
         assertTrue(output.contains("<artist-credit><name-credit><artist id=\"89ad4ac3-39f7-470e-963a-56509c546377\"><name>Various Artists</name></artist></name-credit></artist-credit>"));
         assertTrue(output.contains("indie</name>"));
-        assertTrue(output.contains("<track><number>A4</number><title>Gravitational Lens</title><length>233000</length><artist-credit><name-credit><artist id=\"2302e264-1cf0-4d1f-aca7-2a6f89e34b36\"><name>Pig Incident</name><sort-name>Incident, Pig</sort-name></artist></name-credit></artist-credit></track>"));
+        assertTrue(output.contains("<track id=\"c3b8dbc9-c1ff-4743-9015-8d762819134e\"><number>A4</number><title>Gravitational Lens</title><length>233000</length><artist-credit><name-credit><artist id=\"2302e264-1cf0-4d1f-aca7-2a6f89e34b36\"><name>Pig Incident</name><sort-name>Incident, Pig</sort-name></artist></name-credit></artist-credit></track>"));
         assertTrue(output.contains("<puid-list><puid id=\"1d9e8ed6-3893-4d3b-aa7d-72e79609e386\"/></puid-list>"));
         assertTrue(output.contains("<release-event-list><release-event><date>1970-01-01</date><area><iso-3166-1-code-list><iso-3166-1-code>UK</iso-3166-1-code></iso-3166-1-code-list></area></release-event>"));
     }
@@ -617,6 +618,7 @@
         assertTrue(output.contains("\"track-count\":10"));
         assertTrue(output.contains("\"secondary-types\":[\"Compilation\"]}"));
         assertTrue(output.contains("\"release-events\":[{\"date\":\"1970-01-01\",\"area\":{\"iso-3166-1-codes\":[\"UK\"]}}]"));
+        assertTrue(output.contains("{\"id\":\"c3b8dbc9-c1ff-4743-9015-8d762819134e\""));
     }
 
     @Test